diff --git a/.eslintrc.js b/.eslintrc.js
index 5ff1aba1f3ff7..c821bfd5a2404 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -186,8 +186,10 @@ module.exports = {
         'x-pack/legacy/plugins/apm/**/*.js',
         'test/*/config.ts',
         'test/visual_regression/tests/**/*',
-        'x-pack/test/visual_regression/tests/**/*',
-        'x-pack/test/*/config.ts',
+        'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
+        'x-pack/test/*/*config.*ts',
+        'x-pack/test/saved_object_api_integration/*/apis/**/*',
+        'x-pack/test/ui_capabilities/*/tests/**/*',
       ],
       rules: {
         'import/no-default-export': 'off',
diff --git a/.i18nrc.json b/.i18nrc.json
index 40e6ebbe3e969..0424b9528a204 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -24,7 +24,8 @@
     "timelion": "src/legacy/core_plugins/timelion",
     "tagCloud": "src/legacy/core_plugins/tagcloud",
     "tsvb": "src/legacy/core_plugins/metrics",
-    "kbnESQuery": "packages/kbn-es-query"
+    "kbnESQuery": "packages/kbn-es-query",
+    "inspector": "src/plugins/inspector"
   },
   "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": []
diff --git a/docs/code/code-basic-nav.asciidoc b/docs/code/code-basic-nav.asciidoc
index 6b74790514255..77a56b24801cc 100644
--- a/docs/code/code-basic-nav.asciidoc
+++ b/docs/code/code-basic-nav.asciidoc
@@ -17,4 +17,9 @@ Clicking *Blame* shows the most recent commit per line.
 [role="screenshot"]
 image::images/code-blame.png[]
 
+[float]
+==== Branch selector
+You can use the Branch selector to view different branches of a repo. Note that code intelligence and search index are not available for any branch other than master branch.
+
+
 include::code-semantic-nav.asciidoc[]
diff --git a/docs/code/code-install-lang-server.asciidoc b/docs/code/code-install-lang-server.asciidoc
index acc6c5a9347eb..1bb5a24f0c7f3 100644
--- a/docs/code/code-install-lang-server.asciidoc
+++ b/docs/code/code-install-lang-server.asciidoc
@@ -16,6 +16,10 @@ You can check the status of the language servers and get installation instructio
 [role="screenshot"]
 image::images/code-lang-server-status.png[]
 
+[float]
+=== Ctag language server
+*Code* also uses a Ctag language server to generate symbol information and code intelligence when a dedicated language server is not available. The code intelligence information generated by the Ctag language server is less accurate but covers more languages.
+
 
 
 include::code-basic-nav.asciidoc[]
diff --git a/docs/dashboard.asciidoc b/docs/dashboard.asciidoc
index 48189465bc3e7..df5348a0673dc 100644
--- a/docs/dashboard.asciidoc
+++ b/docs/dashboard.asciidoc
@@ -3,66 +3,84 @@
 
 [partintro]
 --
-A Kibana _dashboard_ displays a collection of visualizations, searches, and {kibana-ref}/maps.html[maps].
-You can arrange, resize, and edit the dashboard content and then save the dashboard
-so you can share it.
 
-[role="screenshot"]
-image:images/Dashboard_example.png[Example dashboard]
+A {kib} _dashboard_ is a collection of visualizations, searches, and 
+maps, typically in real-time. Dashboards provide 
+at-a-glance insights into your data and enable you to drill down into details. 
 
---
+To start working with dashboards, click *Dashboard* in the side navigation. 
+With *Dashboard*, you can:
 
-[[dashboard-getting-started]]
-== Building a Dashboard
+* <<dashboard-create-new-dashboard, Create a dashboard>>
+* <<customizing-your-dashboard, Arrange dashboard elements>>
+* <<sharing-dashboards, Share a dashboard>>
+* <<import-dashboards, Import and export dashboards>>
+* <<viewing-detailed-information, Inspect and edit dashboard elements>>
+
+
+[role="screenshot"]
+image:images/Dashboard_example.png[Example dashboard]
 
-If you haven't yet indexed data into {es} or created an index pattern,
-you'll be prompted to do so as you follow the steps for creating a dashboard.
-Or, you can use one of the prebuilt sample data sets, available from the
-Kibana home page.
 
 [float]
 [[dashboard-read-only-access]]
 === [xpack]#Read only access#
-When you have insufficient privileges to create or save dashboards, the following 
-indicator in Kibana will be displayed. The buttons to create new dashboards or edit
-existing dashboard won't be visible. For more information on granting access to
-Kibana see <<xpack-security-authorization>>.
+If you see
+the read-only icon in the application header,
+then you don't have sufficient privileges to create and save dashboards. The buttons to create and edit
+dashboards are not visible. For more information, see <<xpack-security-authorization>>.
 
 [role="screenshot"]
 image::images/dashboard-read-only-badge.png[Example of Dashboard's read only access indicator in Kibana's header]
 
 [float]
+[[dashboard-getting-started]]
+=== Interact with dashboards
+
+When you open *Dashhboard*, you're presented an overview of your dashboards. 
+If you don't have any dashboards, you can add 
+<<add-sample-data, sample data sets>>,
+which include pre-built dashboards. 
+
+Once you open a dashboard, you can filter the data
+by entering a search query, changing the time filter, or clicking 
+in the visualizations, searches, and maps. If a dashboard element has a stored query, 
+both queries are applied.
+
+--
+
 [[dashboard-create-new-dashboard]]
-=== Creating a new Dashboard
+== Create a dashboard
+
+To create a dashboard, you must have data indexed into {es}, an index pattern 
+to retrieve the data from {es}, and 
+visualizations, saved searches, or maps. If these don't exist, you're prompted to 
+add them as you create the dashboard.
 
-. In the side navigation, click *Dashboard*.
+For an end-to-end example, see <<tutorial-build-dashboard, Building your own dashboard>>.
+
+. Open *Dashboard.*
 . Click *Create new dashboard.*
 . Click *Add*.
-. [[adding-visualizations-to-a-dashboard]]Use *Add Panels* to add visualizations
-and saved searches to the dashboard. If you have a large number of
-visualizations, you can filter the lists.
+. Use *Add panels* to add elements to the dashboard.
++
+The visualizations, saved searches, and maps
+are stored in panels that you can move and resize. A
+menu in the upper right of the panel has options for customizing
+the panel. You can add elements from 
+multiple indices, and the same element can appear in multiple dashboards.
 +
 [role="screenshot"]
 image:images/Dashboard_add_visualization.png[Example add visualization to dashboard]
 
-. [[saving-dashboards]]When you're finished adding and arranging the panels,
-go to the menu bar and click *Save*.
-
-. In *Save Dashboard*, enter a dashboard title and optionally a description.
-
-. To store the time period specified in the time filter, enable *Store time
-with dashboard*.
-
-. Click *Save*.
-
-[[loading-a-saved-dashboard]]
-To import, export, and delete dashboards, see <<managing-saved-objects>>.
+. When you're finished adding and arranging the panels,
+*Save* the dashboard.
 
+[float]
 [[customizing-your-dashboard]]
-== Arranging Dashboard Elements
+=== Arrange dashboard elements
 
-The visualizations and searches in a dashboard are stored in panels that you can move,
-resize, edit, and delete.  To start editing, click *Edit* in the menu bar.
+In *Edit* mode, you can move, resize, customize, and delete panels to suit your needs. 
 
 [[moving-containers]]
 * To move a panel, click and hold the panel header and drag to the new location.
@@ -71,53 +89,58 @@ resize, edit, and delete.  To start editing, click *Edit* in the menu bar.
 * To resize a panel, click the resize control on the lower right and drag
 to the new dimensions.
 
-[[removing-containers]]
-Additional commands for managing the panel and its contents
-are in the gear menu in the upper right.
-
-[role="screenshot"]
-image:images/Dashboard_Resize_Menu.png[Example dashboard]
+* To toggle the use of margins and panel titles, use the *Options* menu in the upper left.
 
-NOTE: Deleting a panel from a
+* To delete a panel, open the panel menu and select *Delete from dashboard.* Deleting a panel from a
 dashboard does *not* delete the saved visualization or search.
 
-[[viewing-detailed-information]]
-== Inspecting a Visualization from the Dashboard
 
-Many visualizations allow you to inspect the data and requests behind the
-visualization.
+[float]
+[[sharing-dashboards]]
+=== Share a dashboard
+
+[[embedding-dashboards]]
+When you've finished your dashboard, you can share it with your teammates. 
+From the *Share* menu, you can:
+
+* Embed the code in a web page. Users must have Kibana access
+to view an embedded dashboard.
+* Share a direct link to a {kib} dashboard
+* Generate a PDF report
+* Generate a PNG report
+
+TIP: You can create a link to a dashboard by title by doing this: +
+`${domain}/${basepath?}/app/kibana#/dashboards?title=${yourdashboardtitle}`
+
+TIP: When sharing a link to a dashboard snapshot, use the *Short URL*. Snapshot
+URLs are long and can be problematic for Internet Explorer and other
+tools. To create a short URL, you must have write access to {kib}.
+
+[float]
+[[import-dashboards]]
+=== Import and export dashboards
 
-In the dashboard, expand the visualization's panel menu (or gear menu if in
-*Edit* mode) and select *Inspect*.
+To import and export dashboards, go to *Management > Saved Objects*. For details,
+see <<managing-saved-objects, Managing saved objects>>. 
 
-The initial view shows the underlying data for the visualization. To view the
-requests that were made for the visualization, choose *Requests* from the *View*
-menu.
+[float]
+[[viewing-detailed-information]]
+=== Inspect and edit elements
 
-The views you'll see depend on the element that you inspect.
+Many dashboard elements allow you to drill down into the data and requests 
+behind the element. Open the menu in the upper right of the panel and select *Inspect*. 
+The views you see depend on the element that you inspect. 
 
 [role="screenshot"]
-image:images/Dashboard_visualization_data.png[Example of visualization data]
+image:images/Dashboard_inspect.png[Inspect in dashboard]
 
+To open an element for editing, put the dashboard in *Edit* mode, 
+and then select *Edit* from the panel menu. The changes you make appear in
+every dashboard that uses the element. 
 
 
-[[sharing-dashboards]]
-== Sharing a Dashboard
 
-You can either share a direct link to a Kibana dashboard,
-or embed the dashboard in a web page. Users must have Kibana access
-to view an embedded dashboard.
 
-[[embedding-dashboards]]
 
-. Open the dashboard you want to share.
-. In the menu bar, click *Share*.
-. Copy the link you want to share or the iframe you want to embed. You can
-share the live dashboard or a static snapshot of the current point in time.
 
-TIP: You can create a link to a dashboard by title by doing this: +
-`${domain}/${basepath?}/app/kibana#/dashboards?title=${yourdashboardtitle}`
 
-TIP: When sharing a link to a dashboard snapshot, use the *Short URL*. Snapshot
-URLs are long and can be problematic for Internet Explorer and other
-tools.  To create a short URL, you must have write access to {kib}.
diff --git a/docs/development/core/development-basepath.asciidoc b/docs/development/core/development-basepath.asciidoc
index e84171c79cb22..d49dfe2938fad 100644
--- a/docs/development/core/development-basepath.asciidoc
+++ b/docs/development/core/development-basepath.asciidoc
@@ -66,6 +66,15 @@ To accomplish this the `serve` task does a few things:
   - redirects from `/{any}/app/{appName}` to `/{randomBasePath}/app/{appName}` so that refreshes should work
   - proxies all requests starting with `/{randomBasePath}/` to the Kibana server
 
+If you're writing scripts that interact with the Kibana API, the base path proxy will likely
+make this difficult. To bypass the base path proxy for a single request, prefix urls with
+`__UNSAFE_bypassBasePath` and the request will be routed to the development Kibana server.
+
+["source","shell"]
+-----------
+curl "http://elastic:changeme@localhost:5601/__UNSAFE_bypassBasePath/api/status"
+-----------
+
 This proxy can sometimes have unintended side effects in development, so when
 needed you can opt out by passing the `--no-base-path` flag to the `serve` task
 or `yarn start`.
diff --git a/docs/development/core/server/kibana-plugin-server.authstatus.md b/docs/development/core/server/kibana-plugin-server.authstatus.md
new file mode 100644
index 0000000000000..e59ade4f73e38
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.authstatus.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [AuthStatus](./kibana-plugin-server.authstatus.md)
+
+## AuthStatus enum
+
+Status indicating an outcome of the authentication.
+
+<b>Signature:</b>
+
+```typescript
+export declare enum AuthStatus 
+```
+
+## Enumeration Members
+
+|  Member | Value | Description |
+|  --- | --- | --- |
+|  authenticated | <code>&quot;authenticated&quot;</code> | <code>auth</code> interceptor successfully authenticated a user |
+|  unauthenticated | <code>&quot;unauthenticated&quot;</code> | <code>auth</code> interceptor failed user authentication |
+|  unknown | <code>&quot;unknown&quot;</code> | <code>auth</code> interceptor has not been registered |
+
diff --git a/docs/development/core/server/kibana-plugin-server.coresetup.http.md b/docs/development/core/server/kibana-plugin-server.coresetup.http.md
index c9206b7a7e711..e5347dd7c6625 100644
--- a/docs/development/core/server/kibana-plugin-server.coresetup.http.md
+++ b/docs/development/core/server/kibana-plugin-server.coresetup.http.md
@@ -13,7 +13,6 @@ http: {
         registerAuth: HttpServiceSetup['registerAuth'];
         registerOnPostAuth: HttpServiceSetup['registerOnPostAuth'];
         basePath: HttpServiceSetup['basePath'];
-        createNewServer: HttpServiceSetup['createNewServer'];
         isTlsEnabled: HttpServiceSetup['isTlsEnabled'];
     };
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.coresetup.md b/docs/development/core/server/kibana-plugin-server.coresetup.md
index f4653d7f43579..38990f2797677 100644
--- a/docs/development/core/server/kibana-plugin-server.coresetup.md
+++ b/docs/development/core/server/kibana-plugin-server.coresetup.md
@@ -17,5 +17,5 @@ export interface CoreSetup
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [elasticsearch](./kibana-plugin-server.coresetup.elasticsearch.md) | <code>{</code><br/><code>        adminClient$: Observable&lt;ClusterClient&gt;;</code><br/><code>        dataClient$: Observable&lt;ClusterClient&gt;;</code><br/><code>        createClient: (type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ClusterClient;</code><br/><code>    }</code> |  |
-|  [http](./kibana-plugin-server.coresetup.http.md) | <code>{</code><br/><code>        createCookieSessionStorageFactory: HttpServiceSetup['createCookieSessionStorageFactory'];</code><br/><code>        registerOnPreAuth: HttpServiceSetup['registerOnPreAuth'];</code><br/><code>        registerAuth: HttpServiceSetup['registerAuth'];</code><br/><code>        registerOnPostAuth: HttpServiceSetup['registerOnPostAuth'];</code><br/><code>        basePath: HttpServiceSetup['basePath'];</code><br/><code>        createNewServer: HttpServiceSetup['createNewServer'];</code><br/><code>        isTlsEnabled: HttpServiceSetup['isTlsEnabled'];</code><br/><code>    }</code> |  |
+|  [http](./kibana-plugin-server.coresetup.http.md) | <code>{</code><br/><code>        createCookieSessionStorageFactory: HttpServiceSetup['createCookieSessionStorageFactory'];</code><br/><code>        registerOnPreAuth: HttpServiceSetup['registerOnPreAuth'];</code><br/><code>        registerAuth: HttpServiceSetup['registerAuth'];</code><br/><code>        registerOnPostAuth: HttpServiceSetup['registerOnPostAuth'];</code><br/><code>        basePath: HttpServiceSetup['basePath'];</code><br/><code>        isTlsEnabled: HttpServiceSetup['isTlsEnabled'];</code><br/><code>    }</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-server.customhttpresponseoptions.md b/docs/development/core/server/kibana-plugin-server.customhttpresponseoptions.md
new file mode 100644
index 0000000000000..cabee8a47e5ca
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.customhttpresponseoptions.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CustomHttpResponseOptions](./kibana-plugin-server.customhttpresponseoptions.md)
+
+## CustomHttpResponseOptions interface
+
+HTTP response parameters for a response with adjustable status code.
+
+<b>Signature:</b>
+
+```typescript
+export interface CustomHttpResponseOptions extends HttpResponseOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [statusCode](./kibana-plugin-server.customhttpresponseoptions.statuscode.md) | <code>number</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.customhttpresponseoptions.statuscode.md b/docs/development/core/server/kibana-plugin-server.customhttpresponseoptions.statuscode.md
new file mode 100644
index 0000000000000..5444ccd2ebb55
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.customhttpresponseoptions.statuscode.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CustomHttpResponseOptions](./kibana-plugin-server.customhttpresponseoptions.md) &gt; [statusCode](./kibana-plugin-server.customhttpresponseoptions.statuscode.md)
+
+## CustomHttpResponseOptions.statusCode property
+
+<b>Signature:</b>
+
+```typescript
+statusCode: number;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.getauthheaders.md b/docs/development/core/server/kibana-plugin-server.getauthheaders.md
index ee7572615fe1a..fba8b8ca8ee3a 100644
--- a/docs/development/core/server/kibana-plugin-server.getauthheaders.md
+++ b/docs/development/core/server/kibana-plugin-server.getauthheaders.md
@@ -9,5 +9,5 @@ Get headers to authenticate a user against Elasticsearch.
 <b>Signature:</b>
 
 ```typescript
-export declare type GetAuthHeaders = (request: KibanaRequest | Request) => AuthHeaders | undefined;
+export declare type GetAuthHeaders = (request: KibanaRequest | LegacyRequest) => AuthHeaders | undefined;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.getauthstate.md b/docs/development/core/server/kibana-plugin-server.getauthstate.md
new file mode 100644
index 0000000000000..47fc38c28f5e0
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.getauthstate.md
@@ -0,0 +1,16 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [GetAuthState](./kibana-plugin-server.getauthstate.md)
+
+## GetAuthState type
+
+Get authentication state for a request. Returned by `auth` interceptor.
+
+<b>Signature:</b>
+
+```typescript
+export declare type GetAuthState = (request: KibanaRequest | LegacyRequest) => {
+    status: AuthStatus;
+    state: unknown;
+};
+```
diff --git a/docs/development/core/server/kibana-plugin-server.headers.md b/docs/development/core/server/kibana-plugin-server.headers.md
index 83259efe8b79d..cd73d4de43b9d 100644
--- a/docs/development/core/server/kibana-plugin-server.headers.md
+++ b/docs/development/core/server/kibana-plugin-server.headers.md
@@ -4,9 +4,14 @@
 
 ## Headers type
 
+Http request headers to read.
 
 <b>Signature:</b>
 
 ```typescript
-export declare type Headers = Record<string, string | string[] | undefined>;
+export declare type Headers = {
+    [header in KnownHeaders]?: string | string[] | undefined;
+} & {
+    [header: string]: string | string[] | undefined;
+};
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.httpresponseoptions.headers.md b/docs/development/core/server/kibana-plugin-server.httpresponseoptions.headers.md
new file mode 100644
index 0000000000000..ee347f99a41a4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpresponseoptions.headers.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpResponseOptions](./kibana-plugin-server.httpresponseoptions.md) &gt; [headers](./kibana-plugin-server.httpresponseoptions.headers.md)
+
+## HttpResponseOptions.headers property
+
+HTTP Headers with additional information about response
+
+<b>Signature:</b>
+
+```typescript
+headers?: ResponseHeaders;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpresponseoptions.md b/docs/development/core/server/kibana-plugin-server.httpresponseoptions.md
new file mode 100644
index 0000000000000..8f9ccf22c8c6d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpresponseoptions.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpResponseOptions](./kibana-plugin-server.httpresponseoptions.md)
+
+## HttpResponseOptions interface
+
+HTTP response parameters
+
+<b>Signature:</b>
+
+```typescript
+export interface HttpResponseOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [headers](./kibana-plugin-server.httpresponseoptions.headers.md) | <code>ResponseHeaders</code> | HTTP Headers with additional information about response |
+
diff --git a/docs/development/core/server/kibana-plugin-server.httpresponsepayload.md b/docs/development/core/server/kibana-plugin-server.httpresponsepayload.md
new file mode 100644
index 0000000000000..3dc4e2c7956f7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpresponsepayload.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpResponsePayload](./kibana-plugin-server.httpresponsepayload.md)
+
+## HttpResponsePayload type
+
+Data send to the client as a response payload.
+
+<b>Signature:</b>
+
+```typescript
+export declare type HttpResponsePayload = undefined | string | Record<string, any> | Buffer | Stream;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.auth.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.auth.md
new file mode 100644
index 0000000000000..e39c3c6316768
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.auth.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [auth](./kibana-plugin-server.httpserversetup.auth.md)
+
+## HttpServerSetup.auth property
+
+<b>Signature:</b>
+
+```typescript
+auth: {
+        get: GetAuthState;
+        isAuthenticated: IsAuthenticated;
+        getAuthHeaders: GetAuthHeaders;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.basepath.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.basepath.md
new file mode 100644
index 0000000000000..5cfb2f5c4e8b4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.basepath.md
@@ -0,0 +1,16 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [basePath](./kibana-plugin-server.httpserversetup.basepath.md)
+
+## HttpServerSetup.basePath property
+
+<b>Signature:</b>
+
+```typescript
+basePath: {
+        get: (request: KibanaRequest | LegacyRequest) => string;
+        set: (request: KibanaRequest | LegacyRequest, basePath: string) => void;
+        prepend: (url: string) => string;
+        remove: (url: string) => string;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.createcookiesessionstoragefactory.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.createcookiesessionstoragefactory.md
new file mode 100644
index 0000000000000..3dc01a52a2f58
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.createcookiesessionstoragefactory.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [createCookieSessionStorageFactory](./kibana-plugin-server.httpserversetup.createcookiesessionstoragefactory.md)
+
+## HttpServerSetup.createCookieSessionStorageFactory property
+
+Creates cookie based session storage factory [SessionStorageFactory](./kibana-plugin-server.sessionstoragefactory.md)
+
+<b>Signature:</b>
+
+```typescript
+createCookieSessionStorageFactory: <T>(cookieOptions: SessionStorageCookieOptions<T>) => Promise<SessionStorageFactory<T>>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.istlsenabled.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.istlsenabled.md
new file mode 100644
index 0000000000000..6961d4feeb7c7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.istlsenabled.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [isTlsEnabled](./kibana-plugin-server.httpserversetup.istlsenabled.md)
+
+## HttpServerSetup.isTlsEnabled property
+
+Flag showing whether a server was configured to use TLS connection.
+
+<b>Signature:</b>
+
+```typescript
+isTlsEnabled: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.md
new file mode 100644
index 0000000000000..143ae66c0b32c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.md
@@ -0,0 +1,93 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md)
+
+## HttpServerSetup interface
+
+Kibana HTTP Service provides own abstraction for work with HTTP stack. Plugins don't have direct access to `hapi` server and its primitives anymore. Moreover, plugins shouldn't rely on the fact that HTTP Service uses one or another library under the hood. This gives the platform flexibility to upgrade or changing our internal HTTP stack without breaking plugins. If the HTTP Service lacks functionality you need, we are happy to discuss and support your needs.
+
+<b>Signature:</b>
+
+```typescript
+export interface HttpServerSetup 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [auth](./kibana-plugin-server.httpserversetup.auth.md) | <code>{</code><br/><code>        get: GetAuthState;</code><br/><code>        isAuthenticated: IsAuthenticated;</code><br/><code>        getAuthHeaders: GetAuthHeaders;</code><br/><code>    }</code> |  |
+|  [basePath](./kibana-plugin-server.httpserversetup.basepath.md) | <code>{</code><br/><code>        get: (request: KibanaRequest &#124; LegacyRequest) =&gt; string;</code><br/><code>        set: (request: KibanaRequest &#124; LegacyRequest, basePath: string) =&gt; void;</code><br/><code>        prepend: (url: string) =&gt; string;</code><br/><code>        remove: (url: string) =&gt; string;</code><br/><code>    }</code> |  |
+|  [createCookieSessionStorageFactory](./kibana-plugin-server.httpserversetup.createcookiesessionstoragefactory.md) | <code>&lt;T&gt;(cookieOptions: SessionStorageCookieOptions&lt;T&gt;) =&gt; Promise&lt;SessionStorageFactory&lt;T&gt;&gt;</code> | Creates cookie based session storage factory [SessionStorageFactory](./kibana-plugin-server.sessionstoragefactory.md) |
+|  [isTlsEnabled](./kibana-plugin-server.httpserversetup.istlsenabled.md) | <code>boolean</code> | Flag showing whether a server was configured to use TLS connection. |
+|  [registerAuth](./kibana-plugin-server.httpserversetup.registerauth.md) | <code>(handler: AuthenticationHandler) =&gt; void</code> | To define custom authentication and/or authorization mechanism for incoming requests. A handler should return a state to associate with the incoming request. The state can be retrieved later via http.auth.get(..) Only one AuthenticationHandler can be registered. |
+|  [registerOnPostAuth](./kibana-plugin-server.httpserversetup.registeronpostauth.md) | <code>(handler: OnPostAuthHandler) =&gt; void</code> | To define custom logic to perform for incoming requests. Runs the handler after Auth interceptor did make sure a user has access to the requested resource. The auth state is available at stage via http.auth.get(..) Can register any number of registerOnPreAuth, which are called in sequence (from the first registered to the last). |
+|  [registerOnPreAuth](./kibana-plugin-server.httpserversetup.registeronpreauth.md) | <code>(handler: OnPreAuthHandler) =&gt; void</code> | To define custom logic to perform for incoming requests. Runs the handler before Auth interceptor performs a check that user has access to requested resources, so it's the only place when you can forward a request to another URL right on the server. Can register any number of registerOnPostAuth, which are called in sequence (from the first registered to the last). |
+|  [registerRouter](./kibana-plugin-server.httpserversetup.registerrouter.md) | <code>(router: Router) =&gt; void</code> | Add all the routes registered with <code>router</code> to HTTP server request listeners. |
+|  [server](./kibana-plugin-server.httpserversetup.server.md) | <code>Server</code> |  |
+
+## Example
+
+To handle an incoming request in your plugin you should: - Create a `Router` instance. Use `plugin-id` as a prefix path segment for your routes.
+
+```ts
+import { Router } from 'src/core/server';
+const router = new Router('my-app');
+
+```
+- Use `@kbn/config-schema` package to create a schema to validate the request `params`<!-- -->, `query`<!-- -->, and `body`<!-- -->. Every incoming request will be validated against the created schema. If validation failed, the request is rejected with `400` status and `Bad request` error without calling the route's handler. To opt out of validating the request, specify `false`<!-- -->.
+
+```ts
+import { schema, TypeOf } from '@kbn/config-schema';
+const validate = {
+  params: schema.object({
+    id: schema.string(),
+  }),
+};
+
+```
+- Declare a function to respond to incoming request. The function will receive `request` object containing request details: url, headers, matched route, as well as validated `params`<!-- -->, `query`<!-- -->, `body`<!-- -->. And `response` object instructing HTTP server to create HTTP response with information sent back to the client as the response body, headers, and HTTP status. Unlike, `hapi` route handler in the Legacy platform, any exception raised during the handler call will generate `500 Server error` response and log error details for further investigation. See below for returning custom error responses.
+
+```ts
+const handler = async (request: KibanaRequest, response: ResponseFactory) => {
+  const data = await findObject(request.params.id);
+  // creates a command to respond with 'not found' error
+  if (!data) return response.notFound();
+  // creates a command to send found data to the client and set response headers
+  return response.ok(data, {
+    headers: {
+      'content-type': 'application/json'
+    }
+  });
+}
+
+```
+- Register route handler for GET request to 'my-app/path/<!-- -->{<!-- -->id<!-- -->}<!-- -->' path
+
+```ts
+import { schema, TypeOf } from '@kbn/config-schema';
+import { Router } from 'src/core/server';
+const router = new Router('my-app');
+
+const validate = {
+  params: schema.object({
+    id: schema.string(),
+  }),
+};
+
+router.get({
+  path: 'path/{id}',
+  validate
+},
+async (request, response) => {
+  const data = await findObject(request.params.id);
+  if (!data) return response.notFound();
+  return response.ok(data, {
+    headers: {
+      'content-type': 'application/json'
+    }
+  });
+});
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.registerauth.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.registerauth.md
new file mode 100644
index 0000000000000..6e63e0996a63a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.registerauth.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [registerAuth](./kibana-plugin-server.httpserversetup.registerauth.md)
+
+## HttpServerSetup.registerAuth property
+
+To define custom authentication and/or authorization mechanism for incoming requests. A handler should return a state to associate with the incoming request. The state can be retrieved later via http.auth.get(..) Only one AuthenticationHandler can be registered.
+
+<b>Signature:</b>
+
+```typescript
+registerAuth: (handler: AuthenticationHandler) => void;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.registeronpostauth.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.registeronpostauth.md
new file mode 100644
index 0000000000000..c74a67da350ec
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.registeronpostauth.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [registerOnPostAuth](./kibana-plugin-server.httpserversetup.registeronpostauth.md)
+
+## HttpServerSetup.registerOnPostAuth property
+
+To define custom logic to perform for incoming requests. Runs the handler after Auth interceptor did make sure a user has access to the requested resource. The auth state is available at stage via http.auth.get(..) Can register any number of registerOnPreAuth, which are called in sequence (from the first registered to the last).
+
+<b>Signature:</b>
+
+```typescript
+registerOnPostAuth: (handler: OnPostAuthHandler) => void;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.registeronpreauth.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.registeronpreauth.md
new file mode 100644
index 0000000000000..f6efa1c1dd73c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.registeronpreauth.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [registerOnPreAuth](./kibana-plugin-server.httpserversetup.registeronpreauth.md)
+
+## HttpServerSetup.registerOnPreAuth property
+
+To define custom logic to perform for incoming requests. Runs the handler before Auth interceptor performs a check that user has access to requested resources, so it's the only place when you can forward a request to another URL right on the server. Can register any number of registerOnPostAuth, which are called in sequence (from the first registered to the last).
+
+<b>Signature:</b>
+
+```typescript
+registerOnPreAuth: (handler: OnPreAuthHandler) => void;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.registerrouter.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.registerrouter.md
new file mode 100644
index 0000000000000..4c2a9ae327406
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.registerrouter.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [registerRouter](./kibana-plugin-server.httpserversetup.registerrouter.md)
+
+## HttpServerSetup.registerRouter property
+
+Add all the routes registered with `router` to HTTP server request listeners.
+
+<b>Signature:</b>
+
+```typescript
+registerRouter: (router: Router) => void;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpserversetup.server.md b/docs/development/core/server/kibana-plugin-server.httpserversetup.server.md
new file mode 100644
index 0000000000000..a137eba7c8a5a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.httpserversetup.server.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) &gt; [server](./kibana-plugin-server.httpserversetup.server.md)
+
+## HttpServerSetup.server property
+
+<b>Signature:</b>
+
+```typescript
+server: Server;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.httpservicesetup.createnewserver.md b/docs/development/core/server/kibana-plugin-server.httpservicesetup.createnewserver.md
deleted file mode 100644
index e41684ea2b784..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.httpservicesetup.createnewserver.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-server](./kibana-plugin-server.md) &gt; [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md) &gt; [createNewServer](./kibana-plugin-server.httpservicesetup.createnewserver.md)
-
-## HttpServiceSetup.createNewServer property
-
-<b>Signature:</b>
-
-```typescript
-createNewServer: (cfg: Partial<HttpConfig>) => Promise<HttpServerSetup>;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.httpservicesetup.md b/docs/development/core/server/kibana-plugin-server.httpservicesetup.md
index ec4a2537b8404..7e8f17510c8ee 100644
--- a/docs/development/core/server/kibana-plugin-server.httpservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-server.httpservicesetup.md
@@ -2,18 +2,11 @@
 
 [Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md)
 
-## HttpServiceSetup interface
+## HttpServiceSetup type
 
 
 <b>Signature:</b>
 
 ```typescript
-export interface HttpServiceSetup extends HttpServerSetup 
+export declare type HttpServiceSetup = HttpServerSetup;
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [createNewServer](./kibana-plugin-server.httpservicesetup.createnewserver.md) | <code>(cfg: Partial&lt;HttpConfig&gt;) =&gt; Promise&lt;HttpServerSetup&gt;</code> |  |
-
diff --git a/docs/development/core/server/kibana-plugin-server.isauthenticated.md b/docs/development/core/server/kibana-plugin-server.isauthenticated.md
new file mode 100644
index 0000000000000..15f412710412a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.isauthenticated.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [IsAuthenticated](./kibana-plugin-server.isauthenticated.md)
+
+## IsAuthenticated type
+
+Return authentication status for a request.
+
+<b>Signature:</b>
+
+```typescript
+export declare type IsAuthenticated = (request: KibanaRequest | LegacyRequest) => boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.kibanarequest.md b/docs/development/core/server/kibana-plugin-server.kibanarequest.md
index a9622e4319d57..19167f2f64041 100644
--- a/docs/development/core/server/kibana-plugin-server.kibanarequest.md
+++ b/docs/development/core/server/kibana-plugin-server.kibanarequest.md
@@ -26,6 +26,6 @@ export declare class KibanaRequest<Params = unknown, Query = unknown, Body = unk
 |  [headers](./kibana-plugin-server.kibanarequest.headers.md) |  | <code>Headers</code> | Readonly copy of incoming request headers. |
 |  [params](./kibana-plugin-server.kibanarequest.params.md) |  | <code>Params</code> |  |
 |  [query](./kibana-plugin-server.kibanarequest.query.md) |  | <code>Query</code> |  |
-|  [route](./kibana-plugin-server.kibanarequest.route.md) |  | <code>RecursiveReadonly&lt;KibanaRequestRoute&gt;</code> |  |
-|  [url](./kibana-plugin-server.kibanarequest.url.md) |  | <code>Url</code> |  |
+|  [route](./kibana-plugin-server.kibanarequest.route.md) |  | <code>RecursiveReadonly&lt;KibanaRequestRoute&gt;</code> | matched route details |
+|  [url](./kibana-plugin-server.kibanarequest.url.md) |  | <code>Url</code> | a WHATWG URL standard object. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.kibanarequest.route.md b/docs/development/core/server/kibana-plugin-server.kibanarequest.route.md
index 301eeef1b6bb5..88954eedf4cfb 100644
--- a/docs/development/core/server/kibana-plugin-server.kibanarequest.route.md
+++ b/docs/development/core/server/kibana-plugin-server.kibanarequest.route.md
@@ -4,6 +4,8 @@
 
 ## KibanaRequest.route property
 
+matched route details
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/core/server/kibana-plugin-server.kibanarequest.url.md b/docs/development/core/server/kibana-plugin-server.kibanarequest.url.md
index b8bd46199763e..62d1f97159476 100644
--- a/docs/development/core/server/kibana-plugin-server.kibanarequest.url.md
+++ b/docs/development/core/server/kibana-plugin-server.kibanarequest.url.md
@@ -4,6 +4,8 @@
 
 ## KibanaRequest.url property
 
+a WHATWG URL standard object.
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/core/server/kibana-plugin-server.kibanaresponsefactory.md b/docs/development/core/server/kibana-plugin-server.kibanaresponsefactory.md
new file mode 100644
index 0000000000000..82832ee9334a5
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.kibanaresponsefactory.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [KibanaResponseFactory](./kibana-plugin-server.kibanaresponsefactory.md)
+
+## KibanaResponseFactory type
+
+Creates an object containing request response payload, HTTP headers, error details, and other data transmitted to the client.
+
+<b>Signature:</b>
+
+```typescript
+export declare type KibanaResponseFactory = typeof kibanaResponseFactory;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.knownheaders.md b/docs/development/core/server/kibana-plugin-server.knownheaders.md
new file mode 100644
index 0000000000000..986794f3aaa61
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.knownheaders.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [KnownHeaders](./kibana-plugin-server.knownheaders.md)
+
+## KnownHeaders type
+
+Set of well-known HTTP headers.
+
+<b>Signature:</b>
+
+```typescript
+export declare type KnownHeaders = KnownKeys<IncomingHttpHeaders>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.legacyrequest.md b/docs/development/core/server/kibana-plugin-server.legacyrequest.md
index 6f67928faa52c..a794b3bbe87c7 100644
--- a/docs/development/core/server/kibana-plugin-server.legacyrequest.md
+++ b/docs/development/core/server/kibana-plugin-server.legacyrequest.md
@@ -2,12 +2,15 @@
 
 [Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [LegacyRequest](./kibana-plugin-server.legacyrequest.md)
 
-## LegacyRequest type
+## LegacyRequest interface
 
-Support Legacy platform request for the period of migration.
+> Warning: This API is now obsolete.
+> 
+> `hapi` request object, supported during migration process only for backward compatibility.
+> 
 
 <b>Signature:</b>
 
 ```typescript
-export declare type LegacyRequest = Request;
+export interface LegacyRequest extends Request 
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.md b/docs/development/core/server/kibana-plugin-server.md
index bd4ef84723057..4cb19665a5dd6 100644
--- a/docs/development/core/server/kibana-plugin-server.md
+++ b/docs/development/core/server/kibana-plugin-server.md
@@ -17,12 +17,18 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [ClusterClient](./kibana-plugin-server.clusterclient.md) | Represents an Elasticsearch cluster API client and 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>). |
 |  [ElasticsearchErrorHelpers](./kibana-plugin-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-server.kibanarequest.md) | Kibana specific abstraction for an incoming request. |
-|  [Router](./kibana-plugin-server.router.md) |  |
+|  [Router](./kibana-plugin-server.router.md) | Provides ability to declare a handler function for a particular path and HTTP request method. Each route can have only one handler functions, which is executed when the route is matched. |
 |  [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) |  |
 |  [SavedObjectsSchema](./kibana-plugin-server.savedobjectsschema.md) |  |
 |  [SavedObjectsSerializer](./kibana-plugin-server.savedobjectsserializer.md) |  |
 |  [ScopedClusterClient](./kibana-plugin-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 |
 
+## Enumerations
+
+|  Enumeration | Description |
+|  --- | --- |
+|  [AuthStatus](./kibana-plugin-server.authstatus.md) | Status indicating an outcome of the authentication. |
+
 ## Interfaces
 
 |  Interface | Description |
@@ -32,14 +38,17 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [CallAPIOptions](./kibana-plugin-server.callapioptions.md) | The set of options that defines how API call should be made and result be processed. |
 |  [CoreSetup](./kibana-plugin-server.coresetup.md) | Context passed to the plugins <code>setup</code> method. |
 |  [CoreStart](./kibana-plugin-server.corestart.md) | Context passed to the plugins <code>start</code> method. |
+|  [CustomHttpResponseOptions](./kibana-plugin-server.customhttpresponseoptions.md) | HTTP response parameters for a response with adjustable status code. |
 |  [DiscoveredPlugin](./kibana-plugin-server.discoveredplugin.md) | Small container object used to expose information about discovered plugins that may or may not have been started. |
 |  [ElasticsearchError](./kibana-plugin-server.elasticsearcherror.md) |  |
 |  [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) |  |
 |  [FakeRequest](./kibana-plugin-server.fakerequest.md) | Fake request object created manually by Kibana plugins. |
-|  [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md) |  |
+|  [HttpResponseOptions](./kibana-plugin-server.httpresponseoptions.md) | HTTP response parameters |
+|  [HttpServerSetup](./kibana-plugin-server.httpserversetup.md) | Kibana HTTP Service provides own abstraction for work with HTTP stack. Plugins don't have direct access to <code>hapi</code> server and its primitives anymore. Moreover, plugins shouldn't rely on the fact that HTTP Service uses one or another library under the hood. This gives the platform flexibility to upgrade or changing our internal HTTP stack without breaking plugins. If the HTTP Service lacks functionality you need, we are happy to discuss and support your needs. |
 |  [HttpServiceStart](./kibana-plugin-server.httpservicestart.md) |  |
 |  [InternalCoreStart](./kibana-plugin-server.internalcorestart.md) |  |
 |  [KibanaRequestRoute](./kibana-plugin-server.kibanarequestroute.md) | Request specific route information exposed to a handler. |
+|  [LegacyRequest](./kibana-plugin-server.legacyrequest.md) |  |
 |  [Logger](./kibana-plugin-server.logger.md) | Logger exposes all the necessary methods to log any type of information and this is the interface used by the logging consumers including plugins. |
 |  [LoggerFactory](./kibana-plugin-server.loggerfactory.md) | The single purpose of <code>LoggerFactory</code> interface is to define a way to retrieve a context-based logger instance. |
 |  [LogMeta](./kibana-plugin-server.logmeta.md) | Contextual metadata |
@@ -50,7 +59,8 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PluginsServiceSetup](./kibana-plugin-server.pluginsservicesetup.md) |  |
 |  [PluginsServiceStart](./kibana-plugin-server.pluginsservicestart.md) |  |
 |  [ResponseErrorMeta](./kibana-plugin-server.responseerrormeta.md) | Additional metadata to enhance error output or provide error details. |
-|  [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md) | Route specific configuration. |
+|  [RouteConfig](./kibana-plugin-server.routeconfig.md) | Route specific configuration. |
+|  [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md) | Additional route options. |
 |  [SavedObject](./kibana-plugin-server.savedobject.md) |  |
 |  [SavedObjectAttributes](./kibana-plugin-server.savedobjectattributes.md) |  |
 |  [SavedObjectReference](./kibana-plugin-server.savedobjectreference.md) | A reference to another saved object. |
@@ -58,18 +68,36 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsBulkCreateObject](./kibana-plugin-server.savedobjectsbulkcreateobject.md) |  |
 |  [SavedObjectsBulkGetObject](./kibana-plugin-server.savedobjectsbulkgetobject.md) |  |
 |  [SavedObjectsBulkResponse](./kibana-plugin-server.savedobjectsbulkresponse.md) |  |
-|  [SavedObjectsClientWrapperOptions](./kibana-plugin-server.savedobjectsclientwrapperoptions.md) |  |
+|  [SavedObjectsClientProviderOptions](./kibana-plugin-server.savedobjectsclientprovideroptions.md) | Options to control the creation of the Saved Objects Client. |
+|  [SavedObjectsClientWrapperOptions](./kibana-plugin-server.savedobjectsclientwrapperoptions.md) | Options passed to each SavedObjectsClientWrapperFactory to aid in creating the wrapper instance. |
 |  [SavedObjectsCreateOptions](./kibana-plugin-server.savedobjectscreateoptions.md) |  |
+|  [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) | Options controlling the export operation. |
 |  [SavedObjectsFindOptions](./kibana-plugin-server.savedobjectsfindoptions.md) |  |
 |  [SavedObjectsFindResponse](./kibana-plugin-server.savedobjectsfindresponse.md) |  |
+|  [SavedObjectsImportConflictError](./kibana-plugin-server.savedobjectsimportconflicterror.md) | Represents a failure to import due to a conflict. |
+|  [SavedObjectsImportError](./kibana-plugin-server.savedobjectsimporterror.md) | Represents a failure to import. |
+|  [SavedObjectsImportMissingReferencesError](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.md) | Represents a failure to import due to missing references. |
+|  [SavedObjectsImportOptions](./kibana-plugin-server.savedobjectsimportoptions.md) | Options to control the import operation. |
+|  [SavedObjectsImportResponse](./kibana-plugin-server.savedobjectsimportresponse.md) | The response describing the result of an import. |
+|  [SavedObjectsImportRetry](./kibana-plugin-server.savedobjectsimportretry.md) | Describes a retry operation for importing a saved object. |
+|  [SavedObjectsImportUnknownError](./kibana-plugin-server.savedobjectsimportunknownerror.md) | Represents a failure to import due to an unknown reason. |
+|  [SavedObjectsImportUnsupportedTypeError](./kibana-plugin-server.savedobjectsimportunsupportedtypeerror.md) | Represents a failure to import due to having an unsupported saved object type. |
 |  [SavedObjectsMigrationVersion](./kibana-plugin-server.savedobjectsmigrationversion.md) | A dictionary of saved object type -<!-- -->&gt; version used to determine what migrations need to be applied to a saved object. |
 |  [SavedObjectsRawDoc](./kibana-plugin-server.savedobjectsrawdoc.md) | A raw document as represented directly in the saved object index. |
+|  [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) | Options to control the "resolve import" operation. |
 |  [SavedObjectsService](./kibana-plugin-server.savedobjectsservice.md) |  |
 |  [SavedObjectsUpdateOptions](./kibana-plugin-server.savedobjectsupdateoptions.md) |  |
 |  [SavedObjectsUpdateResponse](./kibana-plugin-server.savedobjectsupdateresponse.md) |  |
 |  [SessionStorage](./kibana-plugin-server.sessionstorage.md) | Provides an interface to store and retrieve data across requests. |
+|  [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md) | Configuration used to create HTTP session storage based on top of cookie mechanism. |
 |  [SessionStorageFactory](./kibana-plugin-server.sessionstoragefactory.md) | SessionStorage factory to bind one to an incoming request |
 
+## Variables
+
+|  Variable | Description |
+|  --- | --- |
+|  [kibanaResponseFactory](./kibana-plugin-server.kibanaresponsefactory.md) | Set of helpers used to create <code>KibanaResponse</code> to form HTTP response on an incoming request. Should be returned as a result of [RequestHandler](./kibana-plugin-server.requesthandler.md) execution. |
+
 ## Type Aliases
 
 |  Type Alias | Description |
@@ -79,15 +107,22 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [AuthHeaders](./kibana-plugin-server.authheaders.md) | Auth Headers map |
 |  [ElasticsearchClientConfig](./kibana-plugin-server.elasticsearchclientconfig.md) |  |
 |  [GetAuthHeaders](./kibana-plugin-server.getauthheaders.md) | Get headers to authenticate a user against Elasticsearch. |
-|  [Headers](./kibana-plugin-server.headers.md) |  |
-|  [LegacyRequest](./kibana-plugin-server.legacyrequest.md) | Support Legacy platform request for the period of migration. |
+|  [GetAuthState](./kibana-plugin-server.getauthstate.md) | Get authentication state for a request. Returned by <code>auth</code> interceptor. |
+|  [Headers](./kibana-plugin-server.headers.md) | Http request headers to read. |
+|  [HttpResponsePayload](./kibana-plugin-server.httpresponsepayload.md) | Data send to the client as a response payload. |
+|  [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md) |  |
+|  [IsAuthenticated](./kibana-plugin-server.isauthenticated.md) | Return authentication status for a request. |
+|  [KibanaResponseFactory](./kibana-plugin-server.kibanaresponsefactory.md) | Creates an object containing request response payload, HTTP headers, error details, and other data transmitted to the client. |
+|  [KnownHeaders](./kibana-plugin-server.knownheaders.md) | Set of well-known HTTP headers. |
 |  [OnPostAuthHandler](./kibana-plugin-server.onpostauthhandler.md) |  |
 |  [OnPreAuthHandler](./kibana-plugin-server.onpreauthhandler.md) |  |
 |  [PluginInitializer](./kibana-plugin-server.plugininitializer.md) | The <code>plugin</code> export at the root of a plugin's <code>server</code> directory should conform to this interface. |
 |  [PluginName](./kibana-plugin-server.pluginname.md) | Dedicated type for plugin name/id that is supposed to make Map/Set/Arrays that use it as a key or value more obvious. |
 |  [RecursiveReadonly](./kibana-plugin-server.recursivereadonly.md) |  |
+|  [RedirectResponseOptions](./kibana-plugin-server.redirectresponseoptions.md) | HTTP response parameters for redirection response |
+|  [RequestHandler](./kibana-plugin-server.requesthandler.md) | A function executed when route path matched requested resource path. Request handler is expected to return a result of one of [KibanaResponseFactory](./kibana-plugin-server.kibanaresponsefactory.md) functions. |
 |  [ResponseError](./kibana-plugin-server.responseerror.md) | Error message and optional data send to the client in case of error. |
 |  [RouteMethod](./kibana-plugin-server.routemethod.md) | The set of common HTTP methods supported by Kibana routing. |
 |  [SavedObjectsClientContract](./kibana-plugin-server.savedobjectsclientcontract.md) | \#\# SavedObjectsClient errors<!-- -->Since the SavedObjectsClient has its hands in everything we are a little paranoid about the way we present errors back to to application code. Ideally, all errors will be either:<!-- -->1. Caused by bad implementation (ie. undefined is not a function) and as such unpredictable 2. An error that has been classified and decorated appropriately by the decorators in [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md)<!-- -->Type 1 errors are inevitable, but since all expected/handle-able errors should be Type 2 the <code>isXYZError()</code> helpers exposed at <code>SavedObjectsErrorHelpers</code> should be used to understand and manage error responses from the <code>SavedObjectsClient</code>.<!-- -->Type 2 errors are decorated versions of the source error, so if the elasticsearch client threw an error it will be decorated based on its type. That means that rather than looking for <code>error.body.error.type</code> or doing substring checks on <code>error.body.error.reason</code>, just use the helpers to understand the meaning of the error:<!-- -->\`\`\`<!-- -->js if (SavedObjectsErrorHelpers.isNotFoundError(error)) { // handle 404 }<!-- -->if (SavedObjectsErrorHelpers.isNotAuthorizedError(error)) { // 401 handling should be automatic, but in case you wanted to know }<!-- -->// always rethrow the error unless you handle it throw error; \`\`\`<!-- -->\#\#\# 404s from missing index<!-- -->From the perspective of application code and APIs the SavedObjectsClient is a black box that persists objects. One of the internal details that users have no control over is that we use an elasticsearch index for persistance and that index might be missing.<!-- -->At the time of writing we are in the process of transitioning away from the operating assumption that the SavedObjects index is always available. Part of this transition is handling errors resulting from an index missing. These used to trigger a 500 error in most cases, and in others cause 404s with different error messages.<!-- -->From my (Spencer) perspective, a 404 from the SavedObjectsApi is a 404; The object the request/call was targeting could not be found. This is why \#14141 takes special care to ensure that 404 errors are generic and don't distinguish between index missing or document missing.<!-- -->\#\#\# 503s from missing index<!-- -->Unlike all other methods, create requests are supposed to succeed even when the Kibana index does not exist because it will be automatically created by elasticsearch. When that is not the case it is because Elasticsearch's <code>action.auto_create_index</code> setting prevents it from being created automatically so we throw a special 503 with the intention of informing the user that their Elasticsearch settings need to be updated.<!-- -->See [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) |
-|  [SavedObjectsClientWrapperFactory](./kibana-plugin-server.savedobjectsclientwrapperfactory.md) |  |
+|  [SavedObjectsClientWrapperFactory](./kibana-plugin-server.savedobjectsclientwrapperfactory.md) | Describes the factory used to create instances of Saved Objects Client Wrappers. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.redirectresponseoptions.md b/docs/development/core/server/kibana-plugin-server.redirectresponseoptions.md
new file mode 100644
index 0000000000000..6fb0a5add2fb6
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.redirectresponseoptions.md
@@ -0,0 +1,17 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RedirectResponseOptions](./kibana-plugin-server.redirectresponseoptions.md)
+
+## RedirectResponseOptions type
+
+HTTP response parameters for redirection response
+
+<b>Signature:</b>
+
+```typescript
+export declare type RedirectResponseOptions = HttpResponseOptions & {
+    headers: {
+        location: string;
+    };
+};
+```
diff --git a/docs/development/core/server/kibana-plugin-server.requesthandler.md b/docs/development/core/server/kibana-plugin-server.requesthandler.md
new file mode 100644
index 0000000000000..b7e593c30f2f3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.requesthandler.md
@@ -0,0 +1,42 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RequestHandler](./kibana-plugin-server.requesthandler.md)
+
+## RequestHandler type
+
+A function executed when route path matched requested resource path. Request handler is expected to return a result of one of [KibanaResponseFactory](./kibana-plugin-server.kibanaresponsefactory.md) functions.
+
+<b>Signature:</b>
+
+```typescript
+export declare type RequestHandler<P extends ObjectType, Q extends ObjectType, B extends ObjectType> = (request: KibanaRequest<TypeOf<P>, TypeOf<Q>, TypeOf<B>>, response: KibanaResponseFactory) => KibanaResponse<any> | Promise<KibanaResponse<any>>;
+```
+
+## Example
+
+
+```ts
+const router = new Router('my-app');
+// creates a route handler for GET request on 'my-app/path/{id}' path
+router.get(
+  {
+    path: 'path/{id}',
+    // defines a validation schema for a named segment of the route path
+    validate: {
+      params: schema.object({
+        id: schema.string(),
+      }),
+    },
+  },
+  // function to execute to create a responses
+  async (request, response) => {
+    const data = await findObject(request.params.id);
+    // creates a command to respond with 'not found' error
+    if (!data) return response.notFound();
+    // creates a command to send found data to the client
+    return response.ok(data);
+  }
+);
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.md b/docs/development/core/server/kibana-plugin-server.routeconfig.md
new file mode 100644
index 0000000000000..87ec365dc2510
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteConfig](./kibana-plugin-server.routeconfig.md)
+
+## RouteConfig interface
+
+Route specific configuration.
+
+<b>Signature:</b>
+
+```typescript
+export interface RouteConfig<P extends ObjectType, Q extends ObjectType, B extends ObjectType> 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [options](./kibana-plugin-server.routeconfig.options.md) | <code>RouteConfigOptions</code> | Additional route options [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md)<!-- -->. |
+|  [path](./kibana-plugin-server.routeconfig.path.md) | <code>string</code> | The endpoint \_within\_ the router path to register the route. E.g. if the router is registered at <code>/elasticsearch</code> and the route path is <code>/search</code>, the full path for the route is <code>/elasticsearch/search</code>. Supports: - named path segments <code>path/{name}</code>. - optional path segments <code>path/{position?}</code>. - multi-segments <code>path/{coordinates*2}</code>. Segments are accessible within a handler function as <code>params</code> property of [KibanaRequest](./kibana-plugin-server.kibanarequest.md) object. To have read access to <code>params</code> you \*must\* specify validation schema with [RouteConfig.validate](./kibana-plugin-server.routeconfig.validate.md)<!-- -->. |
+|  [validate](./kibana-plugin-server.routeconfig.validate.md) | <code>RouteSchemas&lt;P, Q, B&gt; &#124; false</code> | A schema created with <code>@kbn/config-schema</code> that every request will be validated against. You \*must\* specify a validation schema to be able to read: - url path segments - request query - request body To opt out of validating the request, specify <code>false</code>. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.options.md b/docs/development/core/server/kibana-plugin-server.routeconfig.options.md
new file mode 100644
index 0000000000000..12ca36da6de7c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.options.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteConfig](./kibana-plugin-server.routeconfig.md) &gt; [options](./kibana-plugin-server.routeconfig.options.md)
+
+## RouteConfig.options property
+
+Additional route options [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+options?: RouteConfigOptions;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.path.md b/docs/development/core/server/kibana-plugin-server.routeconfig.path.md
new file mode 100644
index 0000000000000..3437f0e0fe064
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.path.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteConfig](./kibana-plugin-server.routeconfig.md) &gt; [path](./kibana-plugin-server.routeconfig.path.md)
+
+## RouteConfig.path property
+
+The endpoint \_within\_ the router path to register the route. E.g. if the router is registered at `/elasticsearch` and the route path is `/search`<!-- -->, the full path for the route is `/elasticsearch/search`<!-- -->. Supports: - named path segments `path/{name}`<!-- -->. - optional path segments `path/{position?}`<!-- -->. - multi-segments `path/{coordinates*2}`<!-- -->. Segments are accessible within a handler function as `params` property of [KibanaRequest](./kibana-plugin-server.kibanarequest.md) object. To have read access to `params` you \*must\* specify validation schema with [RouteConfig.validate](./kibana-plugin-server.routeconfig.validate.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+path: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md b/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
new file mode 100644
index 0000000000000..f7177485f5fb6
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
@@ -0,0 +1,32 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteConfig](./kibana-plugin-server.routeconfig.md) &gt; [validate](./kibana-plugin-server.routeconfig.validate.md)
+
+## RouteConfig.validate property
+
+A schema created with `@kbn/config-schema` that every request will be validated against. You \*must\* specify a validation schema to be able to read: - url path segments - request query - request body To opt out of validating the request, specify `false`<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+validate: RouteSchemas<P, Q, B> | false;
+```
+
+## Example
+
+
+```ts
+ import { schema } from '@kbn/config-schema';
+ router.get({
+  path: 'path/{id}'
+  validate: {
+    params: schema.object({
+      id: schema.string(),
+    }),
+    query: schema.object({...}),
+    body: schema.object({...}),
+  },
+ })
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfigoptions.authrequired.md b/docs/development/core/server/kibana-plugin-server.routeconfigoptions.authrequired.md
index 3fb4426c407cd..2bb2491cae5df 100644
--- a/docs/development/core/server/kibana-plugin-server.routeconfigoptions.authrequired.md
+++ b/docs/development/core/server/kibana-plugin-server.routeconfigoptions.authrequired.md
@@ -4,7 +4,7 @@
 
 ## RouteConfigOptions.authRequired property
 
-A flag shows that authentication for a route: enabled when true disabled when false
+A flag shows that authentication for a route: `enabled` when true `disabled` when false
 
 Enabled by default.
 
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfigoptions.md b/docs/development/core/server/kibana-plugin-server.routeconfigoptions.md
index 97e480c5490fc..b4d210ac0b711 100644
--- a/docs/development/core/server/kibana-plugin-server.routeconfigoptions.md
+++ b/docs/development/core/server/kibana-plugin-server.routeconfigoptions.md
@@ -4,7 +4,7 @@
 
 ## RouteConfigOptions interface
 
-Route specific configuration.
+Additional route options.
 
 <b>Signature:</b>
 
@@ -16,6 +16,6 @@ export interface RouteConfigOptions
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [authRequired](./kibana-plugin-server.routeconfigoptions.authrequired.md) | <code>boolean</code> | A flag shows that authentication for a route: enabled when true disabled when false<!-- -->Enabled by default. |
+|  [authRequired](./kibana-plugin-server.routeconfigoptions.authrequired.md) | <code>boolean</code> | A flag shows that authentication for a route: <code>enabled</code> when true <code>disabled</code> when false<!-- -->Enabled by default. |
 |  [tags](./kibana-plugin-server.routeconfigoptions.tags.md) | <code>readonly string[]</code> | Additional metadata tag strings to attach to the route. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.router.(constructor).md b/docs/development/core/server/kibana-plugin-server.router.(constructor).md
index 5f8e1e5e293ab..26048a603c9f6 100644
--- a/docs/development/core/server/kibana-plugin-server.router.(constructor).md
+++ b/docs/development/core/server/kibana-plugin-server.router.(constructor).md
@@ -16,5 +16,5 @@ constructor(path: string);
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  path | <code>string</code> |  |
+|  path | <code>string</code> | a router path, set as the very first path segment for all registered routes. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.router.delete.md b/docs/development/core/server/kibana-plugin-server.router.delete.md
index cd49f80baaf70..565dc10ce76e8 100644
--- a/docs/development/core/server/kibana-plugin-server.router.delete.md
+++ b/docs/development/core/server/kibana-plugin-server.router.delete.md
@@ -4,7 +4,7 @@
 
 ## Router.delete() method
 
-Register a `DELETE` request with the router
+Register a route handler for `DELETE` request.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.router.get.md b/docs/development/core/server/kibana-plugin-server.router.get.md
index ab8e7c8c5a65d..a3899eaa678f7 100644
--- a/docs/development/core/server/kibana-plugin-server.router.get.md
+++ b/docs/development/core/server/kibana-plugin-server.router.get.md
@@ -4,7 +4,7 @@
 
 ## Router.get() method
 
-Register a `GET` request with the router
+Register a route handler for `GET` request.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.router.getroutes.md b/docs/development/core/server/kibana-plugin-server.router.getroutes.md
deleted file mode 100644
index 3e4785a3a7c6c..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.router.getroutes.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-server](./kibana-plugin-server.md) &gt; [Router](./kibana-plugin-server.router.md) &gt; [getRoutes](./kibana-plugin-server.router.getroutes.md)
-
-## Router.getRoutes() method
-
-Returns all routes registered with the this router.
-
-<b>Signature:</b>
-
-```typescript
-getRoutes(): Readonly<RouterRoute>[];
-```
-<b>Returns:</b>
-
-`Readonly<RouterRoute>[]`
-
-List of registered routes.
-
diff --git a/docs/development/core/server/kibana-plugin-server.router.md b/docs/development/core/server/kibana-plugin-server.router.md
index 52193bbc553c7..a5eb1c66c4f0c 100644
--- a/docs/development/core/server/kibana-plugin-server.router.md
+++ b/docs/development/core/server/kibana-plugin-server.router.md
@@ -4,6 +4,7 @@
 
 ## Router class
 
+Provides ability to declare a handler function for a particular path and HTTP request method. Each route can have only one handler functions, which is executed when the route is matched.
 
 <b>Signature:</b>
 
@@ -28,9 +29,18 @@ export declare class Router
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [delete(route, handler)](./kibana-plugin-server.router.delete.md) |  | Register a <code>DELETE</code> request with the router |
-|  [get(route, handler)](./kibana-plugin-server.router.get.md) |  | Register a <code>GET</code> request with the router |
-|  [getRoutes()](./kibana-plugin-server.router.getroutes.md) |  | Returns all routes registered with the this router. |
-|  [post(route, handler)](./kibana-plugin-server.router.post.md) |  | Register a <code>POST</code> request with the router |
-|  [put(route, handler)](./kibana-plugin-server.router.put.md) |  | Register a <code>PUT</code> request with the router |
+|  [delete(route, handler)](./kibana-plugin-server.router.delete.md) |  | Register a route handler for <code>DELETE</code> request. |
+|  [get(route, handler)](./kibana-plugin-server.router.get.md) |  | Register a route handler for <code>GET</code> request. |
+|  [post(route, handler)](./kibana-plugin-server.router.post.md) |  | Register a route handler for <code>POST</code> request. |
+|  [put(route, handler)](./kibana-plugin-server.router.put.md) |  | Register a route handler for <code>PUT</code> request. |
+
+## Example
+
+
+```ts
+const router = new Router('my-app');
+// handler is called when 'my-app/path' resource is requested with `GET` method
+router.get({ path: '/path', validate: false }, (req, res) => res.ok({ content: 'ok' }));
+
+```
 
diff --git a/docs/development/core/server/kibana-plugin-server.router.post.md b/docs/development/core/server/kibana-plugin-server.router.post.md
index a499a46b1ee79..7aca35466d643 100644
--- a/docs/development/core/server/kibana-plugin-server.router.post.md
+++ b/docs/development/core/server/kibana-plugin-server.router.post.md
@@ -4,7 +4,7 @@
 
 ## Router.post() method
 
-Register a `POST` request with the router
+Register a route handler for `POST` request.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.router.put.md b/docs/development/core/server/kibana-plugin-server.router.put.md
index 7b1337279cca9..760ccf9ef88e8 100644
--- a/docs/development/core/server/kibana-plugin-server.router.put.md
+++ b/docs/development/core/server/kibana-plugin-server.router.put.md
@@ -4,7 +4,7 @@
 
 ## Router.put() method
 
-Register a `PUT` request with the router
+Register a route handler for `PUT` request.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclientprovideroptions.excludedwrappers.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclientprovideroptions.excludedwrappers.md
new file mode 100644
index 0000000000000..9eb036c01e26e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclientprovideroptions.excludedwrappers.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsClientProviderOptions](./kibana-plugin-server.savedobjectsclientprovideroptions.md) &gt; [excludedWrappers](./kibana-plugin-server.savedobjectsclientprovideroptions.excludedwrappers.md)
+
+## SavedObjectsClientProviderOptions.excludedWrappers property
+
+<b>Signature:</b>
+
+```typescript
+excludedWrappers?: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclientprovideroptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclientprovideroptions.md
new file mode 100644
index 0000000000000..29b872a30a373
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclientprovideroptions.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsClientProviderOptions](./kibana-plugin-server.savedobjectsclientprovideroptions.md)
+
+## SavedObjectsClientProviderOptions interface
+
+Options to control the creation of the Saved Objects Client.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsClientProviderOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [excludedWrappers](./kibana-plugin-server.savedobjectsclientprovideroptions.excludedwrappers.md) | <code>string[]</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclientwrapperfactory.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclientwrapperfactory.md
index 321aefcba0ffd..3ef2fac727b01 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclientwrapperfactory.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclientwrapperfactory.md
@@ -4,6 +4,8 @@
 
 ## SavedObjectsClientWrapperFactory type
 
+Describes the factory used to create instances of Saved Objects Client Wrappers.
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclientwrapperoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclientwrapperoptions.md
index 1a096fd9e5264..65e7cfa64c2a6 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclientwrapperoptions.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclientwrapperoptions.md
@@ -4,6 +4,8 @@
 
 ## SavedObjectsClientWrapperOptions interface
 
+Options passed to each SavedObjectsClientWrapperFactory to aid in creating the wrapper instance.
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.exportsizelimit.md b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.exportsizelimit.md
new file mode 100644
index 0000000000000..d8ff7b4c9e2ed
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.exportsizelimit.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) &gt; [exportSizeLimit](./kibana-plugin-server.savedobjectsexportoptions.exportsizelimit.md)
+
+## SavedObjectsExportOptions.exportSizeLimit property
+
+<b>Signature:</b>
+
+```typescript
+exportSizeLimit: number;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.includereferencesdeep.md b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.includereferencesdeep.md
new file mode 100644
index 0000000000000..1972cc6634b75
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.includereferencesdeep.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) &gt; [includeReferencesDeep](./kibana-plugin-server.savedobjectsexportoptions.includereferencesdeep.md)
+
+## SavedObjectsExportOptions.includeReferencesDeep property
+
+<b>Signature:</b>
+
+```typescript
+includeReferencesDeep?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.md
new file mode 100644
index 0000000000000..66f501a0f1433
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md)
+
+## SavedObjectsExportOptions interface
+
+Options controlling the export operation.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsExportOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [exportSizeLimit](./kibana-plugin-server.savedobjectsexportoptions.exportsizelimit.md) | <code>number</code> |  |
+|  [includeReferencesDeep](./kibana-plugin-server.savedobjectsexportoptions.includereferencesdeep.md) | <code>boolean</code> |  |
+|  [namespace](./kibana-plugin-server.savedobjectsexportoptions.namespace.md) | <code>string</code> |  |
+|  [objects](./kibana-plugin-server.savedobjectsexportoptions.objects.md) | <code>Array&lt;{</code><br/><code>        id: string;</code><br/><code>        type: string;</code><br/><code>    }&gt;</code> |  |
+|  [savedObjectsClient](./kibana-plugin-server.savedobjectsexportoptions.savedobjectsclient.md) | <code>SavedObjectsClientContract</code> |  |
+|  [types](./kibana-plugin-server.savedobjectsexportoptions.types.md) | <code>string[]</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.namespace.md b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.namespace.md
new file mode 100644
index 0000000000000..b5abfba7f6910
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.namespace.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) &gt; [namespace](./kibana-plugin-server.savedobjectsexportoptions.namespace.md)
+
+## SavedObjectsExportOptions.namespace property
+
+<b>Signature:</b>
+
+```typescript
+namespace?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.objects.md b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.objects.md
new file mode 100644
index 0000000000000..46cb62841d46c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.objects.md
@@ -0,0 +1,14 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) &gt; [objects](./kibana-plugin-server.savedobjectsexportoptions.objects.md)
+
+## SavedObjectsExportOptions.objects property
+
+<b>Signature:</b>
+
+```typescript
+objects?: Array<{
+        id: string;
+        type: string;
+    }>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.savedobjectsclient.md b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.savedobjectsclient.md
new file mode 100644
index 0000000000000..fc206d0f7e877
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.savedobjectsclient.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) &gt; [savedObjectsClient](./kibana-plugin-server.savedobjectsexportoptions.savedobjectsclient.md)
+
+## SavedObjectsExportOptions.savedObjectsClient property
+
+<b>Signature:</b>
+
+```typescript
+savedObjectsClient: SavedObjectsClientContract;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.types.md b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.types.md
new file mode 100644
index 0000000000000..204402fe355e3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsexportoptions.types.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) &gt; [types](./kibana-plugin-server.savedobjectsexportoptions.types.md)
+
+## SavedObjectsExportOptions.types property
+
+<b>Signature:</b>
+
+```typescript
+types?: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportconflicterror.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportconflicterror.md
new file mode 100644
index 0000000000000..485500da504a9
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportconflicterror.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportConflictError](./kibana-plugin-server.savedobjectsimportconflicterror.md)
+
+## SavedObjectsImportConflictError interface
+
+Represents a failure to import due to a conflict.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportConflictError 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [type](./kibana-plugin-server.savedobjectsimportconflicterror.type.md) | <code>'conflict'</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportconflicterror.type.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportconflicterror.type.md
new file mode 100644
index 0000000000000..bd85de140674a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportconflicterror.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportConflictError](./kibana-plugin-server.savedobjectsimportconflicterror.md) &gt; [type](./kibana-plugin-server.savedobjectsimportconflicterror.type.md)
+
+## SavedObjectsImportConflictError.type property
+
+<b>Signature:</b>
+
+```typescript
+type: 'conflict';
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.error.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.error.md
new file mode 100644
index 0000000000000..0828ca9e01c34
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.error.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportError](./kibana-plugin-server.savedobjectsimporterror.md) &gt; [error](./kibana-plugin-server.savedobjectsimporterror.error.md)
+
+## SavedObjectsImportError.error property
+
+<b>Signature:</b>
+
+```typescript
+error: SavedObjectsImportConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.id.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.id.md
new file mode 100644
index 0000000000000..0791d668f4626
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.id.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportError](./kibana-plugin-server.savedobjectsimporterror.md) &gt; [id](./kibana-plugin-server.savedobjectsimporterror.id.md)
+
+## SavedObjectsImportError.id property
+
+<b>Signature:</b>
+
+```typescript
+id: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.md
new file mode 100644
index 0000000000000..0d734c21c3151
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportError](./kibana-plugin-server.savedobjectsimporterror.md)
+
+## SavedObjectsImportError interface
+
+Represents a failure to import.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportError 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [error](./kibana-plugin-server.savedobjectsimporterror.error.md) | <code>SavedObjectsImportConflictError &#124; SavedObjectsImportUnsupportedTypeError &#124; SavedObjectsImportMissingReferencesError &#124; SavedObjectsImportUnknownError</code> |  |
+|  [id](./kibana-plugin-server.savedobjectsimporterror.id.md) | <code>string</code> |  |
+|  [title](./kibana-plugin-server.savedobjectsimporterror.title.md) | <code>string</code> |  |
+|  [type](./kibana-plugin-server.savedobjectsimporterror.type.md) | <code>string</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.title.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.title.md
new file mode 100644
index 0000000000000..bd0beeb4d79dd
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.title.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportError](./kibana-plugin-server.savedobjectsimporterror.md) &gt; [title](./kibana-plugin-server.savedobjectsimporterror.title.md)
+
+## SavedObjectsImportError.title property
+
+<b>Signature:</b>
+
+```typescript
+title?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.type.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.type.md
new file mode 100644
index 0000000000000..0b48cc4bbaecf
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimporterror.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportError](./kibana-plugin-server.savedobjectsimporterror.md) &gt; [type](./kibana-plugin-server.savedobjectsimporterror.type.md)
+
+## SavedObjectsImportError.type property
+
+<b>Signature:</b>
+
+```typescript
+type: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.blocking.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.blocking.md
new file mode 100644
index 0000000000000..bbbd499ea5844
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.blocking.md
@@ -0,0 +1,14 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportMissingReferencesError](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.md) &gt; [blocking](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.blocking.md)
+
+## SavedObjectsImportMissingReferencesError.blocking property
+
+<b>Signature:</b>
+
+```typescript
+blocking: Array<{
+        type: string;
+        id: string;
+    }>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.md
new file mode 100644
index 0000000000000..fb4e997fe17ba
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportMissingReferencesError](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.md)
+
+## SavedObjectsImportMissingReferencesError interface
+
+Represents a failure to import due to missing references.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportMissingReferencesError 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [blocking](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.blocking.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        id: string;</code><br/><code>    }&gt;</code> |  |
+|  [references](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.references.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        id: string;</code><br/><code>    }&gt;</code> |  |
+|  [type](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.type.md) | <code>'missing_references'</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.references.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.references.md
new file mode 100644
index 0000000000000..593d2b48d456c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.references.md
@@ -0,0 +1,14 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportMissingReferencesError](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.md) &gt; [references](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.references.md)
+
+## SavedObjectsImportMissingReferencesError.references property
+
+<b>Signature:</b>
+
+```typescript
+references: Array<{
+        type: string;
+        id: string;
+    }>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.type.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.type.md
new file mode 100644
index 0000000000000..3e6e80f77c447
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportmissingreferenceserror.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportMissingReferencesError](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.md) &gt; [type](./kibana-plugin-server.savedobjectsimportmissingreferenceserror.type.md)
+
+## SavedObjectsImportMissingReferencesError.type property
+
+<b>Signature:</b>
+
+```typescript
+type: 'missing_references';
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.md
new file mode 100644
index 0000000000000..a1ea33e11b14f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportOptions](./kibana-plugin-server.savedobjectsimportoptions.md)
+
+## SavedObjectsImportOptions interface
+
+Options to control the import operation.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [namespace](./kibana-plugin-server.savedobjectsimportoptions.namespace.md) | <code>string</code> |  |
+|  [objectLimit](./kibana-plugin-server.savedobjectsimportoptions.objectlimit.md) | <code>number</code> |  |
+|  [overwrite](./kibana-plugin-server.savedobjectsimportoptions.overwrite.md) | <code>boolean</code> |  |
+|  [readStream](./kibana-plugin-server.savedobjectsimportoptions.readstream.md) | <code>Readable</code> |  |
+|  [savedObjectsClient](./kibana-plugin-server.savedobjectsimportoptions.savedobjectsclient.md) | <code>SavedObjectsClientContract</code> |  |
+|  [supportedTypes](./kibana-plugin-server.savedobjectsimportoptions.supportedtypes.md) | <code>string[]</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.namespace.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.namespace.md
new file mode 100644
index 0000000000000..600a4dc1176f3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.namespace.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportOptions](./kibana-plugin-server.savedobjectsimportoptions.md) &gt; [namespace](./kibana-plugin-server.savedobjectsimportoptions.namespace.md)
+
+## SavedObjectsImportOptions.namespace property
+
+<b>Signature:</b>
+
+```typescript
+namespace?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.objectlimit.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.objectlimit.md
new file mode 100644
index 0000000000000..bb040a560b89b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.objectlimit.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportOptions](./kibana-plugin-server.savedobjectsimportoptions.md) &gt; [objectLimit](./kibana-plugin-server.savedobjectsimportoptions.objectlimit.md)
+
+## SavedObjectsImportOptions.objectLimit property
+
+<b>Signature:</b>
+
+```typescript
+objectLimit: number;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.overwrite.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.overwrite.md
new file mode 100644
index 0000000000000..4586a93568588
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.overwrite.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportOptions](./kibana-plugin-server.savedobjectsimportoptions.md) &gt; [overwrite](./kibana-plugin-server.savedobjectsimportoptions.overwrite.md)
+
+## SavedObjectsImportOptions.overwrite property
+
+<b>Signature:</b>
+
+```typescript
+overwrite: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.readstream.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.readstream.md
new file mode 100644
index 0000000000000..4b54f931797cf
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.readstream.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportOptions](./kibana-plugin-server.savedobjectsimportoptions.md) &gt; [readStream](./kibana-plugin-server.savedobjectsimportoptions.readstream.md)
+
+## SavedObjectsImportOptions.readStream property
+
+<b>Signature:</b>
+
+```typescript
+readStream: Readable;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.savedobjectsclient.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.savedobjectsclient.md
new file mode 100644
index 0000000000000..f0d439aedc005
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.savedobjectsclient.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportOptions](./kibana-plugin-server.savedobjectsimportoptions.md) &gt; [savedObjectsClient](./kibana-plugin-server.savedobjectsimportoptions.savedobjectsclient.md)
+
+## SavedObjectsImportOptions.savedObjectsClient property
+
+<b>Signature:</b>
+
+```typescript
+savedObjectsClient: SavedObjectsClientContract;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.supportedtypes.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.supportedtypes.md
new file mode 100644
index 0000000000000..0359c53d8fcf1
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportoptions.supportedtypes.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportOptions](./kibana-plugin-server.savedobjectsimportoptions.md) &gt; [supportedTypes](./kibana-plugin-server.savedobjectsimportoptions.supportedtypes.md)
+
+## SavedObjectsImportOptions.supportedTypes property
+
+<b>Signature:</b>
+
+```typescript
+supportedTypes: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.errors.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.errors.md
new file mode 100644
index 0000000000000..c59390c6d45e0
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.errors.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportResponse](./kibana-plugin-server.savedobjectsimportresponse.md) &gt; [errors](./kibana-plugin-server.savedobjectsimportresponse.errors.md)
+
+## SavedObjectsImportResponse.errors property
+
+<b>Signature:</b>
+
+```typescript
+errors?: SavedObjectsImportError[];
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.md
new file mode 100644
index 0000000000000..23f6526dc6367
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportResponse](./kibana-plugin-server.savedobjectsimportresponse.md)
+
+## SavedObjectsImportResponse interface
+
+The response describing the result of an import.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportResponse 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [errors](./kibana-plugin-server.savedobjectsimportresponse.errors.md) | <code>SavedObjectsImportError[]</code> |  |
+|  [success](./kibana-plugin-server.savedobjectsimportresponse.success.md) | <code>boolean</code> |  |
+|  [successCount](./kibana-plugin-server.savedobjectsimportresponse.successcount.md) | <code>number</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.success.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.success.md
new file mode 100644
index 0000000000000..5fd76959c556c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.success.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportResponse](./kibana-plugin-server.savedobjectsimportresponse.md) &gt; [success](./kibana-plugin-server.savedobjectsimportresponse.success.md)
+
+## SavedObjectsImportResponse.success property
+
+<b>Signature:</b>
+
+```typescript
+success: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.successcount.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.successcount.md
new file mode 100644
index 0000000000000..4b49f57e8367d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportresponse.successcount.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportResponse](./kibana-plugin-server.savedobjectsimportresponse.md) &gt; [successCount](./kibana-plugin-server.savedobjectsimportresponse.successcount.md)
+
+## SavedObjectsImportResponse.successCount property
+
+<b>Signature:</b>
+
+```typescript
+successCount: number;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.id.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.id.md
new file mode 100644
index 0000000000000..568185b2438b7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.id.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportRetry](./kibana-plugin-server.savedobjectsimportretry.md) &gt; [id](./kibana-plugin-server.savedobjectsimportretry.id.md)
+
+## SavedObjectsImportRetry.id property
+
+<b>Signature:</b>
+
+```typescript
+id: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.md
new file mode 100644
index 0000000000000..dc842afbf9f29
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportRetry](./kibana-plugin-server.savedobjectsimportretry.md)
+
+## SavedObjectsImportRetry interface
+
+Describes a retry operation for importing a saved object.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportRetry 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [id](./kibana-plugin-server.savedobjectsimportretry.id.md) | <code>string</code> |  |
+|  [overwrite](./kibana-plugin-server.savedobjectsimportretry.overwrite.md) | <code>boolean</code> |  |
+|  [replaceReferences](./kibana-plugin-server.savedobjectsimportretry.replacereferences.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        from: string;</code><br/><code>        to: string;</code><br/><code>    }&gt;</code> |  |
+|  [type](./kibana-plugin-server.savedobjectsimportretry.type.md) | <code>string</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.overwrite.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.overwrite.md
new file mode 100644
index 0000000000000..36a31e836aebc
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.overwrite.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportRetry](./kibana-plugin-server.savedobjectsimportretry.md) &gt; [overwrite](./kibana-plugin-server.savedobjectsimportretry.overwrite.md)
+
+## SavedObjectsImportRetry.overwrite property
+
+<b>Signature:</b>
+
+```typescript
+overwrite: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.replacereferences.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.replacereferences.md
new file mode 100644
index 0000000000000..c3439bb554e13
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.replacereferences.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportRetry](./kibana-plugin-server.savedobjectsimportretry.md) &gt; [replaceReferences](./kibana-plugin-server.savedobjectsimportretry.replacereferences.md)
+
+## SavedObjectsImportRetry.replaceReferences property
+
+<b>Signature:</b>
+
+```typescript
+replaceReferences: Array<{
+        type: string;
+        from: string;
+        to: string;
+    }>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.type.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.type.md
new file mode 100644
index 0000000000000..8f0408dcbc11e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportretry.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportRetry](./kibana-plugin-server.savedobjectsimportretry.md) &gt; [type](./kibana-plugin-server.savedobjectsimportretry.type.md)
+
+## SavedObjectsImportRetry.type property
+
+<b>Signature:</b>
+
+```typescript
+type: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.md
new file mode 100644
index 0000000000000..913038c5bc67d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportUnknownError](./kibana-plugin-server.savedobjectsimportunknownerror.md)
+
+## SavedObjectsImportUnknownError interface
+
+Represents a failure to import due to an unknown reason.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportUnknownError 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [message](./kibana-plugin-server.savedobjectsimportunknownerror.message.md) | <code>string</code> |  |
+|  [statusCode](./kibana-plugin-server.savedobjectsimportunknownerror.statuscode.md) | <code>number</code> |  |
+|  [type](./kibana-plugin-server.savedobjectsimportunknownerror.type.md) | <code>'unknown'</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.message.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.message.md
new file mode 100644
index 0000000000000..96b8b98bf6a9f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.message.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportUnknownError](./kibana-plugin-server.savedobjectsimportunknownerror.md) &gt; [message](./kibana-plugin-server.savedobjectsimportunknownerror.message.md)
+
+## SavedObjectsImportUnknownError.message property
+
+<b>Signature:</b>
+
+```typescript
+message: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.statuscode.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.statuscode.md
new file mode 100644
index 0000000000000..9cdef84ff4ea7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.statuscode.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportUnknownError](./kibana-plugin-server.savedobjectsimportunknownerror.md) &gt; [statusCode](./kibana-plugin-server.savedobjectsimportunknownerror.statuscode.md)
+
+## SavedObjectsImportUnknownError.statusCode property
+
+<b>Signature:</b>
+
+```typescript
+statusCode: number;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.type.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.type.md
new file mode 100644
index 0000000000000..cf31166157ab7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunknownerror.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportUnknownError](./kibana-plugin-server.savedobjectsimportunknownerror.md) &gt; [type](./kibana-plugin-server.savedobjectsimportunknownerror.type.md)
+
+## SavedObjectsImportUnknownError.type property
+
+<b>Signature:</b>
+
+```typescript
+type: 'unknown';
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportunsupportedtypeerror.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunsupportedtypeerror.md
new file mode 100644
index 0000000000000..cc775b20bb8f2
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunsupportedtypeerror.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportUnsupportedTypeError](./kibana-plugin-server.savedobjectsimportunsupportedtypeerror.md)
+
+## SavedObjectsImportUnsupportedTypeError interface
+
+Represents a failure to import due to having an unsupported saved object type.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportUnsupportedTypeError 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [type](./kibana-plugin-server.savedobjectsimportunsupportedtypeerror.type.md) | <code>'unsupported_type'</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsimportunsupportedtypeerror.type.md b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunsupportedtypeerror.type.md
new file mode 100644
index 0000000000000..ae69911020c18
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsimportunsupportedtypeerror.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsImportUnsupportedTypeError](./kibana-plugin-server.savedobjectsimportunsupportedtypeerror.md) &gt; [type](./kibana-plugin-server.savedobjectsimportunsupportedtypeerror.type.md)
+
+## SavedObjectsImportUnsupportedTypeError.type property
+
+<b>Signature:</b>
+
+```typescript
+type: 'unsupported_type';
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md
new file mode 100644
index 0000000000000..e3542714d96bb
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md)
+
+## SavedObjectsResolveImportErrorsOptions interface
+
+Options to control the "resolve import" operation.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsResolveImportErrorsOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [namespace](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.namespace.md) | <code>string</code> |  |
+|  [objectLimit](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.objectlimit.md) | <code>number</code> |  |
+|  [readStream](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.readstream.md) | <code>Readable</code> |  |
+|  [retries](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.retries.md) | <code>SavedObjectsImportRetry[]</code> |  |
+|  [savedObjectsClient](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.savedobjectsclient.md) | <code>SavedObjectsClientContract</code> |  |
+|  [supportedTypes](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md) | <code>string[]</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.namespace.md b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.namespace.md
new file mode 100644
index 0000000000000..6175e75a4bbec
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.namespace.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) &gt; [namespace](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.namespace.md)
+
+## SavedObjectsResolveImportErrorsOptions.namespace property
+
+<b>Signature:</b>
+
+```typescript
+namespace?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.objectlimit.md b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.objectlimit.md
new file mode 100644
index 0000000000000..d5616851e1386
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.objectlimit.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) &gt; [objectLimit](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.objectlimit.md)
+
+## SavedObjectsResolveImportErrorsOptions.objectLimit property
+
+<b>Signature:</b>
+
+```typescript
+objectLimit: number;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.readstream.md b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.readstream.md
new file mode 100644
index 0000000000000..e4b5d92d7b05a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.readstream.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) &gt; [readStream](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.readstream.md)
+
+## SavedObjectsResolveImportErrorsOptions.readStream property
+
+<b>Signature:</b>
+
+```typescript
+readStream: Readable;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.retries.md b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.retries.md
new file mode 100644
index 0000000000000..7dc825f762fe9
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.retries.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) &gt; [retries](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.retries.md)
+
+## SavedObjectsResolveImportErrorsOptions.retries property
+
+<b>Signature:</b>
+
+```typescript
+retries: SavedObjectsImportRetry[];
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.savedobjectsclient.md b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.savedobjectsclient.md
new file mode 100644
index 0000000000000..ae5edc98d3a9e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.savedobjectsclient.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) &gt; [savedObjectsClient](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.savedobjectsclient.md)
+
+## SavedObjectsResolveImportErrorsOptions.savedObjectsClient property
+
+<b>Signature:</b>
+
+```typescript
+savedObjectsClient: SavedObjectsClientContract;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md
new file mode 100644
index 0000000000000..5a92a8d0a9936
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) &gt; [supportedTypes](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md)
+
+## SavedObjectsResolveImportErrorsOptions.supportedTypes property
+
+<b>Signature:</b>
+
+```typescript
+supportedTypes: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsservice.importexport.md b/docs/development/core/server/kibana-plugin-server.savedobjectsservice.importexport.md
new file mode 100644
index 0000000000000..f9b4e46712f4a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsservice.importexport.md
@@ -0,0 +1,16 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsService](./kibana-plugin-server.savedobjectsservice.md) &gt; [importExport](./kibana-plugin-server.savedobjectsservice.importexport.md)
+
+## SavedObjectsService.importExport property
+
+<b>Signature:</b>
+
+```typescript
+importExport: {
+        objectLimit: number;
+        importSavedObjects(options: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
+        resolveImportErrors(options: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse>;
+        getSortedObjectsForExport(options: SavedObjectsExportOptions): Promise<Readable>;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsservice.md b/docs/development/core/server/kibana-plugin-server.savedobjectsservice.md
index ad281002854b3..d9e23e6f15928 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsservice.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsservice.md
@@ -17,7 +17,9 @@ export interface SavedObjectsService<Request = any>
 |  --- | --- | --- |
 |  [addScopedSavedObjectsClientWrapperFactory](./kibana-plugin-server.savedobjectsservice.addscopedsavedobjectsclientwrapperfactory.md) | <code>ScopedSavedObjectsClientProvider&lt;Request&gt;['addClientWrapperFactory']</code> |  |
 |  [getScopedSavedObjectsClient](./kibana-plugin-server.savedobjectsservice.getscopedsavedobjectsclient.md) | <code>ScopedSavedObjectsClientProvider&lt;Request&gt;['getClient']</code> |  |
+|  [importExport](./kibana-plugin-server.savedobjectsservice.importexport.md) | <code>{</code><br/><code>        objectLimit: number;</code><br/><code>        importSavedObjects(options: SavedObjectsImportOptions): Promise&lt;SavedObjectsImportResponse&gt;;</code><br/><code>        resolveImportErrors(options: SavedObjectsResolveImportErrorsOptions): Promise&lt;SavedObjectsImportResponse&gt;;</code><br/><code>        getSortedObjectsForExport(options: SavedObjectsExportOptions): Promise&lt;Readable&gt;;</code><br/><code>    }</code> |  |
 |  [SavedObjectsClient](./kibana-plugin-server.savedobjectsservice.savedobjectsclient.md) | <code>typeof SavedObjectsClient</code> |  |
+|  [schema](./kibana-plugin-server.savedobjectsservice.schema.md) | <code>SavedObjectsSchema</code> |  |
 |  [types](./kibana-plugin-server.savedobjectsservice.types.md) | <code>string[]</code> |  |
 
 ## Methods
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsservice.schema.md b/docs/development/core/server/kibana-plugin-server.savedobjectsservice.schema.md
new file mode 100644
index 0000000000000..be5682e6f034e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsservice.schema.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsService](./kibana-plugin-server.savedobjectsservice.md) &gt; [schema](./kibana-plugin-server.savedobjectsservice.schema.md)
+
+## SavedObjectsService.schema property
+
+<b>Signature:</b>
+
+```typescript
+schema: SavedObjectsSchema;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.scopedclusterclient.(constructor).md b/docs/development/core/server/kibana-plugin-server.scopedclusterclient.(constructor).md
index 94b49e43a113c..0fea07320b2f9 100644
--- a/docs/development/core/server/kibana-plugin-server.scopedclusterclient.(constructor).md
+++ b/docs/development/core/server/kibana-plugin-server.scopedclusterclient.(constructor).md
@@ -9,7 +9,7 @@ Constructs a new instance of the `ScopedClusterClient` class
 <b>Signature:</b>
 
 ```typescript
-constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Record<string, string | string[] | undefined> | undefined);
+constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Headers | undefined);
 ```
 
 ## Parameters
@@ -18,5 +18,5 @@ constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?:
 |  --- | --- | --- |
 |  internalAPICaller | <code>APICaller</code> |  |
 |  scopedAPICaller | <code>APICaller</code> |  |
-|  headers | <code>Record&lt;string, string &#124; string[] &#124; undefined&gt; &#124; undefined</code> |  |
+|  headers | <code>Headers &#124; undefined</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md
new file mode 100644
index 0000000000000..167ab03d7567f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md) &gt; [encryptionKey](./kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md)
+
+## SessionStorageCookieOptions.encryptionKey property
+
+A key used to encrypt a cookie value. Should be at least 32 characters long.
+
+<b>Signature:</b>
+
+```typescript
+encryptionKey: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.issecure.md b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.issecure.md
new file mode 100644
index 0000000000000..824fc9d136a3f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.issecure.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md) &gt; [isSecure](./kibana-plugin-server.sessionstoragecookieoptions.issecure.md)
+
+## SessionStorageCookieOptions.isSecure property
+
+Flag indicating whether the cookie should be sent only via a secure connection.
+
+<b>Signature:</b>
+
+```typescript
+isSecure: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.md b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.md
new file mode 100644
index 0000000000000..de412818142f2
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md)
+
+## SessionStorageCookieOptions interface
+
+Configuration used to create HTTP session storage based on top of cookie mechanism.
+
+<b>Signature:</b>
+
+```typescript
+export interface SessionStorageCookieOptions<T> 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [encryptionKey](./kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md) | <code>string</code> | A key used to encrypt a cookie value. Should be at least 32 characters long. |
+|  [isSecure](./kibana-plugin-server.sessionstoragecookieoptions.issecure.md) | <code>boolean</code> | Flag indicating whether the cookie should be sent only via a secure connection. |
+|  [name](./kibana-plugin-server.sessionstoragecookieoptions.name.md) | <code>string</code> | Name of the session cookie. |
+|  [validate](./kibana-plugin-server.sessionstoragecookieoptions.validate.md) | <code>(sessionValue: T) =&gt; boolean &#124; Promise&lt;boolean&gt;</code> | Function called to validate a cookie content. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.name.md b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.name.md
new file mode 100644
index 0000000000000..e6bc7ea3fe00f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.name.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md) &gt; [name](./kibana-plugin-server.sessionstoragecookieoptions.name.md)
+
+## SessionStorageCookieOptions.name property
+
+Name of the session cookie.
+
+<b>Signature:</b>
+
+```typescript
+name: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.validate.md b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.validate.md
new file mode 100644
index 0000000000000..f3cbfc0d84e18
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.validate.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md) &gt; [validate](./kibana-plugin-server.sessionstoragecookieoptions.validate.md)
+
+## SessionStorageCookieOptions.validate property
+
+Function called to validate a cookie content.
+
+<b>Signature:</b>
+
+```typescript
+validate: (sessionValue: T) => boolean | Promise<boolean>;
+```
diff --git a/docs/images/Dashboard_Resize_Menu.png b/docs/images/Dashboard_Resize_Menu.png
index 317ae381db0df..835d23afe40e9 100644
Binary files a/docs/images/Dashboard_Resize_Menu.png and b/docs/images/Dashboard_Resize_Menu.png differ
diff --git a/docs/images/Dashboard_add_visualization.png b/docs/images/Dashboard_add_visualization.png
index 957e828eff46e..bc705b66e17d1 100644
Binary files a/docs/images/Dashboard_add_visualization.png and b/docs/images/Dashboard_add_visualization.png differ
diff --git a/docs/images/Dashboard_example.png b/docs/images/Dashboard_example.png
index bf226f48944b0..5d18acb67bef5 100644
Binary files a/docs/images/Dashboard_example.png and b/docs/images/Dashboard_example.png differ
diff --git a/docs/images/Dashboard_inspect.png b/docs/images/Dashboard_inspect.png
new file mode 100644
index 0000000000000..80edcf3a49ca0
Binary files /dev/null and b/docs/images/Dashboard_inspect.png differ
diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc
index cb8777c6fef8a..894f9fd7318a6 100644
--- a/docs/management/advanced-options.asciidoc
+++ b/docs/management/advanced-options.asciidoc
@@ -43,6 +43,7 @@ removes it from {kib} permanently.
 `dateFormat:scaled`:: The values that define the format to use to render ordered time-based data. Formatted timestamps must
 adapt to the interval between measurements. Keys are http://en.wikipedia.org/wiki/ISO_8601#Time_intervals[ISO8601 intervals].
 `dateFormat:tz`:: The timezone that Kibana uses. The default value of `Browser` uses the timezone detected by the browser.
+`dateNanosFormat`:: The format to use for displaying https://momentjs.com/docs/#/displaying/format/[pretty formatted dates] of {ref}/date_nanos.html[Elasticsearch date_nanos type].
 `defaultIndex`:: The index to access if no index is set. The default is `null`. 
 `fields:popularLimit`:: The top N most popular fields to show.
 `filterEditor:suggestValues`:: Set this property to `false` to prevent the filter editor from suggesting values for fields.
diff --git a/docs/maps/images/read-only-badge.png b/docs/maps/images/read-only-badge.png
new file mode 100644
index 0000000000000..50289ea80f60c
Binary files /dev/null and b/docs/maps/images/read-only-badge.png differ
diff --git a/docs/maps/maps-getting-started.asciidoc b/docs/maps/maps-getting-started.asciidoc
index 4925ec49897df..cec1938881416 100644
--- a/docs/maps/maps-getting-started.asciidoc
+++ b/docs/maps/maps-getting-started.asciidoc
@@ -13,6 +13,16 @@ light to dark.
 [role="screenshot"]
 image::maps/images/sample_data_web_logs.png[]
 
+[float]
+[[maps-read-only-access]]
+NOTE: If you have insufficient privileges to create or save maps, a read-only icon 
+appears in the application header. The buttons to create new maps or edit
+existing maps won't be visible. For more information on granting access to
+Kibana see <<xpack-security-authorization>>.
+
+[role="screenshot"]
+image::maps/images/read-only-badge.png[Example of Maps' read only access indicator in Kibana's header]
+
 [float]
 === Prerequisites
 Before you start this tutorial, <<add-sample-data, add the web logs sample data set>>. Each
diff --git a/docs/settings/code-settings.asciidoc b/docs/settings/code-settings.asciidoc
index aed24794158bd..e01858e6230b1 100644
--- a/docs/settings/code-settings.asciidoc
+++ b/docs/settings/code-settings.asciidoc
@@ -40,3 +40,6 @@ Maximal number of workspaces each language server allows to span. Defaults to `5
 
 `xpack.code.codeNodeUrl`::
 URL of the Code node. This config is only needed when multiple Kibana instances are set up as a cluster. Defaults to ``
+
+`xpack.code.verbose`::
+Set this config to `true` to log all events. Defaults to `false`
diff --git a/docs/siem/images/ml-ui.png b/docs/siem/images/ml-ui.png
new file mode 100644
index 0000000000000..168ff6363186a
Binary files /dev/null and b/docs/siem/images/ml-ui.png differ
diff --git a/docs/siem/index.asciidoc b/docs/siem/index.asciidoc
index 4606f351d6d6e..6d8aea1f7fe63 100644
--- a/docs/siem/index.asciidoc
+++ b/docs/siem/index.asciidoc
@@ -52,3 +52,4 @@ SIEM can ingest and normalize events from ECS-compatible data sources.
 
 
 include::siem-ui.asciidoc[]
+include::machine-learning.asciidoc[]
diff --git a/docs/siem/machine-learning.asciidoc b/docs/siem/machine-learning.asciidoc
new file mode 100644
index 0000000000000..dd1016d8550ef
--- /dev/null
+++ b/docs/siem/machine-learning.asciidoc
@@ -0,0 +1,16 @@
+[role="xpack"]
+[[machine-learning]]
+== Anomaly Detection with Machine Learning
+
+For *https://www.elastic.co/cloud/elasticsearch-service/signup[Free Trial]*
+and *https://www.elastic.co/subscriptions[Platinum License]* deployments,
+Machine Learning functionality is available throughout the SIEM app. You can
+view the details of detected anomalies within the `Anomalies` table widget
+shown on the Hosts, Network and associated Details pages, or even narrow to
+the specific daterange of an anomaly from the `Max Anomaly Score` details in
+the overview of the Host and IP Details pages. Each of these interfaces also
+offer the ability to drag and drop details of the anomaly to Timeline, such
+as the `Entity` itself, or any of the associated `Influencers`.
+
+[role="screenshot"]
+image::siem/images/ml-ui.png[Machine Learning - Max Anomaly Score]
diff --git a/package.json b/package.json
index 2d4259d5d1851..02f476a62810c 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "@babel/register": "7.4.4",
     "@elastic/charts": "^7.2.1",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "13.0.0",
+    "@elastic/eui": "13.1.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
diff --git a/packages/kbn-es-query/src/es_query/__tests__/build_es_query.js b/packages/kbn-es-query/src/es_query/__tests__/build_es_query.js
index 5c27a204ef263..fde3d063caaa6 100644
--- a/packages/kbn-es-query/src/es_query/__tests__/build_es_query.js
+++ b/packages/kbn-es-query/src/es_query/__tests__/build_es_query.js
@@ -60,10 +60,10 @@ describe('build query', function () {
         bool: {
           must: [
             decorateQuery(luceneStringToDsl('bar:baz'), config.queryStringOptions),
-            { match_all: {} },
           ],
           filter: [
             toElasticsearchQuery(fromKueryExpression('extension:jpg'), indexPattern),
+            { match_all: {} },
           ],
           should: [],
           must_not: [],
@@ -90,9 +90,8 @@ describe('build query', function () {
         bool: {
           must: [
             decorateQuery(luceneStringToDsl('extension:jpg'), config.queryStringOptions),
-            { match_all: {} },
           ],
-          filter: [],
+          filter: [{ match_all: {} }],
           should: [],
           must_not: [],
         }
@@ -122,9 +121,11 @@ describe('build query', function () {
         bool: {
           must: [
             decorateQuery(luceneStringToDsl('@timestamp:"2019-03-23T13:18:00"'), config.queryStringOptions, config.dateFormatTZ),
+          ],
+          filter: [
+            toElasticsearchQuery(fromKueryExpression('@timestamp:"2019-03-23T13:18:00"'), indexPattern, config),
             { match_all: {} }
           ],
-          filter: [toElasticsearchQuery(fromKueryExpression('@timestamp:"2019-03-23T13:18:00"'), indexPattern, config)],
           should: [],
           must_not: [],
         }
diff --git a/packages/kbn-es-query/src/es_query/__tests__/from_filters.js b/packages/kbn-es-query/src/es_query/__tests__/from_filters.js
index 53016f33dc6cd..59e5f4d6faf8a 100644
--- a/packages/kbn-es-query/src/es_query/__tests__/from_filters.js
+++ b/packages/kbn-es-query/src/es_query/__tests__/from_filters.js
@@ -52,7 +52,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expect(result.must).to.eql(expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
 
     it('should place negated filters in the must_not clause', function () {
@@ -86,7 +86,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expect(result.must).to.eql(expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
 
     it('should migrate deprecated match syntax', function () {
@@ -105,7 +105,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expect(result.must).to.eql(expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
 
     it('should not add query:queryString:options to query_string filters', function () {
@@ -119,7 +119,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expect(result.must).to.eql(expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
   });
 });
diff --git a/packages/kbn-es-query/src/es_query/from_filters.js b/packages/kbn-es-query/src/es_query/from_filters.js
index 07f3211b3fc55..b8193b7469a20 100644
--- a/packages/kbn-es-query/src/es_query/from_filters.js
+++ b/packages/kbn-es-query/src/es_query/from_filters.js
@@ -61,7 +61,8 @@ const cleanFilter = function (filter) {
 
 export function buildQueryFromFilters(filters = [], indexPattern, ignoreFilterIfFieldNotInIndex) {
   return {
-    must: filters
+    must: [],
+    filter: filters
       .filter(filterNegate(false))
       .filter(filter => !ignoreFilterIfFieldNotInIndex || filterMatchesIndex(filter, indexPattern))
       .map(translateToQuery)
@@ -69,7 +70,6 @@ export function buildQueryFromFilters(filters = [], indexPattern, ignoreFilterIf
       .map(filter => {
         return migrateFilter(filter, indexPattern);
       }),
-    filter: [],
     should: [],
     must_not: filters
       .filter(filterNegate(true))
diff --git a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
index 7f33c23a8df23..0910635924ea2 100644
--- a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
+++ b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`#start() returns \`Context\` component 1`] = `
           "euiSelectable.loadingOptions": "Loading options",
           "euiSelectable.noAvailableOptions": "There aren't any options available",
           "euiSelectable.noMatchingOptions": [Function],
-          "euiStat.loadingText": [Function],
+          "euiStat.loadingText": "Statistic is loading",
           "euiStep.completeStep": "Step",
           "euiStep.incompleteStep": "Incomplete Step",
           "euiStepHorizontal.buttonTitle": [Function],
diff --git a/src/core/public/i18n/i18n_service.tsx b/src/core/public/i18n/i18n_service.tsx
index 0be47c14e441c..78411a7a418d7 100644
--- a/src/core/public/i18n/i18n_service.tsx
+++ b/src/core/public/i18n/i18n_service.tsx
@@ -244,9 +244,9 @@ export class I18nService {
           values={{ searchValue }}
         />
       ),
-      'euiStat.loadingText': () => (
-        <FormattedMessage id="core.euiStat.loadingText" defaultMessage="Statistic is loading" />
-      ),
+      'euiStat.loadingText': i18n.translate('core.euiStat.loadingText', {
+        defaultMessage: 'Statistic is loading',
+      }),
       'euiStep.completeStep': i18n.translate('core.euiStep.completeStep', {
         defaultMessage: 'Step',
         description:
diff --git a/src/core/server/elasticsearch/cluster_client.ts b/src/core/server/elasticsearch/cluster_client.ts
index c8500499d9702..aa40010bf3b1a 100644
--- a/src/core/server/elasticsearch/cluster_client.ts
+++ b/src/core/server/elasticsearch/cluster_client.ts
@@ -18,10 +18,9 @@
  */
 import { Client } from 'elasticsearch';
 import { get } from 'lodash';
-import { Request } from 'hapi';
 
 import { ElasticsearchErrorHelpers } from './errors';
-import { GetAuthHeaders, isRealRequest } from '../http';
+import { GetAuthHeaders, isRealRequest, LegacyRequest } from '../http';
 import { filterHeaders, Headers, KibanaRequest, ensureRawRequest } from '../http/router';
 import { Logger } from '../logging';
 import {
@@ -36,8 +35,6 @@ import { ScopedClusterClient } from './scoped_cluster_client';
  * @public
  */
 
-export type LegacyRequest = Request;
-
 const noop = () => undefined;
 /**
  * The set of options that defines how API call should be made and result be
diff --git a/src/core/server/elasticsearch/index.ts b/src/core/server/elasticsearch/index.ts
index 1d439dfba49e9..f732f9e39b9e3 100644
--- a/src/core/server/elasticsearch/index.ts
+++ b/src/core/server/elasticsearch/index.ts
@@ -18,7 +18,7 @@
  */
 
 export { ElasticsearchServiceSetup, ElasticsearchService } from './elasticsearch_service';
-export { CallAPIOptions, ClusterClient, FakeRequest, LegacyRequest } from './cluster_client';
+export { CallAPIOptions, ClusterClient, FakeRequest } from './cluster_client';
 export { ScopedClusterClient, Headers, APICaller } from './scoped_cluster_client';
 export { ElasticsearchClientConfig } from './elasticsearch_client_config';
 export { config } from './elasticsearch_config';
diff --git a/src/core/server/http/auth_headers_storage.ts b/src/core/server/http/auth_headers_storage.ts
index bc3b55b3718c0..469e194a61fed 100644
--- a/src/core/server/http/auth_headers_storage.ts
+++ b/src/core/server/http/auth_headers_storage.ts
@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Request } from 'hapi';
-import { KibanaRequest, ensureRawRequest } from './router';
+import { KibanaRequest, ensureRawRequest, LegacyRequest } from './router';
 import { AuthHeaders } from './lifecycle/auth';
 
 /**
  * Get headers to authenticate a user against Elasticsearch.
+ * @param request {@link KibanaRequest} - an incoming request.
+ * @return authentication headers {@link AuthHeaders} for - an incoming request.
  * @public
  * */
-export type GetAuthHeaders = (request: KibanaRequest | Request) => AuthHeaders | undefined;
+export type GetAuthHeaders = (request: KibanaRequest | LegacyRequest) => AuthHeaders | undefined;
 
+/** @internal */
 export class AuthHeadersStorage {
-  private authHeadersCache = new WeakMap<Request, AuthHeaders>();
-  public set = (request: KibanaRequest | Request, headers: AuthHeaders) => {
+  private authHeadersCache = new WeakMap<LegacyRequest, AuthHeaders>();
+  public set = (request: KibanaRequest | LegacyRequest, headers: AuthHeaders) => {
     this.authHeadersCache.set(ensureRawRequest(request), headers);
   };
   public get: GetAuthHeaders = request => {
diff --git a/src/core/server/http/auth_state_storage.ts b/src/core/server/http/auth_state_storage.ts
index 79fd9ed64f3b5..059dc7f380351 100644
--- a/src/core/server/http/auth_state_storage.ts
+++ b/src/core/server/http/auth_state_storage.ts
@@ -16,22 +16,51 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Request } from 'hapi';
-import { KibanaRequest, ensureRawRequest } from './router';
+import { ensureRawRequest, KibanaRequest, LegacyRequest } from './router';
 
+/**
+ * Status indicating an outcome of the authentication.
+ * @public
+ */
 export enum AuthStatus {
+  /**
+   * `auth` interceptor successfully authenticated a user
+   */
   authenticated = 'authenticated',
+  /**
+   * `auth` interceptor failed user authentication
+   */
   unauthenticated = 'unauthenticated',
+  /**
+   * `auth` interceptor has not been registered
+   */
   unknown = 'unknown',
 }
 
+/**
+ * Get authentication state for a request. Returned by `auth` interceptor.
+ * @param request {@link KibanaRequest} - an incoming request.
+ * @public
+ */
+export type GetAuthState = (
+  request: KibanaRequest | LegacyRequest
+) => { status: AuthStatus; state: unknown };
+
+/**
+ * Return authentication status for a request.
+ * @param request {@link KibanaRequest} - an incoming request.
+ * @public
+ */
+export type IsAuthenticated = (request: KibanaRequest | LegacyRequest) => boolean;
+
+/** @internal */
 export class AuthStateStorage {
-  private readonly storage = new WeakMap<Request, unknown>();
+  private readonly storage = new WeakMap<LegacyRequest, unknown>();
   constructor(private readonly canBeAuthenticated: () => boolean) {}
-  public set = (request: KibanaRequest | Request, state: unknown) => {
+  public set = (request: KibanaRequest | LegacyRequest, state: unknown) => {
     this.storage.set(ensureRawRequest(request), state);
   };
-  public get = (request: KibanaRequest | Request) => {
+  public get: GetAuthState = request => {
     const key = ensureRawRequest(request);
     const state = this.storage.get(key);
     const status: AuthStatus = this.storage.has(key)
@@ -42,7 +71,7 @@ export class AuthStateStorage {
 
     return { status, state };
   };
-  public isAuthenticated = (request: KibanaRequest | Request) => {
+  public isAuthenticated: IsAuthenticated = request => {
     return this.get(request).status === AuthStatus.authenticated;
   };
 }
diff --git a/src/core/server/http/base_path_proxy_server.ts b/src/core/server/http/base_path_proxy_server.ts
index 2335f35ab63c1..ff7fee0198f68 100644
--- a/src/core/server/http/base_path_proxy_server.ts
+++ b/src/core/server/http/base_path_proxy_server.ts
@@ -18,7 +18,8 @@
  */
 
 import { ByteSizeValue } from '@kbn/config-schema';
-import { Server } from 'hapi';
+import { Server, Request } from 'hapi';
+import Url from 'url';
 import { Agent as HttpsAgent, ServerOptions as TlsOptions } from 'https';
 import { sample } from 'lodash';
 import { DevConfig } from '../dev';
@@ -146,6 +147,38 @@ export class BasePathProxyServer {
       path: `${this.httpConfig.basePath}/{kbnPath*}`,
     });
 
+    this.server.route({
+      handler: {
+        proxy: {
+          agent: this.httpsAgent,
+          passThrough: true,
+          xforward: true,
+          mapUri: (request: Request) => ({
+            uri: Url.format({
+              hostname: request.server.info.host,
+              port: this.devConfig.basePathProxyTargetPort,
+              protocol: request.server.info.protocol,
+              pathname: `${this.httpConfig.basePath}/${request.params.kbnPath}`,
+              query: request.query,
+            }),
+            headers: request.headers,
+          }),
+        },
+      },
+      method: '*',
+      options: {
+        pre: [
+          // Before we proxy request to a target port we may want to wait until some
+          // condition is met (e.g. until target listener is ready).
+          async (request, responseToolkit) => {
+            await blockUntil();
+            return responseToolkit.continue;
+          },
+        ],
+      },
+      path: `/__UNSAFE_bypassBasePath/{kbnPath*}`,
+    });
+
     // It may happen that basepath has changed, but user still uses the old one,
     // so we can try to check if that's the case and just redirect user to the
     // same URL, but with valid basepath.
diff --git a/src/core/server/http/base_path_service.ts b/src/core/server/http/base_path_service.ts
index df189d29f2f59..951463a2c9919 100644
--- a/src/core/server/http/base_path_service.ts
+++ b/src/core/server/http/base_path_service.ts
@@ -16,24 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Request } from 'hapi';
-import { KibanaRequest, ensureRawRequest } from './router';
+import { ensureRawRequest, KibanaRequest, LegacyRequest } from './router';
 
 import { modifyUrl } from '../../utils';
 
 export class BasePath {
-  private readonly basePathCache = new WeakMap<Request, string>();
+  private readonly basePathCache = new WeakMap<LegacyRequest, string>();
 
   constructor(private readonly serverBasePath?: string) {}
 
-  public get = (request: KibanaRequest | Request) => {
+  public get = (request: KibanaRequest | LegacyRequest) => {
     const requestScopePath = this.basePathCache.get(ensureRawRequest(request)) || '';
     const serverBasePath = this.serverBasePath || '';
     return `${serverBasePath}${requestScopePath}`;
   };
 
   // should work only for KibanaRequest as soon as spaces migrate to NP
-  public set = (request: KibanaRequest | Request, requestSpecificBasePath: string) => {
+  public set = (request: KibanaRequest | LegacyRequest, requestSpecificBasePath: string) => {
     const rawRequest = ensureRawRequest(request);
 
     if (this.basePathCache.has(rawRequest)) {
diff --git a/src/core/server/http/cookie_session_storage.ts b/src/core/server/http/cookie_session_storage.ts
index 7b2569a1c6dd3..8a1b56d87fb4c 100644
--- a/src/core/server/http/cookie_session_storage.ts
+++ b/src/core/server/http/cookie_session_storage.ts
@@ -24,10 +24,26 @@ import { KibanaRequest, ensureRawRequest } from './router';
 import { SessionStorageFactory, SessionStorage } from './session_storage';
 import { Logger } from '..';
 
+/**
+ * Configuration used to create HTTP session storage based on top of cookie mechanism.
+ * @public
+ */
 export interface SessionStorageCookieOptions<T> {
+  /**
+   * Name of the session cookie.
+   */
   name: string;
+  /**
+   * A key used to encrypt a cookie value. Should be at least 32 characters long.
+   */
   encryptionKey: string;
+  /**
+   * Function called to validate a cookie content.
+   */
   validate: (sessionValue: T) => boolean | Promise<boolean>;
+  /**
+   * Flag indicating whether the cookie should be sent only via a secure connection.
+   */
   isSecure: boolean;
 }
 
diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts
index c8b4c5c17f05e..d90fb880a581c 100644
--- a/src/core/server/http/http_server.ts
+++ b/src/core/server/http/http_server.ts
@@ -25,21 +25,98 @@ import { createServer, getListenerOptions, getServerOptions } from './http_tools
 import { adoptToHapiAuthFormat, AuthenticationHandler } from './lifecycle/auth';
 import { adoptToHapiOnPostAuthFormat, OnPostAuthHandler } from './lifecycle/on_post_auth';
 import { adoptToHapiOnPreAuthFormat, OnPreAuthHandler } from './lifecycle/on_pre_auth';
-import { Router, KibanaRequest, ResponseHeaders } from './router';
+import { KibanaRequest, LegacyRequest, ResponseHeaders, Router } from './router';
 import {
   SessionStorageCookieOptions,
   createCookieSessionStorageFactory,
 } from './cookie_session_storage';
 import { SessionStorageFactory } from './session_storage';
-import { AuthStateStorage } from './auth_state_storage';
-import { AuthHeadersStorage } from './auth_headers_storage';
+import { AuthStateStorage, GetAuthState, IsAuthenticated } from './auth_state_storage';
+import { AuthHeadersStorage, GetAuthHeaders } from './auth_headers_storage';
 import { BasePath } from './base_path_service';
 
+/**
+ * Kibana HTTP Service provides own abstraction for work with HTTP stack.
+ * Plugins don't have direct access to `hapi` server and its primitives anymore. Moreover,
+ * plugins shouldn't rely on the fact that HTTP Service uses one or another library under the hood.
+ * This gives the platform flexibility to upgrade or changing our internal HTTP stack without breaking plugins.
+ * If the HTTP Service lacks functionality you need, we are happy to discuss and support your needs.
+ *
+ * @example
+ * To handle an incoming request in your plugin you should:
+ * - Create a `Router` instance. Use `plugin-id` as a prefix path segment for your routes.
+ * ```ts
+ * import { Router } from 'src/core/server';
+ * const router = new Router('my-app');
+ * ```
+ *
+ * - Use `@kbn/config-schema` package to create a schema to validate the request `params`, `query`, and `body`. Every incoming request will be validated against the created schema. If validation failed, the request is rejected with `400` status and `Bad request` error without calling the route's handler.
+ * To opt out of validating the request, specify `false`.
+ * ```ts
+ * import { schema, TypeOf } from '@kbn/config-schema';
+ * const validate = {
+ *   params: schema.object({
+ *     id: schema.string(),
+ *   }),
+ * };
+ * ```
+ *
+ * - Declare a function to respond to incoming request.
+ * The function will receive `request` object containing request details: url, headers, matched route, as well as validated `params`, `query`, `body`.
+ * And `response` object instructing HTTP server to create HTTP response with information sent back to the client as the response body, headers, and HTTP status.
+ * Unlike, `hapi` route handler in the Legacy platform, any exception raised during the handler call will generate `500 Server error` response and log error details for further investigation. See below for returning custom error responses.
+ * ```ts
+ * const handler = async (request: KibanaRequest, response: ResponseFactory) => {
+ *   const data = await findObject(request.params.id);
+ *   // creates a command to respond with 'not found' error
+ *   if (!data) return response.notFound();
+ *   // creates a command to send found data to the client and set response headers
+ *   return response.ok(data, {
+ *     headers: {
+ *       'content-type': 'application/json'
+ *     }
+ *   });
+ * }
+ * ```
+ *
+ * - Register route handler for GET request to 'my-app/path/{id}' path
+ * ```ts
+ * import { schema, TypeOf } from '@kbn/config-schema';
+ * import { Router } from 'src/core/server';
+ * const router = new Router('my-app');
+ *
+ * const validate = {
+ *   params: schema.object({
+ *     id: schema.string(),
+ *   }),
+ * };
+ *
+ * router.get({
+ *   path: 'path/{id}',
+ *   validate
+ * },
+ * async (request, response) => {
+ *   const data = await findObject(request.params.id);
+ *   if (!data) return response.notFound();
+ *   return response.ok(data, {
+ *     headers: {
+ *       'content-type': 'application/json'
+ *     }
+ *   });
+ * });
+ * ```
+ * @public
+ */
 export interface HttpServerSetup {
   server: Server;
+  /**
+   * Add all the routes registered with `router` to HTTP server request listeners.
+   * @param router {@link Router} - a router with registered route handlers.
+   */
   registerRouter: (router: Router) => void;
   /**
    * Creates cookie based session storage factory {@link SessionStorageFactory}
+   * @param cookieOptions {@link SessionStorageCookieOptions} - options to configure created cookie session storage.
    */
   createCookieSessionStorageFactory: <T>(
     cookieOptions: SessionStorageCookieOptions<T>
@@ -49,35 +126,53 @@ export interface HttpServerSetup {
    * A handler should return a state to associate with the incoming request.
    * The state can be retrieved later via http.auth.get(..)
    * Only one AuthenticationHandler can be registered.
+   * @param handler {@link AuthenticationHandler} - function to perform authentication.
    */
   registerAuth: (handler: AuthenticationHandler) => void;
   /**
    * To define custom logic to perform for incoming requests. Runs the handler before Auth
-   * hook performs a check that user has access to requested resources, so it's the only
+   * interceptor performs a check that user has access to requested resources, so it's the only
    * place when you can forward a request to another URL right on the server.
    * Can register any number of registerOnPostAuth, which are called in sequence
    * (from the first registered to the last).
+   * @param handler {@link OnPreAuthHandler} - function to call.
    */
   registerOnPreAuth: (handler: OnPreAuthHandler) => void;
   /**
-   * To define custom logic to perform for incoming requests. Runs the handler after Auth hook
+   * To define custom logic to perform for incoming requests. Runs the handler after Auth interceptor
    * did make sure a user has access to the requested resource.
    * The auth state is available at stage via http.auth.get(..)
    * Can register any number of registerOnPreAuth, which are called in sequence
    * (from the first registered to the last).
+   * @param handler {@link OnPostAuthHandler} - function to call.
    */
   registerOnPostAuth: (handler: OnPostAuthHandler) => void;
   basePath: {
-    get: (request: KibanaRequest | Request) => string;
-    set: (request: KibanaRequest | Request, basePath: string) => void;
+    /**
+     * returns `basePath` value, specific for an incoming request.
+     */
+    get: (request: KibanaRequest | LegacyRequest) => string;
+    /**
+     * sets `basePath` value, specific for an incoming request.
+     */
+    set: (request: KibanaRequest | LegacyRequest, basePath: string) => void;
+    /**
+     * returns a new `basePath` value, prefixed with passed `url`.
+     */
     prepend: (url: string) => string;
+    /**
+     * returns a new `basePath` value, cleaned up from passed `url`.
+     */
     remove: (url: string) => string;
   };
   auth: {
-    get: AuthStateStorage['get'];
-    isAuthenticated: AuthStateStorage['isAuthenticated'];
-    getAuthHeaders: AuthHeadersStorage['get'];
+    get: GetAuthState;
+    isAuthenticated: IsAuthenticated;
+    getAuthHeaders: GetAuthHeaders;
   };
+  /**
+   * Flag showing whether a server was configured to use TLS connection.
+   */
   isTlsEnabled: boolean;
 }
 
diff --git a/src/core/server/http/http_service.mock.ts b/src/core/server/http/http_service.mock.ts
index 02103fc4acc84..b4e509c8a05a5 100644
--- a/src/core/server/http/http_service.mock.ts
+++ b/src/core/server/http/http_service.mock.ts
@@ -19,7 +19,6 @@
 
 import { Server } from 'hapi';
 import { HttpService } from './http_service';
-import { HttpServerSetup } from './http_server';
 import { HttpServiceSetup } from './http_service';
 import { OnPreAuthToolkit } from './lifecycle/on_pre_auth';
 import { AuthToolkit } from './lifecycle/auth';
@@ -52,10 +51,8 @@ const createSetupContractMock = () => {
       isAuthenticated: jest.fn(),
       getAuthHeaders: jest.fn(),
     },
-    createNewServer: jest.fn(),
     isTlsEnabled: false,
   };
-  setupContract.createNewServer.mockResolvedValue({} as HttpServerSetup);
   setupContract.createCookieSessionStorageFactory.mockResolvedValue(
     sessionStorageMock.createFactory()
   );
diff --git a/src/core/server/http/http_service.test.ts b/src/core/server/http/http_service.test.ts
index f003ba1314434..cde06dc31802f 100644
--- a/src/core/server/http/http_service.test.ts
+++ b/src/core/server/http/http_service.test.ts
@@ -133,46 +133,6 @@ test('spins up notReady server until started if configured with `autoListen:true
   expect(notReadyHapiServer.stop).toBeCalledTimes(1);
 });
 
-// this is an integration test!
-test('creates and sets up second http server', async () => {
-  const configService = createConfigService({
-    host: 'localhost',
-    port: 1234,
-  });
-  const { HttpServer } = jest.requireActual('./http_server');
-
-  mockHttpServer.mockImplementation((...args) => new HttpServer(...args));
-
-  const service = new HttpService({ configService, env, logger });
-  const serverSetup = await service.setup();
-  const cfg = { port: 2345 };
-  await serverSetup.createNewServer(cfg);
-  const server = await service.start();
-  expect(server.isListening()).toBeTruthy();
-  expect(server.isListening(cfg.port)).toBeTruthy();
-
-  try {
-    await serverSetup.createNewServer(cfg);
-  } catch (err) {
-    expect(err.message).toBe('port 2345 is already in use');
-  }
-
-  try {
-    await serverSetup.createNewServer({ port: 1234 });
-  } catch (err) {
-    expect(err.message).toBe('port 1234 is already in use');
-  }
-
-  try {
-    await serverSetup.createNewServer({ host: 'example.org' });
-  } catch (err) {
-    expect(err.message).toBe('port must be defined');
-  }
-  await service.stop();
-  expect(server.isListening()).toBeFalsy();
-  expect(server.isListening(cfg.port)).toBeFalsy();
-});
-
 test('logs error if already set up', async () => {
   const configService = createConfigService();
 
@@ -273,8 +233,7 @@ test('returns http server contract on setup', async () => {
   }));
 
   const service = new HttpService({ configService, env, logger });
-  const { createNewServer, ...setupHttpServer } = await service.setup();
-  expect(createNewServer).toBeDefined();
+  const setupHttpServer = await service.setup();
   expect(setupHttpServer).toEqual(httpServer);
 });
 
diff --git a/src/core/server/http/http_service.ts b/src/core/server/http/http_service.ts
index b06c690cf2621..e69906d512bac 100644
--- a/src/core/server/http/http_service.ts
+++ b/src/core/server/http/http_service.ts
@@ -25,14 +25,12 @@ import { LoggerFactory } from '../logging';
 import { CoreService } from '../../types';
 import { Logger } from '../logging';
 import { CoreContext } from '../core_context';
-import { HttpConfig, HttpConfigType, config as httpConfig } from './http_config';
+import { HttpConfig, HttpConfigType } from './http_config';
 import { HttpServer, HttpServerSetup } from './http_server';
 import { HttpsRedirectServer } from './https_redirect_server';
 
 /** @public */
-export interface HttpServiceSetup extends HttpServerSetup {
-  createNewServer: (cfg: Partial<HttpConfig>) => Promise<HttpServerSetup>;
-}
+export type HttpServiceSetup = HttpServerSetup;
 /** @public */
 export interface HttpServiceStart {
   /** Indicates if http server is listening on a given port */
@@ -42,7 +40,6 @@ export interface HttpServiceStart {
 /** @internal */
 export class HttpService implements CoreService<HttpServiceSetup, HttpServiceStart> {
   private readonly httpServer: HttpServer;
-  private readonly secondaryServers: Map<number, HttpServer> = new Map();
   private readonly httpsRedirectServer: HttpsRedirectServer;
   private readonly config$: Observable<HttpConfig>;
   private configSubscription?: Subscription;
@@ -77,17 +74,11 @@ export class HttpService implements CoreService<HttpServiceSetup, HttpServiceSta
 
     const config = await this.config$.pipe(first()).toPromise();
 
-    const httpSetup = (this.httpServer.setup(config) || {}) as HttpServiceSetup;
-    const setup = {
-      ...httpSetup,
-      createNewServer: this.createServer.bind(this),
-    };
-
     if (this.shouldListen(config)) {
       await this.runNotReadyServer(config);
     }
 
-    return setup;
+    return this.httpServer.setup(config);
   }
 
   public async start() {
@@ -105,15 +96,10 @@ export class HttpService implements CoreService<HttpServiceSetup, HttpServiceSta
       }
 
       await this.httpServer.start();
-      await Promise.all([...this.secondaryServers.values()].map(server => server.start()));
     }
 
     return {
-      isListening: (port: number = 0) => {
-        const server = this.secondaryServers.get(port);
-        if (server) return server.isListening();
-        return this.httpServer.isListening();
-      },
+      isListening: () => this.httpServer.isListening(),
     };
   }
 
@@ -129,32 +115,6 @@ export class HttpService implements CoreService<HttpServiceSetup, HttpServiceSta
     return !this.coreContext.env.isDevClusterMaster && config.autoListen;
   }
 
-  private async createServer(cfg: Partial<HttpConfig>) {
-    const { port } = cfg;
-    const config = await this.config$.pipe(first()).toPromise();
-
-    if (!port) {
-      throw new Error('port must be defined');
-    }
-
-    // verify that main server and none of the secondary servers are already using this port
-    if (this.secondaryServers.has(port) || config.port === port) {
-      throw new Error(`port ${port} is already in use`);
-    }
-
-    for (const [key, val] of Object.entries(cfg)) {
-      httpConfig.schema.validateKey(key, val);
-    }
-
-    const baseConfig = await this.config$.pipe(first()).toPromise();
-    const finalConfig = { ...baseConfig, ...cfg };
-
-    const httpServer = new HttpServer(this.logger, `secondary server:${port}`);
-    const httpSetup = await httpServer.setup(finalConfig);
-    this.secondaryServers.set(port, httpServer);
-    return httpSetup;
-  }
-
   public async stop() {
     if (this.configSubscription === undefined) {
       return;
@@ -168,8 +128,6 @@ export class HttpService implements CoreService<HttpServiceSetup, HttpServiceSta
     }
     await this.httpServer.stop();
     await this.httpsRedirectServer.stop();
-    await Promise.all([...this.secondaryServers.values()].map(s => s.stop()));
-    this.secondaryServers.clear();
   }
 
   private async runNotReadyServer(config: HttpConfig) {
@@ -177,7 +135,7 @@ export class HttpService implements CoreService<HttpServiceSetup, HttpServiceSta
     const httpServer = new HttpServer(this.logger, 'NotReady');
     const { server } = await httpServer.setup(config);
     this.notReadyServer = server;
-    // use hapi server while Kibana ResponseFactory doesn't allow specifying custom headers
+    // use hapi server while KibanaResponseFactory doesn't allow specifying custom headers
     // https://github.com/elastic/kibana/issues/33779
     this.notReadyServer.route({
       path: '/{p*}',
diff --git a/src/core/server/http/index.ts b/src/core/server/http/index.ts
index eff7de0979c11..4b2bb2b6b86bf 100644
--- a/src/core/server/http/index.ts
+++ b/src/core/server/http/index.ts
@@ -19,13 +19,25 @@
 
 export { config, HttpConfig, HttpConfigType } from './http_config';
 export { HttpService, HttpServiceSetup, HttpServiceStart } from './http_service';
+export { HttpServerSetup } from './http_server';
 export { GetAuthHeaders } from './auth_headers_storage';
+export { AuthStatus, GetAuthState, IsAuthenticated } from './auth_state_storage';
 export {
+  CustomHttpResponseOptions,
   isRealRequest,
+  HttpResponseOptions,
+  HttpResponsePayload,
   KibanaRequest,
   KibanaRequestRoute,
+  KnownHeaders,
+  LegacyRequest,
+  RedirectResponseOptions,
+  RequestHandler,
   ResponseError,
   ResponseErrorMeta,
+  kibanaResponseFactory,
+  KibanaResponseFactory,
+  RouteConfig,
   Router,
   RouteMethod,
   RouteConfigOptions,
@@ -40,3 +52,4 @@ export {
 } from './lifecycle/auth';
 export { OnPostAuthHandler, OnPostAuthToolkit } from './lifecycle/on_post_auth';
 export { SessionStorageFactory, SessionStorage } from './session_storage';
+export { SessionStorageCookieOptions } from './cookie_session_storage';
diff --git a/src/core/server/http/router/headers.ts b/src/core/server/http/router/headers.ts
index 3d5fe213f92af..19eaee5081996 100644
--- a/src/core/server/http/router/headers.ts
+++ b/src/core/server/http/router/headers.ts
@@ -16,12 +16,49 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { IncomingHttpHeaders } from 'http';
 
 import { pick } from '../../../utils';
 
-/** @public */
-export type Headers = Record<string, string | string[] | undefined>;
-export type ResponseHeaders = Record<string, string | string[]>;
+/**
+ * Creates a Union type of all known keys of a given interface.
+ * @example
+ * ```ts
+ * interface Person {
+ *   name: string;
+ *   age: number;
+ *   [attributes: string]: string | number;
+ * }
+ * type PersonKnownKeys = KnownKeys<Person>; // "age" | "name"
+ * ```
+ */
+type KnownKeys<T> = {
+  [K in keyof T]: string extends K ? never : number extends K ? never : K;
+} extends { [_ in keyof T]: infer U }
+  ? U
+  : never;
+
+/**
+ * Set of well-known HTTP headers.
+ * @public
+ */
+export type KnownHeaders = KnownKeys<IncomingHttpHeaders>;
+
+/**
+ * Http request headers to read.
+ * @public
+ */
+export type Headers = { [header in KnownHeaders]?: string | string[] | undefined } & {
+  [header: string]: string | string[] | undefined;
+};
+
+/**
+ * Http response headers to set.
+ * @public
+ */
+export type ResponseHeaders = { [header in KnownHeaders]?: string | string[] } & {
+  [header: string]: string | string[];
+};
 
 const normalizeHeaderField = (field: string) => field.trim().toLowerCase();
 
diff --git a/src/core/server/http/router/index.ts b/src/core/server/http/router/index.ts
index eefa74cee0802..f9009949825ba 100644
--- a/src/core/server/http/router/index.ts
+++ b/src/core/server/http/router/index.ts
@@ -17,8 +17,23 @@
  * under the License.
  */
 
-export { Headers, filterHeaders, ResponseHeaders } from './headers';
-export { Router } from './router';
-export { KibanaRequest, KibanaRequestRoute, ensureRawRequest, isRealRequest } from './request';
-export { RouteMethod, RouteConfigOptions } from './route';
-export { ResponseError, ResponseErrorMeta } from './response';
+export { Headers, filterHeaders, ResponseHeaders, KnownHeaders } from './headers';
+export { Router, RequestHandler } from './router';
+export {
+  KibanaRequest,
+  KibanaRequestRoute,
+  isRealRequest,
+  LegacyRequest,
+  ensureRawRequest,
+} from './request';
+export { RouteMethod, RouteConfig, RouteConfigOptions } from './route';
+export {
+  CustomHttpResponseOptions,
+  HttpResponseOptions,
+  HttpResponsePayload,
+  RedirectResponseOptions,
+  ResponseError,
+  ResponseErrorMeta,
+  kibanaResponseFactory,
+  KibanaResponseFactory,
+} from './response';
diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts
index da10a6500ccc8..4eac2e98317fc 100644
--- a/src/core/server/http/router/request.ts
+++ b/src/core/server/http/router/request.ts
@@ -38,16 +38,22 @@ export interface KibanaRequestRoute {
   options: Required<RouteConfigOptions>;
 }
 
+/**
+ * @deprecated
+ * `hapi` request object, supported during migration process only for backward compatibility.
+ * @public
+ */
+export interface LegacyRequest extends Request {} // eslint-disable-line @typescript-eslint/no-empty-interface
+
 /**
  * Kibana specific abstraction for an incoming request.
  * @public
- * */
+ */
 export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown> {
   /**
    * Factory for creating requests. Validates the request before creating an
    * instance of a KibanaRequest.
    * @internal
-   *
    */
   public static from<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
     req: Request,
@@ -68,6 +74,7 @@ export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown> {
    * Validates the different parts of a request based on the schemas defined for
    * the route. Builds up the actual params, query and body object that will be
    * received in the route handler.
+   * @internal
    */
   private static validate<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
     req: Request,
@@ -102,8 +109,9 @@ export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown> {
 
     return { query, params, body };
   }
-
+  /** a WHATWG URL standard object. */
   public readonly url: Url;
+  /** matched route details */
   public readonly route: RecursiveReadonly<KibanaRequestRoute>;
   /**
    * Readonly copy of incoming request headers.
@@ -153,14 +161,14 @@ export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown> {
  * Returns underlying Hapi Request
  * @internal
  */
-export const ensureRawRequest = (request: KibanaRequest | Request) =>
+export const ensureRawRequest = (request: KibanaRequest | LegacyRequest) =>
   isKibanaRequest(request) ? request[requestSymbol] : request;
 
 function isKibanaRequest(request: unknown): request is KibanaRequest {
   return request instanceof KibanaRequest;
 }
 
-function isRequest(request: any): request is Request {
+function isRequest(request: any): request is LegacyRequest {
   try {
     return request.raw.req && typeof request.raw.req === 'object';
   } catch {
@@ -172,6 +180,6 @@ function isRequest(request: any): request is Request {
  * Checks if an incoming request either KibanaRequest or Legacy.Request
  * @internal
  */
-export function isRealRequest(request: unknown): request is KibanaRequest | Request {
+export function isRealRequest(request: unknown): request is KibanaRequest | LegacyRequest {
   return isKibanaRequest(request) || isRequest(request);
 }
diff --git a/src/core/server/http/router/response.ts b/src/core/server/http/router/response.ts
index 65db87f8ae8f8..100c4b0d660cd 100644
--- a/src/core/server/http/router/response.ts
+++ b/src/core/server/http/router/response.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IncomingHttpHeaders } from 'http';
 import { Stream } from 'stream';
+import { ResponseHeaders } from './headers';
 
 /**
  * Additional metadata to enhance error output or provide error details.
@@ -40,6 +40,10 @@ export type ResponseError =
       meta?: ResponseErrorMeta;
     };
 
+/**
+ * A response data object, expected to returned as a result of {@link RequestHandler} execution
+ * @internal
+ */
 export class KibanaResponse<T extends HttpResponsePayload | ResponseError> {
   constructor(
     readonly status: number,
@@ -48,51 +52,31 @@ export class KibanaResponse<T extends HttpResponsePayload | ResponseError> {
   ) {}
 }
 
-/**
- * Creates a Union type of all known keys of a given interface.
- * @example
- * ```ts
- * interface Person {
- *   name: string;
- *   age: number;
- *   [attributes: string]: string | number;
- * }
- * type PersonKnownKeys = KnownKeys<Person>; // "age" | "name"
- * ```
- */
-type KnownKeys<T> = {
-  [K in keyof T]: string extends K ? never : number extends K ? never : K;
-} extends { [_ in keyof T]: infer U }
-  ? U
-  : never;
-
-type KnownHeaders = KnownKeys<IncomingHttpHeaders>;
 /**
  * HTTP response parameters
  * @public
  */
 export interface HttpResponseOptions {
   /** HTTP Headers with additional information about response */
-  headers?: { [header in KnownHeaders]?: string | string[] } & {
-    [header: string]: string | string[];
-  };
+  headers?: ResponseHeaders;
 }
 
 /**
+ * Data send to the client as a response payload.
  * @public
  */
 export type HttpResponsePayload = undefined | string | Record<string, any> | Buffer | Stream;
 
 /**
- * HTTP response parameters
+ * HTTP response parameters for a response with adjustable status code.
  * @public
  */
-export interface CustomResponseOptions extends HttpResponseOptions {
+export interface CustomHttpResponseOptions extends HttpResponseOptions {
   statusCode: number;
 }
 
 /**
- * HTTP response parameters
+ * HTTP response parameters for redirection response
  * @public
  */
 export type RedirectResponseOptions = HttpResponseOptions & {
@@ -101,7 +85,99 @@ export type RedirectResponseOptions = HttpResponseOptions & {
   };
 };
 
-export const responseFactory = {
+/**
+ * Set of helpers used to create `KibanaResponse` to form HTTP response on an incoming request.
+ * Should be returned as a result of {@link RequestHandler} execution.
+ *
+ * @example
+ * 1. Successful response. Supported types of response body are:
+ * - `undefined`, no content to send.
+ * - `string`, send text
+ * - `JSON`, send JSON object, HTTP server will throw if given object is not valid (has circular references, for example)
+ * - `Stream` send data stream
+ * - `Buffer` send binary stream
+ * ```js
+ * return response.ok(undefined);
+ * return response.ok('ack');
+ * return response.ok({ id: '1' });
+ * return response.ok(Buffer.from(...););
+ *
+ * const stream = new Stream.PassThrough();
+ * fs.createReadStream('./file').pipe(stream);
+ * return res.ok(stream);
+ * ```
+ * HTTP headers are configurable via response factory parameter `options` {@link HttpResponseOptions}.
+ *
+ * ```js
+ * return response.ok({ id: '1' }, {
+ *   headers: {
+ *     'content-type': 'application/json'
+ *   }
+ * });
+ * ```
+ * 2. Redirection response. Redirection URL is configures via 'Location' header.
+ * ```js
+ * return response.redirected('The document has moved', {
+ *   headers: {
+ *    location: '/new-url',
+ *   },
+ * });
+ * ```
+ * 3. Error response. You may pass an error message to the client, where error message can be:
+ * - `string` send message text
+ * - `Error` send the message text of given Error object.
+ * - `{ message: string | Error, meta: {data: Record<string, any>, ...} }` - send message text and attach additional error metadata.
+ * ```js
+ * return response.unauthorized('User has no access to the requested resource.', {
+ *   headers: {
+ *     'WWW-Authenticate': 'challenge',
+ *   }
+ * })
+ * return response.badRequest();
+ * return response.badRequest('validation error');
+ *
+ * try {
+ *   // ...
+ * } catch(error){
+ *   return response.badRequest(error);
+ * }
+ *
+ * return response.badRequest({
+ *   message: 'validation error',
+ *   meta: {
+ *     data: {
+ *       requestBody: request.body,
+ *       failedFields: validationResult
+ *     },
+ *   }
+ * });
+ *
+ * try {
+ *   // ...
+ * } catch(error) {
+ *   return response.badRequest({
+ *     message: error,
+ *     meta: {
+ *       data: {
+ *         requestBody: request.body,
+ *       },
+ *     }
+ *   });
+ * }
+ *
+ * ```
+ * 4. Custom response. `ResponseFactory` may not cover your use case, so you can use the `custom` function to customize the response.
+ * ```js
+ * return response.custom('ok', {
+ *   statusCode: 201,
+ *   headers: {
+ *     location: '/created-url'
+ *   }
+ * })
+ * ```
+ * @public
+ */
+export const kibanaResponseFactory = {
   // Success
   /**
    * The request has succeeded.
@@ -131,9 +207,9 @@ export const responseFactory = {
   /**
    * Creates a response with defined status code and payload.
    * @param payload - {@link HttpResponsePayload} payload to send to the client
-   * @param options - {@link CustomResponseOptions} configures HTTP response parameters.
+   * @param options - {@link CustomHttpResponseOptions} configures HTTP response parameters.
    */
-  custom: (payload: HttpResponsePayload | ResponseError, options: CustomResponseOptions) => {
+  custom: (payload: HttpResponsePayload | ResponseError, options: CustomHttpResponseOptions) => {
     if (!options || !options.statusCode) {
       throw new Error(`options.statusCode is expected to be set. given options: ${options}`);
     }
@@ -213,4 +289,4 @@ export const responseFactory = {
  * Creates an object containing request response payload, HTTP headers, error details, and other data transmitted to the client.
  * @public
  */
-export type ResponseFactory = typeof responseFactory;
+export type KibanaResponseFactory = typeof kibanaResponseFactory;
diff --git a/src/core/server/http/router/route.ts b/src/core/server/http/router/route.ts
index caf13343ec96c..e805356014829 100644
--- a/src/core/server/http/router/route.ts
+++ b/src/core/server/http/router/route.ts
@@ -21,18 +21,18 @@ import { ObjectType } from '@kbn/config-schema';
 /**
  * The set of common HTTP methods supported by Kibana routing.
  * @public
- * */
+ */
 export type RouteMethod = 'get' | 'post' | 'put' | 'delete';
 
 /**
- * Route specific configuration.
+ * Additional route options.
  * @public
- * */
+ */
 export interface RouteConfigOptions {
   /**
    * A flag shows that authentication for a route:
-   * enabled  when true
-   * disabled when false
+   * `enabled`  when true
+   * `disabled` when false
    *
    * Enabled by default.
    */
@@ -44,27 +44,58 @@ export interface RouteConfigOptions {
   tags?: readonly string[];
 }
 
+/**
+ * Route specific configuration.
+ * @public
+ */
 export interface RouteConfig<P extends ObjectType, Q extends ObjectType, B extends ObjectType> {
   /**
    * The endpoint _within_ the router path to register the route. E.g. if the
    * router is registered at `/elasticsearch` and the route path is `/search`,
    * the full path for the route is `/elasticsearch/search`.
+   * Supports:
+   *   - named path segments `path/{name}`.
+   *   - optional path segments `path/{position?}`.
+   *   - multi-segments `path/{coordinates*2}`.
+   * Segments are accessible within a handler function as `params` property of {@link KibanaRequest} object.
+   * To have read access to `params` you *must* specify validation schema with {@link RouteConfig.validate}.
    */
   path: string;
 
   /**
    * A schema created with `@kbn/config-schema` that every request will be validated against.
-   *
+   * You *must* specify a validation schema to be able to read:
+   *   - url path segments
+   *   - request query
+   *   - request body
    * To opt out of validating the request, specify `false`.
+   * @example
+   * ```ts
+   *  import { schema } from '@kbn/config-schema';
+   *  router.get({
+   *   path: 'path/{id}'
+   *   validate: {
+   *     params: schema.object({
+   *       id: schema.string(),
+   *     }),
+   *     query: schema.object({...}),
+   *     body: schema.object({...}),
+   *   },
+   *  })
+   * ```
    */
   validate: RouteSchemas<P, Q, B> | false;
 
+  /**
+   * Additional route options {@link RouteConfigOptions}.
+   */
   options?: RouteConfigOptions;
 }
 
 /**
  * RouteSchemas contains the schemas for validating the different parts of a
  * request.
+ * @public
  */
 export interface RouteSchemas<P extends ObjectType, Q extends ObjectType, B extends ObjectType> {
   params?: P;
diff --git a/src/core/server/http/router/router.ts b/src/core/server/http/router/router.ts
index b801aa41754fa..a4d4b62e40203 100644
--- a/src/core/server/http/router/router.ts
+++ b/src/core/server/http/router/router.ts
@@ -22,25 +22,41 @@ import { Request, ResponseObject, ResponseToolkit } from 'hapi';
 
 import { Logger } from '../../logging';
 import { KibanaRequest } from './request';
-import { KibanaResponse, ResponseFactory, responseFactory } from './response';
+import { KibanaResponse, KibanaResponseFactory, kibanaResponseFactory } from './response';
 import { RouteConfig, RouteConfigOptions, RouteMethod, RouteSchemas } from './route';
 import { HapiResponseAdapter } from './response_adapter';
 
-export interface RouterRoute {
+interface RouterRoute {
   method: RouteMethod;
   path: string;
   options: RouteConfigOptions;
   handler: (req: Request, responseToolkit: ResponseToolkit, log: Logger) => Promise<ResponseObject>;
 }
 
-/** @public */
+/**
+ * Provides ability to declare a handler function for a particular path and HTTP request method.
+ * Each route can have only one handler functions, which is executed when the route is matched.
+ *
+ * @example
+ * ```ts
+ * const router = new Router('my-app');
+ * // handler is called when 'my-app/path' resource is requested with `GET` method
+ * router.get({ path: '/path', validate: false }, (req, res) => res.ok({ content: 'ok' }));
+ * ```
+ *
+ * @public
+ * */
 export class Router {
   public routes: Array<Readonly<RouterRoute>> = [];
-
+  /**
+   * @param path - a router path, set as the very first path segment for all registered routes.
+   */
   constructor(readonly path: string) {}
 
   /**
-   * Register a `GET` request with the router
+   * Register a route handler for `GET` request.
+   * @param route {@link RouteConfig} - a route configuration.
+   * @param handler {@link RequestHandler} - a function to call to respond to an incoming request
    */
   public get<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
     route: RouteConfig<P, Q, B>,
@@ -58,7 +74,9 @@ export class Router {
   }
 
   /**
-   * Register a `POST` request with the router
+   * Register a route handler for `POST` request.
+   * @param route {@link RouteConfig} - a route configuration.
+   * @param handler {@link RequestHandler} - a function to call to respond to an incoming request
    */
   public post<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
     route: RouteConfig<P, Q, B>,
@@ -76,7 +94,9 @@ export class Router {
   }
 
   /**
-   * Register a `PUT` request with the router
+   * Register a route handler for `PUT` request.
+   * @param route {@link RouteConfig} - a route configuration.
+   * @param handler {@link RequestHandler} - a function to call to respond to an incoming request
    */
   public put<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
     route: RouteConfig<P, Q, B>,
@@ -94,7 +114,9 @@ export class Router {
   }
 
   /**
-   * Register a `DELETE` request with the router
+   * Register a route handler for `DELETE` request.
+   * @param route {@link RouteConfig} - a route configuration.
+   * @param handler {@link RequestHandler} - a function to call to respond to an incoming request
    */
   public delete<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
     route: RouteConfig<P, Q, B>,
@@ -114,13 +136,14 @@ export class Router {
   /**
    * Returns all routes registered with the this router.
    * @returns List of registered routes.
+   * @internal
    */
   public getRoutes() {
     return [...this.routes];
   }
 
   /**
-   * Create the schemas for a route
+   * Create the validation schemas for a route
    *
    * @returns Route schemas if `validate` is specified on the route, otherwise
    * undefined.
@@ -167,7 +190,7 @@ export class Router {
     }
 
     try {
-      const kibanaResponse = await handler(kibanaRequest, responseFactory);
+      const kibanaResponse = await handler(kibanaRequest, kibanaResponseFactory);
       return hapiResponseAdapter.handle(kibanaResponse);
     } catch (e) {
       log.error(e);
@@ -176,7 +199,40 @@ export class Router {
   }
 }
 
+/**
+ * A function executed when route path matched requested resource path.
+ * Request handler is expected to return a result of one of {@link KibanaResponseFactory} functions.
+ * @param request {@link KibanaRequest} - object containing information about requested resource,
+ * such as path, method, headers, parameters, query, body, etc.
+ * @param response {@link KibanaResponseFactory} - a set of helper functions used to respond to a request.
+ *
+ * @example
+ * ```ts
+ * const router = new Router('my-app');
+ * // creates a route handler for GET request on 'my-app/path/{id}' path
+ * router.get(
+ *   {
+ *     path: 'path/{id}',
+ *     // defines a validation schema for a named segment of the route path
+ *     validate: {
+ *       params: schema.object({
+ *         id: schema.string(),
+ *       }),
+ *     },
+ *   },
+ *   // function to execute to create a responses
+ *   async (request, response) => {
+ *     const data = await findObject(request.params.id);
+ *     // creates a command to respond with 'not found' error
+ *     if (!data) return response.notFound();
+ *     // creates a command to send found data to the client
+ *     return response.ok(data);
+ *   }
+ * );
+ * ```
+ * @public
+ */
 export type RequestHandler<P extends ObjectType, Q extends ObjectType, B extends ObjectType> = (
   request: KibanaRequest<TypeOf<P>, TypeOf<Q>, TypeOf<B>>,
-  createResponse: ResponseFactory
+  response: KibanaResponseFactory
 ) => KibanaResponse<any> | Promise<KibanaResponse<any>>;
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 2bbcaa58f6af5..72a183f2dd1db 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -56,27 +56,41 @@ export {
   ElasticsearchErrorHelpers,
   APICaller,
   FakeRequest,
-  LegacyRequest,
 } from './elasticsearch';
 export {
   AuthenticationHandler,
   AuthHeaders,
   AuthResultParams,
+  AuthStatus,
   AuthToolkit,
+  CustomHttpResponseOptions,
   GetAuthHeaders,
+  GetAuthState,
+  HttpResponseOptions,
+  HttpResponsePayload,
+  HttpServerSetup,
+  IsAuthenticated,
   KibanaRequest,
   KibanaRequestRoute,
+  KnownHeaders,
+  LegacyRequest,
   OnPreAuthHandler,
   OnPreAuthToolkit,
   OnPostAuthHandler,
   OnPostAuthToolkit,
+  RedirectResponseOptions,
+  RequestHandler,
   ResponseError,
   ResponseErrorMeta,
+  kibanaResponseFactory,
+  KibanaResponseFactory,
+  RouteConfig,
   Router,
   RouteMethod,
   RouteConfigOptions,
-  SessionStorageFactory,
   SessionStorage,
+  SessionStorageCookieOptions,
+  SessionStorageFactory,
 } from './http';
 export { Logger, LoggerFactory, LogMeta, LogRecord, LogLevel } from './logging';
 
@@ -99,6 +113,7 @@ export {
   SavedObjectsClient,
   SavedObjectsClientContract,
   SavedObjectsCreateOptions,
+  SavedObjectsClientProviderOptions,
   SavedObjectsClientWrapperFactory,
   SavedObjectsClientWrapperOptions,
   SavedObjectsErrorHelpers,
@@ -111,6 +126,16 @@ export {
   SavedObjectsService,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
+  SavedObjectsExportOptions,
+  SavedObjectsImportError,
+  SavedObjectsImportConflictError,
+  SavedObjectsImportMissingReferencesError,
+  SavedObjectsImportUnknownError,
+  SavedObjectsImportUnsupportedTypeError,
+  SavedObjectsImportOptions,
+  SavedObjectsImportResponse,
+  SavedObjectsImportRetry,
+  SavedObjectsResolveImportErrorsOptions,
 } from './saved_objects';
 
 export { RecursiveReadonly } from '../utils';
@@ -135,7 +160,6 @@ export interface CoreSetup {
     registerAuth: HttpServiceSetup['registerAuth'];
     registerOnPostAuth: HttpServiceSetup['registerOnPostAuth'];
     basePath: HttpServiceSetup['basePath'];
-    createNewServer: HttpServiceSetup['createNewServer'];
     isTlsEnabled: HttpServiceSetup['isTlsEnabled'];
   };
 }
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index fcc8a26f51b4b..8ebd3e6b3c8b2 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -123,7 +123,6 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       registerAuth: deps.http.registerAuth,
       registerOnPostAuth: deps.http.registerOnPostAuth,
       basePath: deps.http.basePath,
-      createNewServer: deps.http.createNewServer,
       isTlsEnabled: deps.http.isTlsEnabled,
     },
   };
diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
index 385de5b14565d..618a83b0fb68b 100644
--- a/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
+++ b/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
@@ -74,50 +74,134 @@ describe('getSortedObjectsForExport()', () => {
     const response = await readStreamToCompletion(exportStream);
 
     expect(response).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {},
-    "id": "1",
-    "references": Array [],
-    "type": "index-pattern",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "2",
-    "references": Array [
-      Object {
-        "id": "1",
-        "name": "name",
-        "type": "index-pattern",
-      },
-    ],
-    "type": "search",
-  },
-]
-`);
+      Array [
+        Object {
+          "attributes": Object {},
+          "id": "1",
+          "references": Array [],
+          "type": "index-pattern",
+        },
+        Object {
+          "attributes": Object {},
+          "id": "2",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "name",
+              "type": "index-pattern",
+            },
+          ],
+          "type": "search",
+        },
+      ]
+    `);
     expect(savedObjectsClient.find).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Object {
-        "perPage": 500,
-        "sortField": "_id",
-        "sortOrder": "asc",
-        "type": Array [
-          "index-pattern",
-          "search",
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Object {
+              "namespace": undefined,
+              "perPage": 500,
+              "sortField": "_id",
+              "sortOrder": "asc",
+              "type": Array [
+                "index-pattern",
+                "search",
+              ],
+            },
+          ],
         ],
-      },
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
+  });
+
+  test('exports from the provided namespace when present', async () => {
+    savedObjectsClient.find.mockResolvedValueOnce({
+      total: 2,
+      saved_objects: [
+        {
+          id: '2',
+          type: 'search',
+          attributes: {},
+          references: [
+            {
+              name: 'name',
+              type: 'index-pattern',
+              id: '1',
+            },
+          ],
+        },
+        {
+          id: '1',
+          type: 'index-pattern',
+          attributes: {},
+          references: [],
+        },
+      ],
+      per_page: 1,
+      page: 0,
+    });
+    const exportStream = await getSortedObjectsForExport({
+      savedObjectsClient,
+      exportSizeLimit: 500,
+      types: ['index-pattern', 'search'],
+      namespace: 'foo',
+    });
+
+    const response = await readStreamToCompletion(exportStream);
+
+    expect(response).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "attributes": Object {},
+          "id": "1",
+          "references": Array [],
+          "type": "index-pattern",
+        },
+        Object {
+          "attributes": Object {},
+          "id": "2",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "name",
+              "type": "index-pattern",
+            },
+          ],
+          "type": "search",
+        },
+      ]
+    `);
+    expect(savedObjectsClient.find).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Object {
+              "namespace": "foo",
+              "perPage": 500,
+              "sortField": "_id",
+              "sortOrder": "asc",
+              "type": Array [
+                "index-pattern",
+                "search",
+              ],
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 
   test('export selected types throws error when exceeding exportSizeLimit', async () => {
@@ -195,51 +279,54 @@ Array [
     });
     const response = await readStreamToCompletion(exportStream);
     expect(response).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {},
-    "id": "1",
-    "references": Array [],
-    "type": "index-pattern",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "2",
-    "references": Array [
-      Object {
-        "id": "1",
-        "name": "name",
-        "type": "index-pattern",
-      },
-    ],
-    "type": "search",
-  },
-]
-`);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
       Array [
         Object {
+          "attributes": Object {},
           "id": "1",
+          "references": Array [],
           "type": "index-pattern",
         },
         Object {
+          "attributes": Object {},
           "id": "2",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "name",
+              "type": "index-pattern",
+            },
+          ],
           "type": "search",
         },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+      ]
+    `);
+    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "id": "1",
+                "type": "index-pattern",
+              },
+              Object {
+                "id": "2",
+                "type": "search",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 
   test('includes nested dependencies when passed in', async () => {
@@ -283,59 +370,65 @@ Array [
     });
     const response = await readStreamToCompletion(exportStream);
     expect(response).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {},
-    "id": "1",
-    "references": Array [],
-    "type": "index-pattern",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "2",
-    "references": Array [
-      Object {
-        "id": "1",
-        "name": "name",
-        "type": "index-pattern",
-      },
-    ],
-    "type": "search",
-  },
-]
-`);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "id": "2",
-          "type": "search",
-        },
-      ],
-    ],
-    Array [
       Array [
         Object {
+          "attributes": Object {},
           "id": "1",
+          "references": Array [],
           "type": "index-pattern",
         },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        Object {
+          "attributes": Object {},
+          "id": "2",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "name",
+              "type": "index-pattern",
+            },
+          ],
+          "type": "search",
+        },
+      ]
+    `);
+    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "id": "2",
+                "type": "search",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+          Array [
+            Array [
+              Object {
+                "id": "1",
+                "type": "index-pattern",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 
   test('export selected objects throws error when exceeding exportSizeLimit', async () => {
diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts
index e09780574a25c..d8513bcfe72d3 100644
--- a/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts
+++ b/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts
@@ -23,17 +23,20 @@ import { SavedObjectsClientContract } from '../';
 import { injectNestedDependencies } from './inject_nested_depdendencies';
 import { sortObjects } from './sort_objects';
 
-interface ObjectToExport {
-  id: string;
-  type: string;
-}
-
-interface ExportObjectsOptions {
+/**
+ * Options controlling the export operation.
+ * @public
+ */
+export interface SavedObjectsExportOptions {
   types?: string[];
-  objects?: ObjectToExport[];
+  objects?: Array<{
+    id: string;
+    type: string;
+  }>;
   savedObjectsClient: SavedObjectsClientContract;
   exportSizeLimit: number;
   includeReferencesDeep?: boolean;
+  namespace?: string;
 }
 
 async function fetchObjectsToExport({
@@ -41,17 +44,19 @@ async function fetchObjectsToExport({
   types,
   exportSizeLimit,
   savedObjectsClient,
+  namespace,
 }: {
-  objects?: ObjectToExport[];
+  objects?: SavedObjectsExportOptions['objects'];
   types?: string[];
   exportSizeLimit: number;
   savedObjectsClient: SavedObjectsClientContract;
+  namespace?: string;
 }) {
   if (objects) {
     if (objects.length > exportSizeLimit) {
       throw Boom.badRequest(`Can't export more than ${exportSizeLimit} objects`);
     }
-    const bulkGetResult = await savedObjectsClient.bulkGet(objects);
+    const bulkGetResult = await savedObjectsClient.bulkGet(objects, { namespace });
     const erroredObjects = bulkGetResult.saved_objects.filter(obj => !!obj.error);
     if (erroredObjects.length) {
       const err = Boom.badRequest();
@@ -67,6 +72,7 @@ async function fetchObjectsToExport({
     sortField: '_id',
     sortOrder: 'asc',
     perPage: exportSizeLimit,
+    namespace,
   });
   if (findResponse.total > exportSizeLimit) {
     throw Boom.badRequest(`Can't export more than ${exportSizeLimit} objects`);
@@ -80,17 +86,19 @@ export async function getSortedObjectsForExport({
   savedObjectsClient,
   exportSizeLimit,
   includeReferencesDeep = false,
-}: ExportObjectsOptions) {
+  namespace,
+}: SavedObjectsExportOptions) {
   const objectsToExport = await fetchObjectsToExport({
     types,
     objects,
     savedObjectsClient,
     exportSizeLimit,
+    namespace,
   });
 
   const exportedObjects = sortObjects(
     includeReferencesDeep
-      ? await injectNestedDependencies(objectsToExport, savedObjectsClient)
+      ? await injectNestedDependencies(objectsToExport, savedObjectsClient, namespace)
       : objectsToExport
   );
 
diff --git a/src/core/server/saved_objects/export/index.ts b/src/core/server/saved_objects/export/index.ts
index eb52fcbecfda8..d994df2af627c 100644
--- a/src/core/server/saved_objects/export/index.ts
+++ b/src/core/server/saved_objects/export/index.ts
@@ -17,4 +17,7 @@
  * under the License.
  */
 
-export { getSortedObjectsForExport } from './get_sorted_objects_for_export';
+export {
+  getSortedObjectsForExport,
+  SavedObjectsExportOptions,
+} from './get_sorted_objects_for_export';
diff --git a/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts b/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
index 9a2548952de3d..2fa06550727f0 100644
--- a/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
+++ b/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
@@ -70,13 +70,13 @@ describe('getObjectReferencesToFetch()', () => {
     });
     const result = getObjectReferencesToFetch(map);
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "id": "1",
-    "type": "index-pattern",
-  },
-]
-`);
+      Array [
+        Object {
+          "id": "1",
+          "type": "index-pattern",
+        },
+      ]
+    `);
   });
 
   test(`doesn't deal with circular dependencies`, () => {
@@ -137,15 +137,15 @@ describe('injectNestedDependencies', () => {
     ];
     const result = await injectNestedDependencies(savedObjects, savedObjectsClient);
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {},
-    "id": "1",
-    "references": Array [],
-    "type": "index-pattern",
-  },
-]
-`);
+      Array [
+        Object {
+          "attributes": Object {},
+          "id": "1",
+          "references": Array [],
+          "type": "index-pattern",
+        },
+      ]
+    `);
   });
 
   test(`doesn't fetch references that are already fetched`, async () => {
@@ -171,27 +171,27 @@ Array [
     ];
     const result = await injectNestedDependencies(savedObjects, savedObjectsClient);
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {},
-    "id": "1",
-    "references": Array [],
-    "type": "index-pattern",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "2",
-    "references": Array [
-      Object {
-        "id": "1",
-        "name": "ref_0",
-        "type": "index-pattern",
-      },
-    ],
-    "type": "search",
-  },
-]
-`);
+      Array [
+        Object {
+          "attributes": Object {},
+          "id": "1",
+          "references": Array [],
+          "type": "index-pattern",
+        },
+        Object {
+          "attributes": Object {},
+          "id": "2",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "ref_0",
+              "type": "index-pattern",
+            },
+          ],
+          "type": "search",
+        },
+      ]
+    `);
   });
 
   test('fetches dependencies at least one level deep', async () => {
@@ -221,47 +221,50 @@ Array [
     });
     const result = await injectNestedDependencies(savedObjects, savedObjectsClient);
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {},
-    "id": "2",
-    "references": Array [
-      Object {
-        "id": "1",
-        "name": "ref_0",
-        "type": "index-pattern",
-      },
-    ],
-    "type": "search",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "1",
-    "references": Array [],
-    "type": "index-pattern",
-  },
-]
-`);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
       Array [
         Object {
+          "attributes": Object {},
+          "id": "2",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "ref_0",
+              "type": "index-pattern",
+            },
+          ],
+          "type": "search",
+        },
+        Object {
+          "attributes": Object {},
           "id": "1",
+          "references": Array [],
           "type": "index-pattern",
         },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+      ]
+    `);
+    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "id": "1",
+                "type": "index-pattern",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 
   test('fetches dependencies multiple levels deep', async () => {
@@ -336,108 +339,114 @@ Array [
     });
     const result = await injectNestedDependencies(savedObjects, savedObjectsClient);
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {},
-    "id": "5",
-    "references": Array [
-      Object {
-        "id": "4",
-        "name": "panel_0",
-        "type": "visualization",
-      },
-      Object {
-        "id": "3",
-        "name": "panel_1",
-        "type": "visualization",
-      },
-    ],
-    "type": "dashboard",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "4",
-    "references": Array [
-      Object {
-        "id": "2",
-        "name": "ref_0",
-        "type": "search",
-      },
-    ],
-    "type": "visualization",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "3",
-    "references": Array [
-      Object {
-        "id": "1",
-        "name": "ref_0",
-        "type": "index-pattern",
-      },
-    ],
-    "type": "visualization",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "2",
-    "references": Array [
-      Object {
-        "id": "1",
-        "name": "ref_0",
-        "type": "index-pattern",
-      },
-    ],
-    "type": "search",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "1",
-    "references": Array [],
-    "type": "index-pattern",
-  },
-]
-`);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
       Array [
         Object {
+          "attributes": Object {},
+          "id": "5",
+          "references": Array [
+            Object {
+              "id": "4",
+              "name": "panel_0",
+              "type": "visualization",
+            },
+            Object {
+              "id": "3",
+              "name": "panel_1",
+              "type": "visualization",
+            },
+          ],
+          "type": "dashboard",
+        },
+        Object {
+          "attributes": Object {},
           "id": "4",
+          "references": Array [
+            Object {
+              "id": "2",
+              "name": "ref_0",
+              "type": "search",
+            },
+          ],
           "type": "visualization",
         },
         Object {
+          "attributes": Object {},
           "id": "3",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "ref_0",
+              "type": "index-pattern",
+            },
+          ],
           "type": "visualization",
         },
-      ],
-    ],
-    Array [
-      Array [
         Object {
+          "attributes": Object {},
           "id": "2",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "ref_0",
+              "type": "index-pattern",
+            },
+          ],
           "type": "search",
         },
         Object {
+          "attributes": Object {},
           "id": "1",
+          "references": Array [],
           "type": "index-pattern",
         },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+      ]
+    `);
+    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "id": "4",
+                "type": "visualization",
+              },
+              Object {
+                "id": "3",
+                "type": "visualization",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+          Array [
+            Array [
+              Object {
+                "id": "2",
+                "type": "search",
+              },
+              Object {
+                "id": "1",
+                "type": "index-pattern",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 
   test('throws error when bulkGet returns an error', async () => {
@@ -505,52 +514,55 @@ Array [
     });
     const result = await injectNestedDependencies(savedObjects, savedObjectsClient);
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {},
-    "id": "2",
-    "references": Array [
-      Object {
-        "id": "1",
-        "name": "ref_0",
-        "type": "index-pattern",
-      },
-    ],
-    "type": "search",
-  },
-  Object {
-    "attributes": Object {},
-    "id": "1",
-    "references": Array [
-      Object {
-        "id": "2",
-        "name": "ref_0",
-        "type": "search",
-      },
-    ],
-    "type": "index-pattern",
-  },
-]
-`);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
       Array [
         Object {
+          "attributes": Object {},
+          "id": "2",
+          "references": Array [
+            Object {
+              "id": "1",
+              "name": "ref_0",
+              "type": "index-pattern",
+            },
+          ],
+          "type": "search",
+        },
+        Object {
+          "attributes": Object {},
           "id": "1",
+          "references": Array [
+            Object {
+              "id": "2",
+              "name": "ref_0",
+              "type": "search",
+            },
+          ],
           "type": "index-pattern",
         },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+      ]
+    `);
+    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "id": "1",
+                "type": "index-pattern",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 });
diff --git a/src/core/server/saved_objects/export/inject_nested_depdendencies.ts b/src/core/server/saved_objects/export/inject_nested_depdendencies.ts
index ee9ce781ef9a5..82cb3e3cfe115 100644
--- a/src/core/server/saved_objects/export/inject_nested_depdendencies.ts
+++ b/src/core/server/saved_objects/export/inject_nested_depdendencies.ts
@@ -34,7 +34,8 @@ export function getObjectReferencesToFetch(savedObjectsMap: Map<string, SavedObj
 
 export async function injectNestedDependencies(
   savedObjects: SavedObject[],
-  savedObjectsClient: SavedObjectsClientContract
+  savedObjectsClient: SavedObjectsClientContract,
+  namespace?: string
 ) {
   const savedObjectsMap = new Map<string, SavedObject>();
   for (const savedObject of savedObjects) {
@@ -42,7 +43,7 @@ export async function injectNestedDependencies(
   }
   let objectsToFetch = getObjectReferencesToFetch(savedObjectsMap);
   while (objectsToFetch.length > 0) {
-    const bulkGetResponse = await savedObjectsClient.bulkGet(objectsToFetch);
+    const bulkGetResponse = await savedObjectsClient.bulkGet(objectsToFetch, { namespace });
     // Check for errors
     const erroredObjects = bulkGetResponse.saved_objects.filter(obj => !!obj.error);
     if (erroredObjects.length) {
diff --git a/src/core/server/saved_objects/import/collect_saved_objects.ts b/src/core/server/saved_objects/import/collect_saved_objects.ts
index 11add36e54fb6..fa2938109f6e7 100644
--- a/src/core/server/saved_objects/import/collect_saved_objects.ts
+++ b/src/core/server/saved_objects/import/collect_saved_objects.ts
@@ -26,7 +26,7 @@ import {
 } from '../../../../legacy/utils/streams';
 import { SavedObject } from '../service';
 import { createLimitStream } from './create_limit_stream';
-import { ImportError } from './types';
+import { SavedObjectsImportError } from './types';
 
 interface CollectSavedObjectsOptions {
   readStream: Readable;
@@ -41,7 +41,7 @@ export async function collectSavedObjects({
   filter,
   supportedTypes,
 }: CollectSavedObjectsOptions) {
-  const errors: ImportError[] = [];
+  const errors: SavedObjectsImportError[] = [];
   const collectedObjects: SavedObject[] = await createPromiseFromStreams([
     readStream,
     createLimitStream(objectLimit),
diff --git a/src/core/server/saved_objects/import/create_objects_filter.ts b/src/core/server/saved_objects/import/create_objects_filter.ts
index aacf8112f255a..684e44944002b 100644
--- a/src/core/server/saved_objects/import/create_objects_filter.ts
+++ b/src/core/server/saved_objects/import/create_objects_filter.ts
@@ -18,9 +18,9 @@
  */
 
 import { SavedObject } from '../service';
-import { Retry } from './types';
+import { SavedObjectsImportRetry } from './types';
 
-export function createObjectsFilter(retries: Retry[]) {
+export function createObjectsFilter(retries: SavedObjectsImportRetry[]) {
   const retryKeys = new Set<string>(retries.map(retry => `${retry.type}:${retry.id}`));
   return (obj: SavedObject) => {
     return retryKeys.has(`${obj.type}:${obj.id}`);
diff --git a/src/core/server/saved_objects/import/extract_errors.ts b/src/core/server/saved_objects/import/extract_errors.ts
index 6ae9562a1f3aa..4c001cf8acf64 100644
--- a/src/core/server/saved_objects/import/extract_errors.ts
+++ b/src/core/server/saved_objects/import/extract_errors.ts
@@ -18,13 +18,13 @@
  */
 
 import { SavedObject } from '../service';
-import { ImportError } from './types';
+import { SavedObjectsImportError } from './types';
 
 export function extractErrors(
   savedObjectResults: SavedObject[],
   savedObjectsToImport: SavedObject[]
 ) {
-  const errors: ImportError[] = [];
+  const errors: SavedObjectsImportError[] = [];
   const originalSavedObjectsMap = new Map<string, SavedObject>();
   for (const savedObject of savedObjectsToImport) {
     originalSavedObjectsMap.set(`${savedObject.type}:${savedObject.id}`, savedObject);
diff --git a/src/core/server/saved_objects/import/import_saved_objects.test.ts b/src/core/server/saved_objects/import/import_saved_objects.test.ts
index 80e5cc9a306f0..6ba4304574f49 100644
--- a/src/core/server/saved_objects/import/import_saved_objects.test.ts
+++ b/src/core/server/saved_objects/import/import_saved_objects.test.ts
@@ -86,11 +86,11 @@ describe('importSavedObjects()', () => {
       supportedTypes: [],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "success": true,
-  "successCount": 0,
-}
-`);
+      Object {
+        "success": true,
+        "successCount": 0,
+      }
+    `);
   });
 
   test('calls bulkCreate without overwrite', async () => {
@@ -113,66 +113,151 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "success": true,
-  "successCount": 4,
-}
-`);
+      Object {
+        "success": true,
+        "successCount": 4,
+      }
+    `);
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "My Index Pattern",
-          },
-          "id": "1",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "index-pattern",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Search",
-          },
-          "id": "2",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "search",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Visualization",
-          },
-          "id": "3",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "visualization",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Dashboard",
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "My Index Pattern",
+                },
+                "id": "1",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "index-pattern",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Search",
+                },
+                "id": "2",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "search",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Visualization",
+                },
+                "id": "3",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "visualization",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Dashboard",
+                },
+                "id": "4",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "dashboard",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+              "overwrite": false,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
           },
-          "id": "4",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "dashboard",
-        },
-      ],
-      Object {
-        "overwrite": false,
+        ],
+      }
+    `);
+  });
+
+  test('uses the provided namespace when present', async () => {
+    const readStream = new Readable({
+      objectMode: true,
+      read() {
+        savedObjects.forEach(obj => this.push(obj));
+        this.push(null);
       },
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+    });
+    savedObjectsClient.find.mockResolvedValueOnce({ saved_objects: [] });
+    savedObjectsClient.bulkCreate.mockResolvedValue({
+      saved_objects: savedObjects,
+    });
+    const result = await importSavedObjects({
+      readStream,
+      objectLimit: 4,
+      overwrite: false,
+      savedObjectsClient,
+      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+      namespace: 'foo',
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "success": true,
+        "successCount": 4,
+      }
+    `);
+    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "My Index Pattern",
+                },
+                "id": "1",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "index-pattern",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Search",
+                },
+                "id": "2",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "search",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Visualization",
+                },
+                "id": "3",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "visualization",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Dashboard",
+                },
+                "id": "4",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "dashboard",
+              },
+            ],
+            Object {
+              "namespace": "foo",
+              "overwrite": false,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 
   test('calls bulkCreate with overwrite', async () => {
@@ -195,66 +280,67 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "success": true,
-  "successCount": 4,
-}
-`);
+      Object {
+        "success": true,
+        "successCount": 4,
+      }
+    `);
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "My Index Pattern",
-          },
-          "id": "1",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "index-pattern",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Search",
-          },
-          "id": "2",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "search",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Visualization",
-          },
-          "id": "3",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "visualization",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Dashboard",
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "My Index Pattern",
+                },
+                "id": "1",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "index-pattern",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Search",
+                },
+                "id": "2",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "search",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Visualization",
+                },
+                "id": "3",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "visualization",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Dashboard",
+                },
+                "id": "4",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "dashboard",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+              "overwrite": true,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
           },
-          "id": "4",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "dashboard",
-        },
-      ],
-      Object {
-        "overwrite": true,
-      },
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+      }
+    `);
   });
 
   test('extracts errors for conflicts', async () => {
@@ -284,45 +370,45 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "errors": Array [
-    Object {
-      "error": Object {
-        "type": "conflict",
-      },
-      "id": "1",
-      "title": "My Index Pattern",
-      "type": "index-pattern",
-    },
-    Object {
-      "error": Object {
-        "type": "conflict",
-      },
-      "id": "2",
-      "title": "My Search",
-      "type": "search",
-    },
-    Object {
-      "error": Object {
-        "type": "conflict",
-      },
-      "id": "3",
-      "title": "My Visualization",
-      "type": "visualization",
-    },
-    Object {
-      "error": Object {
-        "type": "conflict",
-      },
-      "id": "4",
-      "title": "My Dashboard",
-      "type": "dashboard",
-    },
-  ],
-  "success": false,
-  "successCount": 0,
-}
-`);
+      Object {
+        "errors": Array [
+          Object {
+            "error": Object {
+              "type": "conflict",
+            },
+            "id": "1",
+            "title": "My Index Pattern",
+            "type": "index-pattern",
+          },
+          Object {
+            "error": Object {
+              "type": "conflict",
+            },
+            "id": "2",
+            "title": "My Search",
+            "type": "search",
+          },
+          Object {
+            "error": Object {
+              "type": "conflict",
+            },
+            "id": "3",
+            "title": "My Visualization",
+            "type": "visualization",
+          },
+          Object {
+            "error": Object {
+              "type": "conflict",
+            },
+            "id": "4",
+            "title": "My Dashboard",
+            "type": "dashboard",
+          },
+        ],
+        "success": false,
+        "successCount": 0,
+      }
+    `);
   });
 
   test('validates references', async () => {
@@ -380,56 +466,59 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "errors": Array [
-    Object {
-      "error": Object {
-        "blocking": Array [
+      Object {
+        "errors": Array [
           Object {
-            "id": "3",
-            "type": "visualization",
+            "error": Object {
+              "blocking": Array [
+                Object {
+                  "id": "3",
+                  "type": "visualization",
+                },
+              ],
+              "references": Array [
+                Object {
+                  "id": "2",
+                  "type": "index-pattern",
+                },
+              ],
+              "type": "missing_references",
+            },
+            "id": "1",
+            "title": "My Search",
+            "type": "search",
           },
         ],
-        "references": Array [
+        "success": false,
+        "successCount": 0,
+      }
+    `);
+    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "fields": Array [
+                  "id",
+                ],
+                "id": "2",
+                "type": "index-pattern",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
           Object {
-            "id": "2",
-            "type": "index-pattern",
+            "type": "return",
+            "value": Promise {},
           },
         ],
-        "type": "missing_references",
-      },
-      "id": "1",
-      "title": "My Search",
-      "type": "search",
-    },
-  ],
-  "success": false,
-  "successCount": 0,
-}
-`);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "fields": Array [
-            "id",
-          ],
-          "id": "2",
-          "type": "index-pattern",
-        },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+      }
+    `);
   });
 
   test('validates supported types', async () => {
@@ -453,75 +542,76 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "errors": Array [
-    Object {
-      "error": Object {
-        "type": "unsupported_type",
-      },
-      "id": "1",
-      "title": "my title",
-      "type": "wigwags",
-    },
-  ],
-  "success": false,
-  "successCount": 4,
-}
-`);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "My Index Pattern",
-          },
-          "id": "1",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "index-pattern",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Search",
-          },
-          "id": "2",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "search",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Visualization",
+      Object {
+        "errors": Array [
+          Object {
+            "error": Object {
+              "type": "unsupported_type",
+            },
+            "id": "1",
+            "title": "my title",
+            "type": "wigwags",
           },
-          "id": "3",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "visualization",
-        },
-        Object {
-          "attributes": Object {
-            "title": "My Dashboard",
+        ],
+        "success": false,
+        "successCount": 4,
+      }
+    `);
+    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "My Index Pattern",
+                },
+                "id": "1",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "index-pattern",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Search",
+                },
+                "id": "2",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "search",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Visualization",
+                },
+                "id": "3",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "visualization",
+              },
+              Object {
+                "attributes": Object {
+                  "title": "My Dashboard",
+                },
+                "id": "4",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "dashboard",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+              "overwrite": false,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
           },
-          "id": "4",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "dashboard",
-        },
-      ],
-      Object {
-        "overwrite": false,
-      },
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+      }
+    `);
   });
 });
diff --git a/src/core/server/saved_objects/import/import_saved_objects.ts b/src/core/server/saved_objects/import/import_saved_objects.ts
index 10c1350c4c579..ef3b4a214c2c2 100644
--- a/src/core/server/saved_objects/import/import_saved_objects.ts
+++ b/src/core/server/saved_objects/import/import_saved_objects.ts
@@ -17,26 +17,14 @@
  * under the License.
  */
 
-import { Readable } from 'stream';
 import { collectSavedObjects } from './collect_saved_objects';
 import { extractErrors } from './extract_errors';
-import { ImportError } from './types';
+import {
+  SavedObjectsImportError,
+  SavedObjectsImportResponse,
+  SavedObjectsImportOptions,
+} from './types';
 import { validateReferences } from './validate_references';
-import { SavedObjectsClientContract } from '../';
-
-interface ImportSavedObjectsOptions {
-  readStream: Readable;
-  objectLimit: number;
-  overwrite: boolean;
-  savedObjectsClient: SavedObjectsClientContract;
-  supportedTypes: string[];
-}
-
-interface ImportResponse {
-  success: boolean;
-  successCount: number;
-  errors?: ImportError[];
-}
 
 export async function importSavedObjects({
   readStream,
@@ -44,8 +32,9 @@ export async function importSavedObjects({
   overwrite,
   savedObjectsClient,
   supportedTypes,
-}: ImportSavedObjectsOptions): Promise<ImportResponse> {
-  let errorAccumulator: ImportError[] = [];
+  namespace,
+}: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse> {
+  let errorAccumulator: SavedObjectsImportError[] = [];
 
   // Get the objects to import
   const {
@@ -57,7 +46,8 @@ export async function importSavedObjects({
   // Validate references
   const { filteredObjects, errors: validationErrors } = await validateReferences(
     objectsFromStream,
-    savedObjectsClient
+    savedObjectsClient,
+    namespace
   );
   errorAccumulator = [...errorAccumulator, ...validationErrors];
 
@@ -73,6 +63,7 @@ export async function importSavedObjects({
   // Create objects in bulk
   const bulkCreateResult = await savedObjectsClient.bulkCreate(filteredObjects, {
     overwrite,
+    namespace,
   });
   errorAccumulator = [
     ...errorAccumulator,
diff --git a/src/core/server/saved_objects/import/index.ts b/src/core/server/saved_objects/import/index.ts
index aad06931c330e..95fa8aa192f3e 100644
--- a/src/core/server/saved_objects/import/index.ts
+++ b/src/core/server/saved_objects/import/index.ts
@@ -19,3 +19,14 @@
 
 export { importSavedObjects } from './import_saved_objects';
 export { resolveImportErrors } from './resolve_import_errors';
+export {
+  SavedObjectsImportResponse,
+  SavedObjectsImportError,
+  SavedObjectsImportOptions,
+  SavedObjectsImportConflictError,
+  SavedObjectsImportMissingReferencesError,
+  SavedObjectsImportUnknownError,
+  SavedObjectsImportUnsupportedTypeError,
+  SavedObjectsResolveImportErrorsOptions,
+  SavedObjectsImportRetry,
+} from './types';
diff --git a/src/core/server/saved_objects/import/resolve_import_errors.test.ts b/src/core/server/saved_objects/import/resolve_import_errors.test.ts
index d3f36852fd796..783b0d6a61be6 100644
--- a/src/core/server/saved_objects/import/resolve_import_errors.test.ts
+++ b/src/core/server/saved_objects/import/resolve_import_errors.test.ts
@@ -96,11 +96,11 @@ describe('resolveImportErrors()', () => {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "success": true,
-  "successCount": 0,
-}
-`);
+      Object {
+        "success": true,
+        "successCount": 0,
+      }
+    `);
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`[MockFunction]`);
   });
 
@@ -130,36 +130,39 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "success": true,
-  "successCount": 1,
-}
-`);
+      Object {
+        "success": true,
+        "successCount": 1,
+      }
+    `);
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "My Visualization",
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "My Visualization",
+                },
+                "id": "3",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "visualization",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
           },
-          "id": "3",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "visualization",
-        },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+      }
+    `);
   });
 
   test('works with overwrites', async () => {
@@ -188,39 +191,40 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "success": true,
-  "successCount": 1,
-}
-`);
+      Object {
+        "success": true,
+        "successCount": 1,
+      }
+    `);
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "My Index Pattern",
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "My Index Pattern",
+                },
+                "id": "1",
+                "migrationVersion": Object {},
+                "references": Array [],
+                "type": "index-pattern",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+              "overwrite": true,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
           },
-          "id": "1",
-          "migrationVersion": Object {},
-          "references": Array [],
-          "type": "index-pattern",
-        },
-      ],
-      Object {
-        "overwrite": true,
-      },
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+      }
+    `);
   });
 
   test('works wtih replaceReferences', async () => {
@@ -255,42 +259,45 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "success": true,
-  "successCount": 1,
-}
-`);
+      Object {
+        "success": true,
+        "successCount": 1,
+      }
+    `);
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "My Dashboard",
-          },
-          "id": "4",
-          "migrationVersion": Object {},
-          "references": Array [
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "My Dashboard",
+                },
+                "id": "4",
+                "migrationVersion": Object {},
+                "references": Array [
+                  Object {
+                    "id": "13",
+                    "name": "panel_0",
+                    "type": "visualization",
+                  },
+                ],
+                "type": "dashboard",
+              },
+            ],
             Object {
-              "id": "13",
-              "name": "panel_0",
-              "type": "visualization",
+              "namespace": undefined,
             },
           ],
-          "type": "dashboard",
-        },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 
   test('extracts errors for conflicts', async () => {
@@ -324,45 +331,45 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "errors": Array [
-    Object {
-      "error": Object {
-        "type": "conflict",
-      },
-      "id": "1",
-      "title": "My Index Pattern",
-      "type": "index-pattern",
-    },
-    Object {
-      "error": Object {
-        "type": "conflict",
-      },
-      "id": "2",
-      "title": "My Search",
-      "type": "search",
-    },
-    Object {
-      "error": Object {
-        "type": "conflict",
-      },
-      "id": "3",
-      "title": "My Visualization",
-      "type": "visualization",
-    },
-    Object {
-      "error": Object {
-        "type": "conflict",
-      },
-      "id": "4",
-      "title": "My Dashboard",
-      "type": "dashboard",
-    },
-  ],
-  "success": false,
-  "successCount": 0,
-}
-`);
+      Object {
+        "errors": Array [
+          Object {
+            "error": Object {
+              "type": "conflict",
+            },
+            "id": "1",
+            "title": "My Index Pattern",
+            "type": "index-pattern",
+          },
+          Object {
+            "error": Object {
+              "type": "conflict",
+            },
+            "id": "2",
+            "title": "My Search",
+            "type": "search",
+          },
+          Object {
+            "error": Object {
+              "type": "conflict",
+            },
+            "id": "3",
+            "title": "My Visualization",
+            "type": "visualization",
+          },
+          Object {
+            "error": Object {
+              "type": "conflict",
+            },
+            "id": "4",
+            "title": "My Dashboard",
+            "type": "dashboard",
+          },
+        ],
+        "success": false,
+        "successCount": 0,
+      }
+    `);
   });
 
   test('validates references', async () => {
@@ -433,56 +440,59 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "errors": Array [
-    Object {
-      "error": Object {
-        "blocking": Array [
+      Object {
+        "errors": Array [
           Object {
-            "id": "3",
-            "type": "visualization",
+            "error": Object {
+              "blocking": Array [
+                Object {
+                  "id": "3",
+                  "type": "visualization",
+                },
+              ],
+              "references": Array [
+                Object {
+                  "id": "2",
+                  "type": "index-pattern",
+                },
+              ],
+              "type": "missing_references",
+            },
+            "id": "1",
+            "title": "My Search",
+            "type": "search",
           },
         ],
-        "references": Array [
+        "success": false,
+        "successCount": 0,
+      }
+    `);
+    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "fields": Array [
+                  "id",
+                ],
+                "id": "2",
+                "type": "index-pattern",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
           Object {
-            "id": "2",
-            "type": "index-pattern",
+            "type": "return",
+            "value": Promise {},
           },
         ],
-        "type": "missing_references",
-      },
-      "id": "1",
-      "title": "My Search",
-      "type": "search",
-    },
-  ],
-  "success": false,
-  "successCount": 0,
-}
-`);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "fields": Array [
-            "id",
-          ],
-          "id": "2",
-          "type": "index-pattern",
-        },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+      }
+    `);
   });
 
   test('validates object types', async () => {
@@ -512,21 +522,67 @@ Object {
       supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "errors": Array [
-    Object {
-      "error": Object {
-        "type": "unsupported_type",
-      },
-      "id": "1",
-      "title": "my title",
-      "type": "wigwags",
-    },
-  ],
-  "success": false,
-  "successCount": 0,
-}
-`);
+      Object {
+        "errors": Array [
+          Object {
+            "error": Object {
+              "type": "unsupported_type",
+            },
+            "id": "1",
+            "title": "my title",
+            "type": "wigwags",
+          },
+        ],
+        "success": false,
+        "successCount": 0,
+      }
+    `);
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`[MockFunction]`);
   });
+
+  test('uses namespace when provided', async () => {
+    const readStream = new Readable({
+      objectMode: true,
+      read() {
+        savedObjects.forEach(obj => this.push(obj));
+        this.push(null);
+      },
+    });
+    savedObjectsClient.bulkCreate.mockResolvedValue({
+      saved_objects: savedObjects.filter(obj => obj.type === 'index-pattern' && obj.id === '1'),
+    });
+    const result = await resolveImportErrors({
+      readStream,
+      objectLimit: 4,
+      retries: [
+        {
+          type: 'index-pattern',
+          id: '1',
+          overwrite: true,
+          replaceReferences: [],
+        },
+      ],
+      savedObjectsClient,
+      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+      namespace: 'foo',
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "success": true,
+        "successCount": 1,
+      }
+    `);
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+      [
+        {
+          attributes: { title: 'My Index Pattern' },
+          id: '1',
+          migrationVersion: {},
+          references: [],
+          type: 'index-pattern',
+        },
+      ],
+      { namespace: 'foo', overwrite: true }
+    );
+  });
 });
diff --git a/src/core/server/saved_objects/import/resolve_import_errors.ts b/src/core/server/saved_objects/import/resolve_import_errors.ts
index 5cd4d2fca740c..c04827dc98ab5 100644
--- a/src/core/server/saved_objects/import/resolve_import_errors.ts
+++ b/src/core/server/saved_objects/import/resolve_import_errors.ts
@@ -17,38 +17,27 @@
  * under the License.
  */
 
-import { Readable } from 'stream';
-import { SavedObjectsClientContract } from '../';
 import { collectSavedObjects } from './collect_saved_objects';
 import { createObjectsFilter } from './create_objects_filter';
 import { extractErrors } from './extract_errors';
 import { splitOverwrites } from './split_overwrites';
-import { ImportError, Retry } from './types';
+import {
+  SavedObjectsImportError,
+  SavedObjectsImportResponse,
+  SavedObjectsResolveImportErrorsOptions,
+} from './types';
 import { validateReferences } from './validate_references';
 
-interface ResolveImportErrorsOptions {
-  readStream: Readable;
-  objectLimit: number;
-  savedObjectsClient: SavedObjectsClientContract;
-  retries: Retry[];
-  supportedTypes: string[];
-}
-
-interface ImportResponse {
-  success: boolean;
-  successCount: number;
-  errors?: ImportError[];
-}
-
 export async function resolveImportErrors({
   readStream,
   objectLimit,
   retries,
   savedObjectsClient,
   supportedTypes,
-}: ResolveImportErrorsOptions): Promise<ImportResponse> {
+  namespace,
+}: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse> {
   let successCount = 0;
-  let errorAccumulator: ImportError[] = [];
+  let errorAccumulator: SavedObjectsImportError[] = [];
   const filter = createObjectsFilter(retries);
 
   // Get the objects to resolve errors
@@ -89,7 +78,8 @@ export async function resolveImportErrors({
   // Validate references
   const { filteredObjects, errors: validationErrors } = await validateReferences(
     objectsToResolve,
-    savedObjectsClient
+    savedObjectsClient,
+    namespace
   );
   errorAccumulator = [...errorAccumulator, ...validationErrors];
 
@@ -98,6 +88,7 @@ export async function resolveImportErrors({
   if (objectsToOverwrite.length) {
     const bulkCreateResult = await savedObjectsClient.bulkCreate(objectsToOverwrite, {
       overwrite: true,
+      namespace,
     });
     errorAccumulator = [
       ...errorAccumulator,
@@ -106,7 +97,9 @@ export async function resolveImportErrors({
     successCount += bulkCreateResult.saved_objects.filter(obj => !obj.error).length;
   }
   if (objectsToNotOverwrite.length) {
-    const bulkCreateResult = await savedObjectsClient.bulkCreate(objectsToNotOverwrite);
+    const bulkCreateResult = await savedObjectsClient.bulkCreate(objectsToNotOverwrite, {
+      namespace,
+    });
     errorAccumulator = [
       ...errorAccumulator,
       ...extractErrors(bulkCreateResult.saved_objects, objectsToNotOverwrite),
diff --git a/src/core/server/saved_objects/import/split_overwrites.ts b/src/core/server/saved_objects/import/split_overwrites.ts
index 5609308f755f3..f49b634c8d9f2 100644
--- a/src/core/server/saved_objects/import/split_overwrites.ts
+++ b/src/core/server/saved_objects/import/split_overwrites.ts
@@ -18,9 +18,9 @@
  */
 
 import { SavedObject } from '../service';
-import { Retry } from './types';
+import { SavedObjectsImportRetry } from './types';
 
-export function splitOverwrites(savedObjects: SavedObject[], retries: Retry[]) {
+export function splitOverwrites(savedObjects: SavedObject[], retries: SavedObjectsImportRetry[]) {
   const objectsToOverwrite: SavedObject[] = [];
   const objectsToNotOverwrite: SavedObject[] = [];
   const overwrites = retries
diff --git a/src/core/server/saved_objects/import/types.ts b/src/core/server/saved_objects/import/types.ts
index ccefe178f38d5..cc16a1697d9a0 100644
--- a/src/core/server/saved_objects/import/types.ts
+++ b/src/core/server/saved_objects/import/types.ts
@@ -17,7 +17,14 @@
  * under the License.
  */
 
-export interface Retry {
+import { Readable } from 'stream';
+import { SavedObjectsClientContract } from '../service';
+
+/**
+ * Describes a retry operation for importing a saved object.
+ * @public
+ */
+export interface SavedObjectsImportRetry {
   type: string;
   id: string;
   overwrite: boolean;
@@ -28,21 +35,37 @@ export interface Retry {
   }>;
 }
 
-export interface ConflictError {
+/**
+ * Represents a failure to import due to a conflict.
+ * @public
+ */
+export interface SavedObjectsImportConflictError {
   type: 'conflict';
 }
 
-export interface UnsupportedTypeError {
+/**
+ * Represents a failure to import due to having an unsupported saved object type.
+ * @public
+ */
+export interface SavedObjectsImportUnsupportedTypeError {
   type: 'unsupported_type';
 }
 
-export interface UnknownError {
+/**
+ * Represents a failure to import due to an unknown reason.
+ * @public
+ */
+export interface SavedObjectsImportUnknownError {
   type: 'unknown';
   message: string;
   statusCode: number;
 }
 
-export interface MissingReferencesError {
+/**
+ * Represents a failure to import due to missing references.
+ * @public
+ */
+export interface SavedObjectsImportMissingReferencesError {
   type: 'missing_references';
   references: Array<{
     type: string;
@@ -54,9 +77,53 @@ export interface MissingReferencesError {
   }>;
 }
 
-export interface ImportError {
+/**
+ * Represents a failure to import.
+ * @public
+ */
+export interface SavedObjectsImportError {
   id: string;
   type: string;
   title?: string;
-  error: ConflictError | UnsupportedTypeError | MissingReferencesError | UnknownError;
+  error:
+    | SavedObjectsImportConflictError
+    | SavedObjectsImportUnsupportedTypeError
+    | SavedObjectsImportMissingReferencesError
+    | SavedObjectsImportUnknownError;
+}
+
+/**
+ * The response describing the result of an import.
+ * @public
+ */
+export interface SavedObjectsImportResponse {
+  success: boolean;
+  successCount: number;
+  errors?: SavedObjectsImportError[];
+}
+
+/**
+ * Options to control the import operation.
+ * @public
+ */
+export interface SavedObjectsImportOptions {
+  readStream: Readable;
+  objectLimit: number;
+  overwrite: boolean;
+  savedObjectsClient: SavedObjectsClientContract;
+  supportedTypes: string[];
+  namespace?: string;
+}
+
+/**
+ * Options to control the "resolve import" operation.
+ * @public
+ */
+export interface SavedObjectsResolveImportErrorsOptions {
+  readStream: Readable;
+  objectLimit: number;
+  savedObjectsClient: SavedObjectsClientContract;
+  retries: SavedObjectsImportRetry[];
+  supportedTypes: string[];
+  namespace?: string;
 }
diff --git a/src/core/server/saved_objects/import/validate_references.test.ts b/src/core/server/saved_objects/import/validate_references.test.ts
index e69ca99fb10f2..1a558b3d82b32 100644
--- a/src/core/server/saved_objects/import/validate_references.test.ts
+++ b/src/core/server/saved_objects/import/validate_references.test.ts
@@ -107,6 +107,9 @@ describe('getNonExistingReferenceAsKeys()', () => {
           "type": "index-pattern",
         },
       ],
+      Object {
+        "namespace": undefined,
+      },
     ],
   ],
   "results": Array [
@@ -206,6 +209,9 @@ describe('getNonExistingReferenceAsKeys()', () => {
           "type": "search",
         },
       ],
+      Object {
+        "namespace": undefined,
+      },
     ],
   ],
   "results": Array [
@@ -434,6 +440,9 @@ Object {
           "type": "search",
         },
       ],
+      Object {
+        "namespace": undefined,
+      },
     ],
   ],
   "results": Array [
diff --git a/src/core/server/saved_objects/import/validate_references.ts b/src/core/server/saved_objects/import/validate_references.ts
index 2e3c1ef5293b3..ad3f73b68f6e0 100644
--- a/src/core/server/saved_objects/import/validate_references.ts
+++ b/src/core/server/saved_objects/import/validate_references.ts
@@ -19,7 +19,7 @@
 
 import Boom from 'boom';
 import { SavedObject, SavedObjectsClientContract } from '../';
-import { ImportError } from './types';
+import { SavedObjectsImportError } from './types';
 
 const REF_TYPES_TO_VLIDATE = ['index-pattern', 'search'];
 
@@ -29,7 +29,8 @@ function filterReferencesToValidate({ type }: { type: string }) {
 
 export async function getNonExistingReferenceAsKeys(
   savedObjects: SavedObject[],
-  savedObjectsClient: SavedObjectsClientContract
+  savedObjectsClient: SavedObjectsClientContract,
+  namespace?: string
 ) {
   const collector = new Map();
   // Collect all references within objects
@@ -50,7 +51,7 @@ export async function getNonExistingReferenceAsKeys(
 
   // Fetch references to see if they exist
   const bulkGetOpts = Array.from(collector.values()).map(obj => ({ ...obj, fields: ['id'] }));
-  const bulkGetResponse = await savedObjectsClient.bulkGet(bulkGetOpts);
+  const bulkGetResponse = await savedObjectsClient.bulkGet(bulkGetOpts, { namespace });
 
   // Error handling
   const erroredObjects = bulkGetResponse.saved_objects.filter(
@@ -77,12 +78,14 @@ export async function getNonExistingReferenceAsKeys(
 
 export async function validateReferences(
   savedObjects: SavedObject[],
-  savedObjectsClient: SavedObjectsClientContract
+  savedObjectsClient: SavedObjectsClientContract,
+  namespace?: string
 ) {
-  const errorMap: { [key: string]: ImportError } = {};
+  const errorMap: { [key: string]: SavedObjectsImportError } = {};
   const nonExistingReferenceKeys = await getNonExistingReferenceAsKeys(
     savedObjects,
-    savedObjectsClient
+    savedObjectsClient,
+    namespace
   );
 
   // Filter out objects with missing references, add to error object
diff --git a/src/core/server/saved_objects/index.ts b/src/core/server/saved_objects/index.ts
index 623c722eb95b1..ef0362e0eb915 100644
--- a/src/core/server/saved_objects/index.ts
+++ b/src/core/server/saved_objects/index.ts
@@ -23,4 +23,8 @@ export { SavedObjectsSchema } from './schema';
 
 export { SavedObjectsManagement } from './management';
 
+export * from './import';
+
+export { getSortedObjectsForExport, SavedObjectsExportOptions } from './export';
+
 export { SavedObjectsSerializer, RawDoc as SavedObjectsRawDoc } from './serialization';
diff --git a/src/core/server/saved_objects/service/index.ts b/src/core/server/saved_objects/service/index.ts
index 697e1d2d41471..386539e755d9a 100644
--- a/src/core/server/saved_objects/service/index.ts
+++ b/src/core/server/saved_objects/service/index.ts
@@ -17,8 +17,13 @@
  * under the License.
  */
 
+import { Readable } from 'stream';
 import { ScopedSavedObjectsClientProvider } from './lib';
 import { SavedObjectsClient } from './saved_objects_client';
+import { SavedObjectsExportOptions } from '../export';
+import { SavedObjectsImportOptions, SavedObjectsImportResponse } from '../import';
+import { SavedObjectsSchema } from '../schema';
+import { SavedObjectsResolveImportErrorsOptions } from '../import/types';
 
 /**
  * @public
@@ -31,12 +36,22 @@ export interface SavedObjectsService<Request = any> {
   getScopedSavedObjectsClient: ScopedSavedObjectsClientProvider<Request>['getClient'];
   SavedObjectsClient: typeof SavedObjectsClient;
   types: string[];
+  schema: SavedObjectsSchema;
   getSavedObjectsRepository(...rest: any[]): any;
+  importExport: {
+    objectLimit: number;
+    importSavedObjects(options: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
+    resolveImportErrors(
+      options: SavedObjectsResolveImportErrorsOptions
+    ): Promise<SavedObjectsImportResponse>;
+    getSortedObjectsForExport(options: SavedObjectsExportOptions): Promise<Readable>;
+  };
 }
 
 export {
   SavedObjectsRepository,
   ScopedSavedObjectsClientProvider,
+  SavedObjectsClientProviderOptions,
   SavedObjectsClientWrapperFactory,
   SavedObjectsClientWrapperOptions,
   SavedObjectsErrorHelpers,
diff --git a/src/core/server/saved_objects/service/lib/index.ts b/src/core/server/saved_objects/service/lib/index.ts
index 19fdc3d75f603..d987737c2ffa0 100644
--- a/src/core/server/saved_objects/service/lib/index.ts
+++ b/src/core/server/saved_objects/service/lib/index.ts
@@ -22,6 +22,7 @@ export {
   SavedObjectsClientWrapperFactory,
   SavedObjectsClientWrapperOptions,
   ScopedSavedObjectsClientProvider,
+  SavedObjectsClientProviderOptions,
 } from './scoped_client_provider';
 
 export { SavedObjectsErrorHelpers } from './errors';
diff --git a/src/core/server/saved_objects/service/lib/scoped_client_provider.ts b/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
index fc0a3ea64c7a4..e0ca16e254e18 100644
--- a/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
+++ b/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
@@ -19,21 +19,37 @@
 import { PriorityCollection } from './priority_collection';
 import { SavedObjectsClientContract } from '..';
 
+/**
+ * Options passed to each SavedObjectsClientWrapperFactory to aid in creating the wrapper instance.
+ * @public
+ */
 export interface SavedObjectsClientWrapperOptions<Request = unknown> {
   client: SavedObjectsClientContract;
   request: Request;
 }
 
+/**
+ * Describes the factory used to create instances of Saved Objects Client Wrappers.
+ * @public
+ */
 export type SavedObjectsClientWrapperFactory<Request = unknown> = (
   options: SavedObjectsClientWrapperOptions<Request>
 ) => SavedObjectsClientContract;
 
+/**
+ * Describes the factory used to create instances of the Saved Objects Client.
+ * @public
+ */
 export type SavedObjectsClientFactory<Request = unknown> = ({
   request,
 }: {
   request: Request;
 }) => SavedObjectsClientContract;
 
+/**
+ * Options to control the creation of the Saved Objects Client.
+ * @public
+ */
 export interface SavedObjectsClientProviderOptions {
   excludedWrappers?: string[];
 }
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 6ab535a66cb36..94bed2ad01e64 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -5,13 +5,13 @@
 ```ts
 
 import Boom from 'boom';
-import { ByteSizeValue } from '@kbn/config-schema';
 import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 import { ConfigOptions } from 'elasticsearch';
 import { Duration } from 'moment';
 import { IncomingHttpHeaders } from 'http';
 import { ObjectType } from '@kbn/config-schema';
 import { Observable } from 'rxjs';
+import { Readable } from 'stream';
 import { Request } from 'hapi';
 import { ResponseObject } from 'hapi';
 import { ResponseToolkit } from 'hapi';
@@ -39,6 +39,13 @@ export interface AuthResultParams {
     state?: Record<string, any>;
 }
 
+// @public
+export enum AuthStatus {
+    authenticated = "authenticated",
+    unauthenticated = "unauthenticated",
+    unknown = "unknown"
+}
+
 // @public
 export interface AuthToolkit {
     authenticated: (data?: AuthResultParams) => AuthResult;
@@ -100,7 +107,6 @@ export interface CoreSetup {
         registerAuth: HttpServiceSetup['registerAuth'];
         registerOnPostAuth: HttpServiceSetup['registerOnPostAuth'];
         basePath: HttpServiceSetup['basePath'];
-        createNewServer: HttpServiceSetup['createNewServer'];
         isTlsEnabled: HttpServiceSetup['isTlsEnabled'];
     };
 }
@@ -109,6 +115,12 @@ export interface CoreSetup {
 export interface CoreStart {
 }
 
+// @public
+export interface CustomHttpResponseOptions extends HttpResponseOptions {
+    // (undocumented)
+    statusCode: number;
+}
+
 // @public
 export interface DiscoveredPlugin {
     readonly configPath: ConfigPath;
@@ -162,21 +174,58 @@ export interface FakeRequest {
 }
 
 // @public
-export type GetAuthHeaders = (request: KibanaRequest | Request) => AuthHeaders | undefined;
+export type GetAuthHeaders = (request: KibanaRequest | LegacyRequest) => AuthHeaders | undefined;
 
-// @public (undocumented)
-export type Headers = Record<string, string | string[] | undefined>;
+// @public
+export type GetAuthState = (request: KibanaRequest | LegacyRequest) => {
+    status: AuthStatus;
+    state: unknown;
+};
 
-// Warning: (ae-forgotten-export) The symbol "HttpServerSetup" needs to be exported by the entry point index.d.ts
-// 
-// @public (undocumented)
-export interface HttpServiceSetup extends HttpServerSetup {
-    // Warning: (ae-forgotten-export) The symbol "HttpConfig" needs to be exported by the entry point index.d.ts
-    // 
+// @public
+export type Headers = {
+    [header in KnownHeaders]?: string | string[] | undefined;
+} & {
+    [header: string]: string | string[] | undefined;
+};
+
+// @public
+export interface HttpResponseOptions {
+    // Warning: (ae-forgotten-export) The symbol "ResponseHeaders" needs to be exported by the entry point index.d.ts
+    headers?: ResponseHeaders;
+}
+
+// @public
+export type HttpResponsePayload = undefined | string | Record<string, any> | Buffer | Stream;
+
+// @public
+export interface HttpServerSetup {
+    // (undocumented)
+    auth: {
+        get: GetAuthState;
+        isAuthenticated: IsAuthenticated;
+        getAuthHeaders: GetAuthHeaders;
+    };
     // (undocumented)
-    createNewServer: (cfg: Partial<HttpConfig>) => Promise<HttpServerSetup>;
+    basePath: {
+        get: (request: KibanaRequest | LegacyRequest) => string;
+        set: (request: KibanaRequest | LegacyRequest, basePath: string) => void;
+        prepend: (url: string) => string;
+        remove: (url: string) => string;
+    };
+    createCookieSessionStorageFactory: <T>(cookieOptions: SessionStorageCookieOptions<T>) => Promise<SessionStorageFactory<T>>;
+    isTlsEnabled: boolean;
+    registerAuth: (handler: AuthenticationHandler) => void;
+    registerOnPostAuth: (handler: OnPostAuthHandler) => void;
+    registerOnPreAuth: (handler: OnPreAuthHandler) => void;
+    registerRouter: (router: Router) => void;
+    // (undocumented)
+    server: Server;
 }
 
+// @public (undocumented)
+export type HttpServiceSetup = HttpServerSetup;
+
 // @public (undocumented)
 export interface HttpServiceStart {
     isListening: (port: number) => boolean;
@@ -198,6 +247,9 @@ export interface InternalCoreStart {
     plugins: PluginsServiceStart;
 }
 
+// @public
+export type IsAuthenticated = (request: KibanaRequest | LegacyRequest) => boolean;
+
 // @public
 export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown> {
     // @internal (undocumented)
@@ -214,9 +266,7 @@ export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown> {
     readonly params: Params;
     // (undocumented)
     readonly query: Query;
-    // (undocumented)
     readonly route: RecursiveReadonly<KibanaRequestRoute>;
-    // (undocumented)
     readonly url: Url;
     }
 
@@ -231,7 +281,37 @@ export interface KibanaRequestRoute {
 }
 
 // @public
-export type LegacyRequest = Request;
+export type KibanaResponseFactory = typeof kibanaResponseFactory;
+
+// @public
+export const kibanaResponseFactory: {
+    ok: (payload: HttpResponsePayload, options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
+    accepted: (payload?: HttpResponsePayload, options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
+    noContent: (options?: HttpResponseOptions) => KibanaResponse<undefined>;
+    custom: (payload: string | Error | Record<string, any> | Buffer | Stream | {
+        message: string | Error;
+        meta?: ResponseErrorMeta | undefined;
+    } | undefined, options: CustomHttpResponseOptions) => KibanaResponse<string | Error | Record<string, any> | Buffer | Stream | {
+        message: string | Error;
+        meta?: ResponseErrorMeta | undefined;
+    }>;
+    redirected: (payload: HttpResponsePayload, options: RedirectResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
+    badRequest: (error?: ResponseError, options?: HttpResponseOptions) => KibanaResponse<ResponseError>;
+    unauthorized: (error?: ResponseError, options?: HttpResponseOptions) => KibanaResponse<ResponseError>;
+    forbidden: (error?: ResponseError, options?: HttpResponseOptions) => KibanaResponse<ResponseError>;
+    notFound: (error?: ResponseError, options?: HttpResponseOptions) => KibanaResponse<ResponseError>;
+    conflict: (error?: ResponseError, options?: HttpResponseOptions) => KibanaResponse<ResponseError>;
+    internal: (error?: ResponseError, options?: HttpResponseOptions) => KibanaResponse<ResponseError>;
+};
+
+// Warning: (ae-forgotten-export) The symbol "KnownKeys" needs to be exported by the entry point index.d.ts
+// 
+// @public
+export type KnownHeaders = KnownKeys<IncomingHttpHeaders>;
+
+// @public @deprecated (undocumented)
+export interface LegacyRequest extends Request {
+}
 
 // @public
 export interface Logger {
@@ -387,6 +467,16 @@ export type RecursiveReadonly<T> = T extends (...args: any[]) => any ? T : T ext
     [K in keyof T]: RecursiveReadonly<T[K]>;
 }> : T;
 
+// @public
+export type RedirectResponseOptions = HttpResponseOptions & {
+    headers: {
+        location: string;
+    };
+};
+
+// @public
+export type RequestHandler<P extends ObjectType, Q extends ObjectType, B extends ObjectType> = (request: KibanaRequest<TypeOf<P>, TypeOf<Q>, TypeOf<B>>, response: KibanaResponseFactory) => KibanaResponse<any> | Promise<KibanaResponse<any>>;
+
 // @public
 export type ResponseError = string | Error | {
     message: string | Error;
@@ -403,6 +493,13 @@ export interface ResponseErrorMeta {
     errorCode?: string;
 }
 
+// @public
+export interface RouteConfig<P extends ObjectType, Q extends ObjectType, B extends ObjectType> {
+    options?: RouteConfigOptions;
+    path: string;
+    validate: RouteSchemas<P, Q, B> | false;
+}
+
 // @public
 export interface RouteConfigOptions {
     authRequired?: boolean;
@@ -412,13 +509,12 @@ export interface RouteConfigOptions {
 // @public
 export type RouteMethod = 'get' | 'post' | 'put' | 'delete';
 
-// @public (undocumented)
+// @public
 export class Router {
     constructor(path: string);
     delete<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(route: RouteConfig<P, Q, B>, handler: RequestHandler<P, Q, B>): void;
-    // Warning: (ae-forgotten-export) The symbol "RouteConfig" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "RequestHandler" needs to be exported by the entry point index.d.ts
     get<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(route: RouteConfig<P, Q, B>, handler: RequestHandler<P, Q, B>): void;
+    // @internal
     getRoutes(): Readonly<RouterRoute>[];
     // (undocumented)
     readonly path: string;
@@ -533,14 +629,16 @@ export class SavedObjectsClient {
 // @public
 export type SavedObjectsClientContract = Pick<SavedObjectsClient, keyof SavedObjectsClient>;
 
-// Warning: (ae-missing-release-tag) "SavedObjectsClientWrapperFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// 
-// @public (undocumented)
+// @public
+export interface SavedObjectsClientProviderOptions {
+    // (undocumented)
+    excludedWrappers?: string[];
+}
+
+// @public
 export type SavedObjectsClientWrapperFactory<Request = unknown> = (options: SavedObjectsClientWrapperOptions<Request>) => SavedObjectsClientContract;
 
-// Warning: (ae-missing-release-tag) "SavedObjectsClientWrapperOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// 
-// @public (undocumented)
+// @public
 export interface SavedObjectsClientWrapperOptions<Request = unknown> {
     // (undocumented)
     client: SavedObjectsClientContract;
@@ -608,6 +706,25 @@ export class SavedObjectsErrorHelpers {
     static isSavedObjectsClientError(error: any): error is DecoratedError;
 }
 
+// @public
+export interface SavedObjectsExportOptions {
+    // (undocumented)
+    exportSizeLimit: number;
+    // (undocumented)
+    includeReferencesDeep?: boolean;
+    // (undocumented)
+    namespace?: string;
+    // (undocumented)
+    objects?: Array<{
+        id: string;
+        type: string;
+    }>;
+    // (undocumented)
+    savedObjectsClient: SavedObjectsClientContract;
+    // (undocumented)
+    types?: string[];
+}
+
 // @public (undocumented)
 export interface SavedObjectsFindOptions extends SavedObjectsBaseOptions {
     // (undocumented)
@@ -646,6 +763,98 @@ export interface SavedObjectsFindResponse<T extends SavedObjectAttributes = any>
     total: number;
 }
 
+// @public
+export interface SavedObjectsImportConflictError {
+    // (undocumented)
+    type: 'conflict';
+}
+
+// @public
+export interface SavedObjectsImportError {
+    // (undocumented)
+    error: SavedObjectsImportConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    title?: string;
+    // (undocumented)
+    type: string;
+}
+
+// @public
+export interface SavedObjectsImportMissingReferencesError {
+    // (undocumented)
+    blocking: Array<{
+        type: string;
+        id: string;
+    }>;
+    // (undocumented)
+    references: Array<{
+        type: string;
+        id: string;
+    }>;
+    // (undocumented)
+    type: 'missing_references';
+}
+
+// @public
+export interface SavedObjectsImportOptions {
+    // (undocumented)
+    namespace?: string;
+    // (undocumented)
+    objectLimit: number;
+    // (undocumented)
+    overwrite: boolean;
+    // (undocumented)
+    readStream: Readable;
+    // (undocumented)
+    savedObjectsClient: SavedObjectsClientContract;
+    // (undocumented)
+    supportedTypes: string[];
+}
+
+// @public
+export interface SavedObjectsImportResponse {
+    // (undocumented)
+    errors?: SavedObjectsImportError[];
+    // (undocumented)
+    success: boolean;
+    // (undocumented)
+    successCount: number;
+}
+
+// @public
+export interface SavedObjectsImportRetry {
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    overwrite: boolean;
+    // (undocumented)
+    replaceReferences: Array<{
+        type: string;
+        from: string;
+        to: string;
+    }>;
+    // (undocumented)
+    type: string;
+}
+
+// @public
+export interface SavedObjectsImportUnknownError {
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    statusCode: number;
+    // (undocumented)
+    type: 'unknown';
+}
+
+// @public
+export interface SavedObjectsImportUnsupportedTypeError {
+    // (undocumented)
+    type: 'unsupported_type';
+}
+
 // @public
 export interface SavedObjectsMigrationVersion {
     // (undocumented)
@@ -668,6 +877,22 @@ export interface SavedObjectsRawDoc {
     _type?: string;
 }
 
+// @public
+export interface SavedObjectsResolveImportErrorsOptions {
+    // (undocumented)
+    namespace?: string;
+    // (undocumented)
+    objectLimit: number;
+    // (undocumented)
+    readStream: Readable;
+    // (undocumented)
+    retries: SavedObjectsImportRetry[];
+    // (undocumented)
+    savedObjectsClient: SavedObjectsClientContract;
+    // (undocumented)
+    supportedTypes: string[];
+}
+
 // Warning: (ae-missing-release-tag) "SavedObjectsSchema" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 // 
 // @public (undocumented)
@@ -704,11 +929,20 @@ export interface SavedObjectsService<Request = any> {
     getSavedObjectsRepository(...rest: any[]): any;
     // (undocumented)
     getScopedSavedObjectsClient: ScopedSavedObjectsClientProvider<Request>['getClient'];
+    // (undocumented)
+    importExport: {
+        objectLimit: number;
+        importSavedObjects(options: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
+        resolveImportErrors(options: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse>;
+        getSortedObjectsForExport(options: SavedObjectsExportOptions): Promise<Readable>;
+    };
     // Warning: (ae-incompatible-release-tags) The symbol "SavedObjectsClient" is marked as @public, but its signature references "SavedObjectsClient" which is marked as @internal
     // 
     // (undocumented)
     SavedObjectsClient: typeof SavedObjectsClient;
     // (undocumented)
+    schema: SavedObjectsSchema;
+    // (undocumented)
     types: string[];
 }
 
@@ -729,7 +963,7 @@ export interface SavedObjectsUpdateResponse<T extends SavedObjectAttributes = an
 
 // @public
 export class ScopedClusterClient {
-    constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Record<string, string | string[] | undefined> | undefined);
+    constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Headers | undefined);
     callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<unknown>;
     callAsInternalUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<unknown>;
     }
@@ -741,6 +975,14 @@ export interface SessionStorage<T> {
     set(sessionValue: T): void;
 }
 
+// @public
+export interface SessionStorageCookieOptions<T> {
+    encryptionKey: string;
+    isSecure: boolean;
+    name: string;
+    validate: (sessionValue: T) => boolean | Promise<boolean>;
+}
+
 // @public
 export interface SessionStorageFactory<T> {
     // (undocumented)
@@ -750,6 +992,7 @@ export interface SessionStorageFactory<T> {
 
 // Warnings were encountered during analysis:
 // 
+// src/core/server/http/router/response.ts:188:3 - (ae-forgotten-export) The symbol "KibanaResponse" needs to be exported by the entry point index.d.ts
 // src/core/server/plugins/plugin_context.ts:34:10 - (ae-forgotten-export) The symbol "EnvironmentMode" needs to be exported by the entry point index.d.ts
 // src/core/server/plugins/plugins_service.ts:37:5 - (ae-forgotten-export) The symbol "DiscoveredPluginInternal" needs to be exported by the entry point index.d.ts
 
diff --git a/src/dev/build/tasks/optimize_task.js b/src/dev/build/tasks/optimize_task.js
index f6de0c717abfe..bbd8f9622535d 100644
--- a/src/dev/build/tasks/optimize_task.js
+++ b/src/dev/build/tasks/optimize_task.js
@@ -49,7 +49,7 @@ export const OptimizeBuildTask = {
       env: {
         FORCE_DLL_CREATION: 'true',
         KBN_CACHE_LOADER_WRITABLE: 'true',
-        NODE_OPTIONS: '--max-old-space-size=2048'
+        NODE_OPTIONS: '--max-old-space-size=3072'
       },
     });
 
diff --git a/src/dev/jest/setup/polyfills.js b/src/dev/jest/setup/polyfills.js
index 293fbcf3616d7..9394de0aea936 100644
--- a/src/dev/jest/setup/polyfills.js
+++ b/src/dev/jest/setup/polyfills.js
@@ -23,17 +23,6 @@ const bluebird = require('bluebird');
 bluebird.Promise.setScheduler(function (fn) { global.setImmediate.call(global, fn); });
 
 const MutationObserver = require('mutation-observer');
-// There's a bug in mutation-observer around the `attributes` option
-// https://dom.spec.whatwg.org/#mutationobserver
-// If either options's attributeOldValue or attributeFilter is present and options's attributes is omitted, then set options's attributes to true.
-const _observe = MutationObserver.prototype.observe;
-MutationObserver.prototype.observe = function observe(target, options) {
-  const needsAttributes = options.hasOwnProperty('attributeOldValue') || options.hasOwnProperty('attributeFilter');
-  if (needsAttributes && !options.hasOwnProperty('attributes')) {
-    options.attributes = true;
-  }
-  Function.prototype.call(_observe, this, target, options);
-};
 Object.defineProperty(window, 'MutationObserver', { value: MutationObserver });
 
 require('whatwg-fetch');
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_core.test.mocks.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_core.test.mocks.ts
index a3909bc556b57..1e71e2b26970b 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_core.test.mocks.ts
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_core.test.mocks.ts
@@ -17,35 +17,11 @@
  * under the License.
  */
 
-import { fatalErrorsServiceMock, notificationServiceMock } from '../../../../core/public/mocks';
-
 let modalContents: React.Component;
 
 export const getModalContents = () => modalContents;
 
-jest.doMock('ui/new_platform', () => {
-  return {
-    npStart: {
-      core: {
-        overlays: {
-          openFlyout: jest.fn(),
-          openModal: (component: React.Component) => {
-            modalContents = component;
-            return {
-              close: jest.fn(),
-            };
-          },
-        },
-      },
-    },
-    npSetup: {
-      core: {
-        fatalErrors: fatalErrorsServiceMock.createSetupContract(),
-        notifications: notificationServiceMock.createSetupContract(),
-      },
-    },
-  };
-});
+jest.mock('ui/new_platform');
 
 jest.doMock('ui/metadata', () => ({
   metadata: {
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx
index 1f115964709e9..ca2b26cc3202d 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx
@@ -31,20 +31,19 @@ import {
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import classNames from 'classnames';
 import React, { Component } from 'react';
-import chrome from 'ui/chrome';
+import { UiSettingsClientContract } from 'src/core/public';
 import { IndexPattern } from '../../index_patterns';
 import { FilterEditor } from './filter_editor';
 import { FilterItem } from './filter_item';
 import { FilterOptions } from './filter_options';
 
-const config = chrome.getUiSettingsClient();
-
 interface Props {
   filters: Filter[];
   onFiltersUpdated: (filters: Filter[]) => void;
   className: string;
   indexPatterns: IndexPattern[];
   intl: InjectedIntl;
+  uiSettings: UiSettingsClientContract;
 }
 
 interface State {
@@ -103,13 +102,14 @@ class FilterBarUI extends Component<Props, State> {
           onUpdate={newFilter => this.onUpdate(i, newFilter)}
           onRemove={() => this.onRemove(i)}
           indexPatterns={this.props.indexPatterns}
+          uiSettings={this.props.uiSettings}
         />
       </EuiFlexItem>
     ));
   }
 
   private renderAddFilter() {
-    const isPinned = config.get('filters:pinnedByDefault');
+    const isPinned = this.props.uiSettings.get('filters:pinnedByDefault');
     const [indexPattern] = this.props.indexPatterns;
     const index = indexPattern && indexPattern.id;
     const newFilter = buildEmptyFilter(isPinned, index);
@@ -144,6 +144,7 @@ class FilterBarUI extends Component<Props, State> {
                 onSubmit={this.onAdd}
                 onCancel={this.onCloseAddFilterPopover}
                 key={JSON.stringify(newFilter)}
+                uiSettings={this.props.uiSettings}
               />
             </div>
           </EuiFlexItem>
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/index.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/index.tsx
index 1bb594c183bc6..0d46e9e7bac63 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/index.tsx
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/index.tsx
@@ -36,6 +36,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { get } from 'lodash';
 import React, { Component } from 'react';
+import { UiSettingsClientContract } from 'src/core/public';
 import { Field, IndexPattern } from '../../../index_patterns';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import {
@@ -61,6 +62,7 @@ interface Props {
   onSubmit: (filter: Filter) => void;
   onCancel: () => void;
   intl: InjectedIntl;
+  uiSettings: UiSettingsClientContract;
 }
 
 interface State {
@@ -327,6 +329,7 @@ class FilterEditorUI extends Component<Props, State> {
             value={this.state.params}
             onChange={this.onParamsChange}
             data-test-subj="phraseValueInput"
+            uiSettings={this.props.uiSettings}
           />
         );
       case 'phrases':
@@ -336,6 +339,7 @@ class FilterEditorUI extends Component<Props, State> {
             field={this.state.selectedField}
             values={this.state.params}
             onChange={this.onParamsChange}
+            uiSettings={this.props.uiSettings}
           />
         );
       case 'range':
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/phrase_suggestor.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/phrase_suggestor.tsx
index 9cfd3aa4fd331..6b262c66402f2 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/phrase_suggestor.tsx
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/phrase_suggestor.tsx
@@ -18,14 +18,14 @@
  */
 
 import { Component } from 'react';
-import chrome from 'ui/chrome';
 import { getSuggestions } from 'ui/value_suggestions';
+import { UiSettingsClientContract } from 'src/core/public';
 import { Field, IndexPattern } from '../../../index_patterns';
-const config = chrome.getUiSettingsClient();
 
 export interface PhraseSuggestorProps {
   indexPattern: IndexPattern;
   field?: Field;
+  uiSettings: UiSettingsClientContract;
 }
 
 export interface PhraseSuggestorState {
@@ -52,7 +52,7 @@ export class PhraseSuggestor<T extends PhraseSuggestorProps> extends Component<
   }
 
   protected isSuggestingValues() {
-    const shouldSuggestValues = config.get('filterEditor:suggestValues');
+    const shouldSuggestValues = this.props.uiSettings.get('filterEditor:suggestValues');
     const { field } = this.props;
     return shouldSuggestValues && field && field.aggregatable && field.type === 'string';
   }
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx
index 453dafdb29fe3..ee8d660e44f55 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx
@@ -28,6 +28,7 @@ import {
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import classNames from 'classnames';
 import React, { Component } from 'react';
+import { UiSettingsClientContract } from 'src/core/public';
 import { IndexPattern } from '../../index_patterns';
 import { FilterEditor } from './filter_editor';
 import { FilterView } from './filter_view';
@@ -40,6 +41,7 @@ interface Props {
   onUpdate: (filter: Filter) => void;
   onRemove: () => void;
   intl: InjectedIntl;
+  uiSettings: UiSettingsClientContract;
 }
 
 interface State {
@@ -169,6 +171,7 @@ class FilterItemUI extends Component<Props, State> {
               indexPatterns={this.props.indexPatterns}
               onSubmit={this.onSubmit}
               onCancel={this.closePopover}
+              uiSettings={this.props.uiSettings}
             />
           </div>
         ),
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.test.ts
index 3f3cbd0044a07..8fba16037ed97 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.test.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.test.ts
@@ -32,35 +32,20 @@ import { StubIndexPatterns } from './test_helpers/stub_index_pattern';
 import { StubState } from './test_helpers/stub_state';
 import { getFiltersArray } from './test_helpers/get_filters_array';
 
-jest.mock(
-  'ui/chrome',
-  () => ({
-    getBasePath: jest.fn(() => 'path'),
-    getUiSettingsClient: jest.fn(() => {
-      return {
-        get: () => true,
-      };
-    }),
-  }),
-  { virtual: true }
-);
-
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    core: {
-      chrome: {
-        recentlyAccessed: false,
-      },
-    },
-  },
-  npSetup: {
-    core: {
-      uiSettings: {
-        get: () => true,
-      },
+import { coreMock } from '../../../../../../core/public/mocks';
+const setupMock = coreMock.createSetup();
+
+setupMock.uiSettings.get.mockImplementation((key: string) => {
+  return true;
+});
+
+jest.mock('ui/timefilter', () => {
+  return {
+    timefilter: {
+      setTime: jest.fn(),
     },
-  },
-}));
+  };
+});
 
 describe('filter_manager', () => {
   let appStateStub: StubState;
@@ -79,7 +64,7 @@ describe('filter_manager', () => {
     appStateStub = new StubState();
     globalStateStub = new StubState();
     indexPatterns = new StubIndexPatterns();
-    filterManager = new FilterManager(indexPatterns as IndexPatterns);
+    filterManager = new FilterManager(indexPatterns as IndexPatterns, setupMock.uiSettings);
     readyFilters = getFiltersArray();
 
     // FilterStateManager is tested indirectly.
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts
index ccb26c801c701..f230b035de352 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts
@@ -22,8 +22,7 @@ import { Filter, isFilterPinned, FilterStateStore } from '@kbn/es-query';
 import _ from 'lodash';
 import { Subject } from 'rxjs';
 
-import { npSetup } from 'ui/new_platform';
-
+import { UiSettingsClientContract } from 'src/core/public';
 // @ts-ignore
 import { compareFilters } from './lib/compare_filters';
 // @ts-ignore
@@ -46,9 +45,11 @@ export class FilterManager {
   private filters: Filter[] = [];
   private updated$: Subject<void> = new Subject();
   private fetch$: Subject<void> = new Subject();
+  private uiSettings: UiSettingsClientContract;
 
-  constructor(indexPatterns: IndexPatterns) {
+  constructor(indexPatterns: IndexPatterns, uiSettings: UiSettingsClientContract) {
     this.indexPatterns = indexPatterns;
+    this.uiSettings = uiSettings;
   }
 
   private mergeIncomingFilters(partitionedFilters: PartitionedFilters): Filter[] {
@@ -144,9 +145,8 @@ export class FilterManager {
       return;
     }
 
-    const { uiSettings } = npSetup.core;
     if (pinFilterStatus === undefined) {
-      pinFilterStatus = uiSettings.get('filters:pinnedByDefault');
+      pinFilterStatus = this.uiSettings.get('filters:pinnedByDefault');
     }
 
     // Set the store of all filters. For now.
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts
index 4152a0931b031..778663821f55b 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts
@@ -28,22 +28,20 @@ import { getFilter } from './test_helpers/get_stub_filter';
 import { FilterManager } from './filter_manager';
 import { StubIndexPatterns } from './test_helpers/stub_index_pattern';
 
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    core: {
-      chrome: {
-        recentlyAccessed: false,
-      },
-    },
-  },
-  npSetup: {
-    core: {
-      uiSettings: {
-        get: () => true,
-      },
+import { coreMock } from '../../../../../../core/public/mocks';
+const setupMock = coreMock.createSetup();
+
+setupMock.uiSettings.get.mockImplementation((key: string) => {
+  return true;
+});
+
+jest.mock('ui/timefilter', () => {
+  return {
+    timefilter: {
+      setTime: jest.fn(),
     },
-  },
-}));
+  };
+});
 
 describe('filter_state_manager', () => {
   let appStateStub: StubState;
@@ -55,7 +53,7 @@ describe('filter_state_manager', () => {
     appStateStub = new StubState();
     globalStateStub = new StubState();
     const indexPatterns = new StubIndexPatterns();
-    filterManager = new FilterManager(indexPatterns as IndexPatterns);
+    filterManager = new FilterManager(indexPatterns as IndexPatterns, setupMock.uiSettings);
   });
 
   describe('app_state_undefined', () => {
diff --git a/src/legacy/core_plugins/data/public/filter/filter_service.ts b/src/legacy/core_plugins/data/public/filter/filter_service.ts
index 27cf027e45907..7be9f4f04b48f 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_service.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_service.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { UiSettingsClientContract } from 'src/core/public';
 import { IndexPatterns } from '../index_patterns';
 import { FilterManager } from './filter_manager';
 /**
@@ -26,11 +27,12 @@ import { FilterManager } from './filter_manager';
 
 export interface FilterServiceDependencies {
   indexPatterns: IndexPatterns;
+  uiSettings: UiSettingsClientContract;
 }
 
 export class FilterService {
-  public setup({ indexPatterns }: FilterServiceDependencies) {
-    const filterManager = new FilterManager(indexPatterns);
+  public setup({ indexPatterns, uiSettings }: FilterServiceDependencies) {
+    const filterManager = new FilterManager(indexPatterns, uiSettings);
 
     return {
       filterManager,
diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
index ef91679ce2f37..6d33349614294 100644
--- a/src/legacy/core_plugins/data/public/index.ts
+++ b/src/legacy/core_plugins/data/public/index.ts
@@ -33,6 +33,7 @@ export { ExpressionRenderer, ExpressionRendererProps, ExpressionRunner } from '.
 export { IndexPattern, IndexPatterns, StaticIndexPattern, Field } from './index_patterns';
 export { Query, QueryBar, QueryBarInput } from './query';
 export { FilterBar, ApplyFiltersPopover } from './filter';
+export { SearchBar, SearchBarProps } from './search';
 export {
   FilterManager,
   FilterStateManager,
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts
index 74918bebccf08..731361ee10262 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts
@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import chrome from 'ui/chrome';
 // @ts-ignore
 import { mockFields, mockIndexPattern } from 'ui/index_patterns/fixtures';
 // @ts-ignore
@@ -35,9 +33,15 @@ import { isFilterable, getFromSavedObject } from 'ui/index_patterns/static_utils
 
 // IndexPattern, StaticIndexPattern, Field
 import * as types from 'ui/index_patterns';
+import { SavedObjectsClient } from 'ui/saved_objects';
+
+import { UiSettingsClientContract } from 'src/core/public';
+
+export interface IndexPatternDependencies {
+  uiSettings: UiSettingsClientContract;
+  savedObjectsClient: SavedObjectsClient;
+}
 
-const config = chrome.getUiSettingsClient();
-const savedObjectsClient = chrome.getSavedObjectsClient();
 /**
  * Index Patterns Service
  *
@@ -50,9 +54,9 @@ const savedObjectsClient = chrome.getSavedObjectsClient();
  * @internal
  */
 export class IndexPatternsService {
-  public setup() {
+  public setup({ uiSettings, savedObjectsClient }: IndexPatternDependencies) {
     return {
-      indexPatterns: new IndexPatterns(config, savedObjectsClient),
+      indexPatterns: new IndexPatterns(uiSettings, savedObjectsClient),
     };
   }
 
diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
index 31f2596dd2182..34edb355d2ef8 100644
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ b/src/legacy/core_plugins/data/public/plugin.ts
@@ -19,6 +19,7 @@
 
 import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
 import { ExpressionsService, ExpressionsSetup } from './expressions';
+import { SearchService, SearchSetup } from './search';
 import { QueryService, QuerySetup } from './query';
 import { FilterService, FilterSetup } from './filter';
 import { IndexPatternsService, IndexPatternsSetup } from './index_patterns';
@@ -44,6 +45,7 @@ export interface DataSetup {
   indexPatterns: IndexPatternsSetup;
   filter: FilterSetup;
   query: QuerySetup;
+  search: SearchSetup;
 }
 
 /**
@@ -63,18 +65,27 @@ export class DataPlugin implements Plugin<DataSetup, void, DataPluginSetupDepend
   private readonly filter: FilterService = new FilterService();
   private readonly indexPatterns: IndexPatternsService = new IndexPatternsService();
   private readonly query: QueryService = new QueryService();
+  private readonly search: SearchService = new SearchService();
 
   public setup(core: CoreSetup, { __LEGACY, interpreter }: DataPluginSetupDependencies): DataSetup {
-    const indexPatternsService = this.indexPatterns.setup();
+    const { uiSettings } = core;
+    const savedObjectsClient = __LEGACY.savedObjectsClient;
+
+    const indexPatternsService = this.indexPatterns.setup({
+      uiSettings,
+      savedObjectsClient,
+    });
     return {
       expressions: this.expressions.setup({
         interpreter,
       }),
       indexPatterns: indexPatternsService,
       filter: this.filter.setup({
+        uiSettings,
         indexPatterns: indexPatternsService.indexPatterns,
       }),
       query: this.query.setup(),
+      search: this.search.setup(),
     };
   }
 
@@ -85,5 +96,6 @@ export class DataPlugin implements Plugin<DataSetup, void, DataPluginSetupDepend
     this.indexPatterns.stop();
     this.filter.stop();
     this.query.stop();
+    this.search.stop();
   }
 }
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar.test.tsx.snap b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar.test.tsx.snap
deleted file mode 100644
index 8680f269d93ed..0000000000000
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar.test.tsx.snap
+++ /dev/null
@@ -1,111 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`QueryBar Should render the given query 1`] = `
-<EuiFlexGroup
-  className="kbnQueryBar kbnQueryBar--withDatePicker"
-  gutterSize="s"
-  responsive={true}
->
-  <EuiFlexItem>
-    <InjectIntl(QueryBarInputUI)
-      appName="discover"
-      indexPatterns={
-        Array [
-          Object {
-            "fields": Array [
-              Object {
-                "aggregatable": true,
-                "esTypes": Array [
-                  "integer",
-                ],
-                "filterable": true,
-                "name": "response",
-                "searchable": true,
-                "type": "number",
-              },
-            ],
-            "id": "1234",
-            "title": "logstash-*",
-          },
-        ]
-      }
-      onChange={[Function]}
-      onSubmit={[Function]}
-      query={
-        Object {
-          "language": "kuery",
-          "query": "response:200",
-        }
-      }
-      screenTitle="Another Screen"
-      store={
-        Object {
-          "clear": [MockFunction],
-          "get": [MockFunction],
-          "remove": [MockFunction],
-          "set": [MockFunction],
-          "store": Object {
-            "clear": [MockFunction],
-            "getItem": [MockFunction],
-            "key": [MockFunction],
-            "length": 0,
-            "removeItem": [MockFunction],
-            "setItem": [MockFunction],
-          },
-        }
-      }
-    />
-  </EuiFlexItem>
-  <EuiFlexItem
-    grow={false}
-  >
-    <EuiFlexGroup
-      gutterSize="s"
-      responsive={false}
-    >
-      <EuiFlexItem
-        className="kbnQueryBar__datePickerWrapper"
-      >
-        <EuiSuperDatePicker
-          commonlyUsedRanges={
-            Array [
-              Object {
-                "end": "now/d",
-                "label": "Today",
-                "start": "now/d",
-              },
-            ]
-          }
-          dateFormat="YY"
-          end="now"
-          isAutoRefreshOnly={false}
-          isPaused={true}
-          onTimeChange={[Function]}
-          recentlyUsedRanges={
-            Array [
-              Object {
-                "end": undefined,
-                "start": undefined,
-              },
-            ]
-          }
-          refreshInterval={0}
-          showUpdateButton={false}
-          start="now-15m"
-        />
-      </EuiFlexItem>
-      <EuiFlexItem
-        grow={false}
-      >
-        <EuiSuperUpdateButton
-          data-test-subj="querySubmitButton"
-          isDisabled={false}
-          isLoading={false}
-          needsUpdate={true}
-          onClick={[Function]}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiFlexItem>
-</EuiFlexGroup>
-`;
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
index 00576d05bdcac..b13916a3e5b29 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
@@ -150,6 +150,36 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
       },
     }
   }
+  uiSettings={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [
+            "history:limit",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      },
+      "get$": [MockFunction],
+      "getAll": [MockFunction],
+      "getSaved$": [MockFunction],
+      "getUpdate$": [MockFunction],
+      "getUpdateErrors$": [MockFunction],
+      "isCustom": [MockFunction],
+      "isDeclared": [MockFunction],
+      "isDefault": [MockFunction],
+      "isOverridden": [MockFunction],
+      "overrideLocalDefault": [MockFunction],
+      "remove": [MockFunction],
+      "set": [MockFunction],
+      "stop": [MockFunction],
+    }
+  }
 >
   <EuiOutsideClickDetector
     onOutsideClick={[Function]}
@@ -498,6 +528,36 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
       },
     }
   }
+  uiSettings={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [
+            "history:limit",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      },
+      "get$": [MockFunction],
+      "getAll": [MockFunction],
+      "getSaved$": [MockFunction],
+      "getUpdate$": [MockFunction],
+      "getUpdateErrors$": [MockFunction],
+      "isCustom": [MockFunction],
+      "isDeclared": [MockFunction],
+      "isDefault": [MockFunction],
+      "isOverridden": [MockFunction],
+      "overrideLocalDefault": [MockFunction],
+      "remove": [MockFunction],
+      "set": [MockFunction],
+      "stop": [MockFunction],
+    }
+  }
 >
   <EuiOutsideClickDetector
     onOutsideClick={[Function]}
@@ -846,6 +906,36 @@ exports[`QueryBarInput Should render the given query 1`] = `
       },
     }
   }
+  uiSettings={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [
+            "history:limit",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      },
+      "get$": [MockFunction],
+      "getAll": [MockFunction],
+      "getSaved$": [MockFunction],
+      "getUpdate$": [MockFunction],
+      "getUpdateErrors$": [MockFunction],
+      "isCustom": [MockFunction],
+      "isDeclared": [MockFunction],
+      "isDefault": [MockFunction],
+      "isOverridden": [MockFunction],
+      "overrideLocalDefault": [MockFunction],
+      "remove": [MockFunction],
+      "set": [MockFunction],
+      "stop": [MockFunction],
+    }
+  }
 >
   <EuiOutsideClickDetector
     onOutsideClick={[Function]}
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx
index 6b56ad49a23c4..a7b0208ce5b83 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx
@@ -25,6 +25,28 @@ import './query_bar.test.mocks';
 import { QueryBar } from './query_bar';
 import { IndexPattern } from '../../../index';
 
+import { coreMock } from '../../../../../../../core/public/mocks';
+const setupMock = coreMock.createSetup();
+
+setupMock.uiSettings.get.mockImplementation((key: string) => {
+  switch (key) {
+    case 'timepicker:quickRanges':
+      return [
+        {
+          from: 'now/d',
+          to: 'now/d',
+          display: 'Today',
+        },
+      ];
+    case 'dateFormat':
+      return 'YY';
+    case 'history:limit':
+      return 10;
+    default:
+      throw new Error(`Unexpected config key: ${key}`);
+  }
+});
+
 const noop = () => {
   return;
 };
@@ -76,6 +98,7 @@ describe('QueryBar', () => {
   it('Should render the given query', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         query={kqlQuery}
         onSubmit={noop}
         appName={'discover'}
@@ -86,12 +109,14 @@ describe('QueryBar', () => {
       />
     );
 
-    expect(component).toMatchSnapshot();
+    expect(component.find(QUERY_INPUT_SELECTOR).length).toBe(1);
+    expect(component.find(TIMEPICKER_SELECTOR).length).toBe(1);
   });
 
   it('Should create a unique PersistedLog based on the appName and query language', () => {
     shallowWithIntl(
       <QueryBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         query={kqlQuery}
         onSubmit={noop}
         appName={'discover'}
@@ -109,6 +134,7 @@ describe('QueryBar', () => {
   it('Should render only timepicker when no options provided', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         onSubmit={noop}
         appName={'discover'}
         store={createMockStorage()}
@@ -123,6 +149,7 @@ describe('QueryBar', () => {
   it('Should not show timepicker when asked', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         onSubmit={noop}
         appName={'discover'}
         store={createMockStorage()}
@@ -138,6 +165,7 @@ describe('QueryBar', () => {
   it('Should render timepicker with options', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         onSubmit={noop}
         appName={'discover'}
         screenTitle={'Another Screen'}
@@ -156,6 +184,7 @@ describe('QueryBar', () => {
   it('Should render only query input bar', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         query={kqlQuery}
         onSubmit={noop}
         appName={'discover'}
@@ -174,6 +203,7 @@ describe('QueryBar', () => {
   it('Should NOT render query input bar if disabled', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         query={kqlQuery}
         onSubmit={noop}
         appName={'discover'}
@@ -193,6 +223,7 @@ describe('QueryBar', () => {
   it('Should NOT render query input bar if missing options', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         onSubmit={noop}
         appName={'discover'}
         screenTitle={'Another Screen'}
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx
index 19a584e34a978..ab549896b5824 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx
@@ -34,16 +34,14 @@ import { EuiSuperUpdateButton } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { documentationLinks } from 'ui/documentation_links';
 import { Toast, toastNotifications } from 'ui/notify';
-import chrome from 'ui/chrome';
 import { PersistedLog } from 'ui/persisted_log';
+import { UiSettingsClientContract } from 'src/core/public';
 import { IndexPattern } from '../../../index_patterns';
 import { QueryBarInput } from './query_bar_input';
 
 import { getQueryLog } from '../lib/get_query_log';
 import { Query } from '../index';
 
-const config = chrome.getUiSettingsClient();
-
 interface DateRange {
   from: string;
   to: string;
@@ -68,6 +66,7 @@ interface Props {
   showAutoRefreshOnly?: boolean;
   onRefreshChange?: (options: { isPaused: boolean; refreshInterval: number }) => void;
   customSubmitButton?: any;
+  uiSettings: UiSettingsClientContract;
 }
 
 interface State {
@@ -243,13 +242,21 @@ export class QueryBarUI extends Component<Props, State> {
 
   public componentDidMount() {
     if (!this.props.query) return;
-    this.persistedLog = getQueryLog(this.props.appName, this.props.query.language);
+    this.persistedLog = getQueryLog(
+      this.props.uiSettings,
+      this.props.appName,
+      this.props.query.language
+    );
   }
 
   public componentDidUpdate(prevProps: Props) {
     if (!this.props.query || !prevProps.query) return;
     if (prevProps.query.language !== this.props.query.language) {
-      this.persistedLog = getQueryLog(this.props.appName, this.props.query.language);
+      this.persistedLog = getQueryLog(
+        this.props.uiSettings,
+        this.props.appName,
+        this.props.query.language
+      );
     }
   }
 
@@ -281,6 +288,7 @@ export class QueryBarUI extends Component<Props, State> {
           onChange={this.onChange}
           onSubmit={this.onInputSubmit}
           persistedLog={this.persistedLog}
+          uiSettings={this.props.uiSettings}
         />
       </EuiFlexItem>
     );
@@ -332,7 +340,7 @@ export class QueryBarUI extends Component<Props, State> {
         };
       });
 
-    const commonlyUsedRanges = config
+    const commonlyUsedRanges = this.props.uiSettings
       .get('timepicker:quickRanges')
       .map(({ from, to, display }: { from: string; to: string; display: string }) => {
         return {
@@ -354,7 +362,7 @@ export class QueryBarUI extends Component<Props, State> {
           showUpdateButton={false}
           recentlyUsedRanges={recentlyUsedRanges}
           commonlyUsedRanges={commonlyUsedRanges}
-          dateFormat={config.get('dateFormat')}
+          dateFormat={this.props.uiSettings.get('dateFormat')}
           isAutoRefreshOnly={this.props.showAutoRefreshOnly}
         />
       </EuiFlexItem>
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
index b2f308127b0e1..7bdc9a2448363 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
@@ -35,34 +35,6 @@ const mockIndexPattern = {
   ],
 };
 
-const mockChromeFactory = jest.fn(() => {
-  return {
-    getBasePath: () => `foo`,
-    getUiSettingsClient: () => {
-      return {
-        get: (key: string) => {
-          switch (key) {
-            case 'timepicker:quickRanges':
-              return [
-                {
-                  from: 'now/d',
-                  to: 'now/d',
-                  display: 'Today',
-                },
-              ];
-            case 'dateFormat':
-              return 'YY';
-            case 'history:limit':
-              return 10;
-            default:
-              throw new Error(`Unexpected config key: ${key}`);
-          }
-        },
-      };
-    },
-  };
-});
-
 export const mockPersistedLog = {
   add: jest.fn(),
   get: jest.fn(() => ['response:200']),
@@ -81,16 +53,9 @@ export const mockFetchIndexPatterns = jest
   .fn()
   .mockReturnValue(Promise.resolve([mockIndexPattern]));
 
-jest.mock('ui/chrome', () => mockChromeFactory());
-jest.mock('ui/kfetch', () => ({
-  kfetch: () => {},
-}));
 jest.mock('ui/persisted_log', () => ({
   PersistedLog: mockPersistedLogFactory,
 }));
-jest.mock('ui/autocomplete_providers', () => ({
-  getAutocompleteProvider: mockGetAutocompleteProvider,
-}));
 jest.mock('ui/kfetch', () => ({
   kfetch: mockKfetch,
 }));
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
index ff155dfccdac2..d04c6032980ff 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
@@ -28,6 +28,8 @@ import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { QueryLanguageSwitcher } from './language_switcher';
 import { QueryBarInput, QueryBarInputUI } from './query_bar_input';
+import { coreMock } from '../../../../../../../core/public/mocks';
+const setupMock = coreMock.createSetup();
 import { IndexPattern } from '../../../index';
 
 const noop = () => {
@@ -91,6 +93,7 @@ describe('QueryBarInput', () => {
         indexPatterns={[mockIndexPattern]}
         store={createMockStorage()}
         intl={null as any}
+        uiSettings={setupMock.uiSettings}
       />
     );
 
@@ -107,6 +110,7 @@ describe('QueryBarInput', () => {
         indexPatterns={[mockIndexPattern]}
         store={createMockStorage()}
         intl={null as any}
+        uiSettings={setupMock.uiSettings}
       />
     );
 
@@ -124,6 +128,7 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
+        uiSettings={setupMock.uiSettings}
       />
     );
 
@@ -143,6 +148,7 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
+        uiSettings={setupMock.uiSettings}
       />
     );
 
@@ -163,6 +169,7 @@ describe('QueryBarInput', () => {
         store={mockStorage}
         disableAutoFocus={true}
         intl={null as any}
+        uiSettings={setupMock.uiSettings}
       />
     );
 
@@ -187,6 +194,7 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
+        uiSettings={setupMock.uiSettings}
       />
     );
 
@@ -210,6 +218,7 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
+        uiSettings={setupMock.uiSettings}
       />
     );
 
@@ -238,8 +247,9 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
+        uiSettings={setupMock.uiSettings}
       />
     );
-    expect(mockFetchIndexPatterns).toHaveBeenCalledWith(['logstash-*']);
+    expect(mockFetchIndexPatterns).toHaveBeenCalledWith(['logstash-*'], setupMock.uiSettings);
   });
 });
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
index 9bfdc68763721..50628a316209a 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
@@ -30,10 +30,9 @@ import {
 } from 'ui/autocomplete_providers';
 import { debounce, compact, isEqual, omit } from 'lodash';
 import { PersistedLog } from 'ui/persisted_log';
-import chrome from 'ui/chrome';
 import { kfetch } from 'ui/kfetch';
 import { Storage } from 'ui/storage';
-import { localStorage } from 'ui/storage/storage_service';
+import { UiSettingsClientContract } from 'src/core/public';
 import { IndexPattern, StaticIndexPattern } from '../../../index_patterns';
 import { Query } from '../index';
 import { fromUser, matchPairs, toUser } from '../lib';
@@ -43,14 +42,15 @@ import { getQueryLog } from '../lib/get_query_log';
 import { fetchIndexPatterns } from '../lib/fetch_index_patterns';
 
 interface Props {
+  uiSettings: UiSettingsClientContract;
   indexPatterns: Array<IndexPattern | string>;
+  store: Storage;
   intl: InjectedIntl;
   query: Query;
   appName: string;
   disableAutoFocus?: boolean;
   screenTitle?: string;
   prepend?: any;
-  store?: Storage;
   persistedLog?: PersistedLog;
   bubbleSubmitEvent?: boolean;
   languageSwitcherPopoverAnchorPosition?: PopoverAnchorPosition;
@@ -80,7 +80,6 @@ const KEY_CODES = {
   END: 35,
 };
 
-const config = chrome.getUiSettingsClient();
 const recentSearchType: AutocompleteSuggestionType = 'recentSearch';
 
 export class QueryBarInputUI extends Component<Props, State> {
@@ -111,7 +110,10 @@ export class QueryBarInputUI extends Component<Props, State> {
       indexPattern => typeof indexPattern !== 'string'
     ) as IndexPattern[];
 
-    const objectPatternsFromStrings = (await fetchIndexPatterns(stringPatterns)) as IndexPattern[];
+    const objectPatternsFromStrings = (await fetchIndexPatterns(
+      stringPatterns,
+      this.props.uiSettings
+    )) as IndexPattern[];
 
     this.setState({
       indexPatterns: [...objectPatterns, ...objectPatternsFromStrings],
@@ -123,6 +125,7 @@ export class QueryBarInputUI extends Component<Props, State> {
       return;
     }
 
+    const uiSettings = this.props.uiSettings;
     const language = this.props.query.language;
     const queryString = this.getQueryString();
 
@@ -138,7 +141,10 @@ export class QueryBarInputUI extends Component<Props, State> {
     }
 
     const indexPatterns = this.state.indexPatterns;
-    const getAutocompleteSuggestions = autocompleteProvider({ config, indexPatterns });
+    const getAutocompleteSuggestions = autocompleteProvider({
+      config: uiSettings,
+      indexPatterns,
+    });
 
     const { selectionStart, selectionEnd } = this.inputRef;
     if (selectionStart === null || selectionEnd === null) {
@@ -359,11 +365,7 @@ export class QueryBarInputUI extends Component<Props, State> {
       body: JSON.stringify({ opt_in: language === 'kuery' }),
     });
 
-    if (this.props.store) {
-      this.props.store.set('kibana.userQueryLanguage', language);
-    } else {
-      localStorage.set('kibana.userQueryLanguage', language);
-    }
+    this.props.store.set('kibana.userQueryLanguage', language);
 
     const newQuery = { query: '', language };
     this.onChange(newQuery);
@@ -391,7 +393,7 @@ export class QueryBarInputUI extends Component<Props, State> {
   public componentDidMount() {
     this.persistedLog = this.props.persistedLog
       ? this.props.persistedLog
-      : getQueryLog(this.props.appName, this.props.query.language);
+      : getQueryLog(this.props.uiSettings, this.props.appName, this.props.query.language);
 
     this.fetchIndexPatterns().then(this.updateSuggestions);
   }
@@ -399,7 +401,7 @@ export class QueryBarInputUI extends Component<Props, State> {
   public componentDidUpdate(prevProps: Props) {
     this.persistedLog = this.props.persistedLog
       ? this.props.persistedLog
-      : getQueryLog(this.props.appName, this.props.query.language);
+      : getQueryLog(this.props.uiSettings, this.props.appName, this.props.query.language);
 
     if (!isEqual(prevProps.indexPatterns, this.props.indexPatterns)) {
       this.fetchIndexPatterns().then(this.updateSuggestions);
@@ -440,6 +442,7 @@ export class QueryBarInputUI extends Component<Props, State> {
       'languageSwitcherPopoverAnchorPosition',
       'onChange',
       'onSubmit',
+      'uiSettings',
     ]);
 
     return (
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/lib/fetch_index_patterns.ts b/src/legacy/core_plugins/data/public/query/query_bar/lib/fetch_index_patterns.ts
index 3ba621a8f3d3f..5796623e31f53 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/lib/fetch_index_patterns.ts
+++ b/src/legacy/core_plugins/data/public/query/query_bar/lib/fetch_index_patterns.ts
@@ -19,11 +19,13 @@
 
 import chrome from 'ui/chrome';
 import { isEmpty } from 'lodash';
+import { UiSettingsClientContract } from 'src/core/public';
 import { utils as indexPatternUtils } from '../../../index_patterns';
 
-const config = chrome.getUiSettingsClient();
-
-export async function fetchIndexPatterns(indexPatternStrings: string[]) {
+export async function fetchIndexPatterns(
+  indexPatternStrings: string[],
+  uiSettings: UiSettingsClientContract
+) {
   if (!indexPatternStrings || isEmpty(indexPatternStrings)) {
     return [];
   }
@@ -40,15 +42,17 @@ export async function fetchIndexPatterns(indexPatternStrings: string[]) {
     return indexPatternStrings.includes(savedObject.attributes.title as string);
   });
 
+  const defaultIndex = uiSettings.get('defaultIndex');
+
   const allMatches =
     exactMatches.length === indexPatternStrings.length
       ? exactMatches
-      : [...exactMatches, await fetchDefaultIndexPattern()];
+      : [...exactMatches, await fetchDefaultIndexPattern(defaultIndex)];
 
   return allMatches.map(indexPatternUtils.getFromSavedObject);
 }
 
-const fetchDefaultIndexPattern = async () => {
+const fetchDefaultIndexPattern = async (defaultIndex: string) => {
   const savedObjectsClient = chrome.getSavedObjectsClient();
-  return await savedObjectsClient.get('index-pattern', config.get('defaultIndex'));
+  return await savedObjectsClient.get('index-pattern', defaultIndex);
 };
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts b/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
index a3b0fe891ff9f..70dc1d3fe700e 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
+++ b/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
@@ -17,14 +17,16 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
 import { PersistedLog } from 'ui/persisted_log';
+import { UiSettingsClientContract } from 'src/core/public';
 
-const config = chrome.getUiSettingsClient();
-
-export function getQueryLog(appName: string, language: string) {
+export function getQueryLog(
+  uiSettings: UiSettingsClientContract,
+  appName: string,
+  language: string
+) {
   return new PersistedLog(`typeahead:${appName}-${language}`, {
-    maxLength: config.get('history:limit'),
+    maxLength: uiSettings.get('history:limit'),
     filterDuplicates: true,
   });
 }
diff --git a/test/types/index.ts b/src/legacy/core_plugins/data/public/search/index.ts
similarity index 89%
rename from test/types/index.ts
rename to src/legacy/core_plugins/data/public/search/index.ts
index edfaeb5743524..6a9687ba7e325 100644
--- a/test/types/index.ts
+++ b/src/legacy/core_plugins/data/public/search/index.ts
@@ -17,4 +17,6 @@
  * under the License.
  */
 
-export * from './mocha_decorations';
+export { SearchService, SearchSetup } from './search_service';
+
+export * from './search_bar';
diff --git a/src/legacy/core_plugins/kibana_react/public/search_bar/components/index.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/index.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana_react/public/search_bar/components/index.tsx
rename to src/legacy/core_plugins/data/public/search/search_bar/components/index.tsx
diff --git a/src/legacy/core_plugins/kibana_react/public/search_bar/components/search_bar.test.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
similarity index 92%
rename from src/legacy/core_plugins/kibana_react/public/search_bar/components/search_bar.test.tsx
rename to src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
index bd00e35a40491..5026bd04afded 100644
--- a/src/legacy/core_plugins/kibana_react/public/search_bar/components/search_bar.test.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
@@ -22,7 +22,10 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { SearchBar } from './search_bar';
 import { IndexPattern } from 'ui/index_patterns';
 
-jest.mock('../../../../data/public', () => {
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
+const setupMock = coreMock.createSetup();
+
+jest.mock('../../../../../data/public', () => {
   return {
     FilterBar: () => <div className="filterBar"></div>,
     QueryBar: () => <div className="queryBar"></div>,
@@ -80,6 +83,7 @@ describe('SearchBar', () => {
   it('Should render query bar when no options provided (in reality - timepicker)', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -94,6 +98,7 @@ describe('SearchBar', () => {
   it('Should render empty when timepicker is off and no options provided', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -109,6 +114,7 @@ describe('SearchBar', () => {
   it('Should render filter bar, when required fields are provided', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -126,6 +132,7 @@ describe('SearchBar', () => {
   it('Should NOT render filter bar, if disabled', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -144,6 +151,7 @@ describe('SearchBar', () => {
   it('Should render query bar, when required fields are provided', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -162,6 +170,7 @@ describe('SearchBar', () => {
   it('Should NOT render query bar, if disabled', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -181,6 +190,7 @@ describe('SearchBar', () => {
   it('Should render query bar and filter bar', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
+        uiSettings={setupMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
diff --git a/src/legacy/core_plugins/kibana_react/public/search_bar/components/search_bar.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
similarity index 92%
rename from src/legacy/core_plugins/kibana_react/public/search_bar/components/search_bar.tsx
rename to src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
index 480a5a73093ac..57d7afa439e05 100644
--- a/src/legacy/core_plugins/kibana_react/public/search_bar/components/search_bar.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
@@ -27,7 +27,8 @@ import React, { Component } from 'react';
 import ResizeObserver from 'resize-observer-polyfill';
 import { Storage } from 'ui/storage';
 
-import { IndexPattern, Query, QueryBar, FilterBar } from '../../../../data/public';
+import { UiSettingsClientContract } from 'src/core/public';
+import { IndexPattern, Query, QueryBar, FilterBar } from '../../../../../data/public';
 
 interface DateRange {
   from: string;
@@ -41,6 +42,7 @@ interface DateRange {
 export interface SearchBarProps {
   appName: string;
   intl: InjectedIntl;
+  uiSettings: UiSettingsClientContract;
   indexPatterns?: IndexPattern[];
   // Query bar
   showQueryBar?: boolean;
@@ -111,7 +113,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
     const filterCount = this.getFilterLength();
     const filtersAppliedText = this.props.intl.formatMessage(
       {
-        id: 'kibana_react.search.searchBar.filtersButtonFiltersAppliedTitle',
+        id: 'data.search.searchBar.searchBar.filtersButtonFiltersAppliedTitle',
         defaultMessage:
           '{filterCount} {filterCount, plural, one {filter} other {filters}} applied.',
       },
@@ -121,11 +123,11 @@ class SearchBarUI extends Component<SearchBarProps, State> {
     );
     const clickToShowOrHideText = this.state.isFiltersVisible
       ? this.props.intl.formatMessage({
-          id: 'kibana_react.search.searchBar.filtersButtonClickToShowTitle',
+          id: 'data.search.searchBar.searchBar.filtersButtonClickToShowTitle',
           defaultMessage: 'Select to hide',
         })
       : this.props.intl.formatMessage({
-          id: 'kibana_react.search.searchBar.filtersButtonClickToHideTitle',
+          id: 'data.search.searchBar.searchBar.filtersButtonClickToHideTitle',
           defaultMessage: 'Select to show',
         });
 
@@ -139,7 +141,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
         aria-expanded={!!this.state.isFiltersVisible}
         title={`${filterCount ? filtersAppliedText : ''} ${clickToShowOrHideText}`}
       >
-        {i18n.translate('kibana_react.search.searchBar.filtersButtonLabel', {
+        {i18n.translate('data.search.searchBar.searchBar.filtersButtonLabel', {
           defaultMessage: 'Filters',
           description: 'The noun "filter" in plural.',
         })}
@@ -183,10 +185,15 @@ class SearchBarUI extends Component<SearchBarProps, State> {
   }
 
   public render() {
+    if (!this.props.uiSettings) {
+      return null;
+    }
+
     let queryBar;
     if (this.shouldRenderQueryBar()) {
       queryBar = (
         <QueryBar
+          uiSettings={this.props.uiSettings}
           query={this.props.query}
           screenTitle={this.props.screenTitle}
           onSubmit={this.props.onQuerySubmit!}
@@ -226,6 +233,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
           >
             <FilterBar
               className="globalFilterGroup__filterBar"
+              uiSettings={this.props.uiSettings}
               filters={this.props.filters!}
               onFiltersUpdated={this.getFilterUpdateFunction()}
               indexPatterns={this.props.indexPatterns!}
diff --git a/src/legacy/core_plugins/kibana_react/public/search_bar/index.tsx b/src/legacy/core_plugins/data/public/search/search_bar/index.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana_react/public/search_bar/index.tsx
rename to src/legacy/core_plugins/data/public/search/search_bar/index.tsx
diff --git a/src/legacy/core_plugins/data/public/search/search_service.ts b/src/legacy/core_plugins/data/public/search/search_service.ts
new file mode 100644
index 0000000000000..efebe89180ced
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_service.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.
+ */
+
+/**
+ * Search Service
+ * @internal
+ */
+
+export class SearchService {
+  public setup() {
+    return {};
+  }
+
+  public stop() {}
+}
+
+/** @public */
+
+export type SearchSetup = ReturnType<SearchService['setup']>;
diff --git a/src/legacy/core_plugins/data/public/shim/legacy_module.ts b/src/legacy/core_plugins/data/public/shim/legacy_module.ts
index 46849196e9707..aab4eb296ec56 100644
--- a/src/legacy/core_plugins/data/public/shim/legacy_module.ts
+++ b/src/legacy/core_plugins/data/public/shim/legacy_module.ts
@@ -24,24 +24,55 @@ import { Filter } from '@kbn/es-query';
 
 // @ts-ignore
 import { uiModules } from 'ui/modules';
+import { npSetup } from 'ui/new_platform';
 import { IndexPatterns } from 'src/legacy/core_plugins/data/public';
 import { FilterBar, ApplyFiltersPopover } from '../filter';
 import template from './apply_filter_directive.html';
 
 // @ts-ignore
 import { mapAndFlattenFilters } from '../filter/filter_manager/lib/map_and_flatten_filters';
-// @ts-ignore
 
 /** @internal */
 export const initLegacyModule = once((): void => {
   uiModules
-    .get('app/kibana')
-    .directive('filterBar', (reactDirective: any) => {
-      return reactDirective(wrapInI18nContext(FilterBar));
+    .get('app/kibana', ['react'])
+    .directive('filterBar', () => {
+      return {
+        restrict: 'E',
+        template: '',
+        compile: (elem: any) => {
+          const child = document.createElement('filter-bar-helper');
+
+          // Copy attributes to the child directive
+          for (const attr of elem[0].attributes) {
+            child.setAttribute(attr.name, attr.value);
+          }
+
+          child.setAttribute('ui-settings', 'uiSettings');
+
+          // Append helper directive
+          elem.append(child);
+
+          const linkFn = ($scope: any) => {
+            $scope.uiSettings = npSetup.core.uiSettings;
+          };
+
+          return linkFn;
+        },
+      };
     })
-    .directive('applyFiltersPopoverComponent', (reactDirective: any) => {
-      return reactDirective(wrapInI18nContext(ApplyFiltersPopover));
+    .directive('filterBarHelper', (reactDirective: any) => {
+      return reactDirective(wrapInI18nContext(FilterBar), [
+        ['uiSettings', { watchDepth: 'reference' }],
+        ['onFiltersUpdated', { watchDepth: 'reference' }],
+        ['indexPatterns', { watchDepth: 'collection' }],
+        ['filters', { watchDepth: 'collection' }],
+        ['className', { watchDepth: 'reference' }],
+      ]);
     })
+    .directive('applyFiltersPopoverComponent', (reactDirective: any) =>
+      reactDirective(wrapInI18nContext(ApplyFiltersPopover))
+    )
     .directive('applyFiltersPopover', (indexPatterns: IndexPatterns) => {
       return {
         template,
@@ -57,13 +88,12 @@ export const initLegacyModule = once((): void => {
           // Each time the new filters change we want to rebuild (not just re-render) the "apply filters"
           // popover, because it has to reset its state whenever the new filters change. Setting a `key`
           // property on the component accomplishes this due to how React handles the `key` property.
-          $scope.$watch('filters', (filters: any) => {
-            mapAndFlattenFilters(indexPatterns, filters).then((mappedFilters: Filter[]) => {
-              $scope.state = {
-                filters: mappedFilters,
-                key: Date.now(),
-              };
-            });
+          $scope.$watch('filters', async (filters: any) => {
+            const mappedFilters: Filter[] = await mapAndFlattenFilters(indexPatterns, filters);
+            $scope.state = {
+              filters: mappedFilters,
+              key: Date.now(),
+            };
           });
         },
       };
diff --git a/src/legacy/core_plugins/embeddable_api/public/ui_capabilities.test.mocks.ts b/src/legacy/core_plugins/embeddable_api/public/ui_capabilities.test.mocks.ts
index b7e4a12fac247..69163522c2d99 100644
--- a/src/legacy/core_plugins/embeddable_api/public/ui_capabilities.test.mocks.ts
+++ b/src/legacy/core_plugins/embeddable_api/public/ui_capabilities.test.mocks.ts
@@ -24,3 +24,5 @@ jest.doMock('ui/capabilities', () => ({
     },
   },
 }));
+
+jest.mock('ui/new_platform');
diff --git a/src/legacy/core_plugins/inspector_views/public/data/__snapshots__/data_view.test.js.snap b/src/legacy/core_plugins/inspector_views/public/data/__snapshots__/data_view.test.js.snap
index dc1f6c17c93e4..11180877e04ab 100644
--- a/src/legacy/core_plugins/inspector_views/public/data/__snapshots__/data_view.test.js.snap
+++ b/src/legacy/core_plugins/inspector_views/public/data/__snapshots__/data_view.test.js.snap
@@ -119,93 +119,77 @@ exports[`Inspector Data View component should render empty state 1`] = `
   }
   title="Test Data"
 >
-  <InspectorView
-    useFlex={true}
+  <EuiEmptyPrompt
+    body={
+      <React.Fragment>
+        <p>
+          <FormattedMessage
+            defaultMessage="The element did not provide any data."
+            id="inspectorViews.data.noDataAvailableDescription"
+            values={Object {}}
+          />
+        </p>
+      </React.Fragment>
+    }
+    iconColor="subdued"
+    title={
+      <h2>
+        <FormattedMessage
+          defaultMessage="No data available"
+          id="inspectorViews.data.noDataAvailableTitle"
+          values={Object {}}
+        />
+      </h2>
+    }
   >
-    <EuiFlyoutBody
-      className="kbnInspectorView--flex"
+    <div
+      className="euiEmptyPrompt"
     >
-      <div
-        className="euiFlyoutBody kbnInspectorView--flex"
+      <EuiTextColor
+        color="subdued"
       >
-        <div
-          className="euiFlyoutBody__overflow"
+        <span
+          className="euiTextColor euiTextColor--subdued"
         >
-          <EuiEmptyPrompt
-            body={
-              <React.Fragment>
-                <p>
-                  <FormattedMessage
-                    defaultMessage="The element did not provide any data."
-                    id="inspectorViews.data.noDataAvailableDescription"
-                    values={Object {}}
-                  />
-                </p>
-              </React.Fragment>
-            }
-            iconColor="subdued"
-            title={
-              <h2>
-                <FormattedMessage
-                  defaultMessage="No data available"
-                  id="inspectorViews.data.noDataAvailableTitle"
-                  values={Object {}}
-                />
-              </h2>
-            }
+          <EuiTitle>
+            <h2
+              className="euiTitle euiTitle--medium"
+            >
+              <FormattedMessage
+                defaultMessage="No data available"
+                id="inspectorViews.data.noDataAvailableTitle"
+                values={Object {}}
+              >
+                No data available
+              </FormattedMessage>
+            </h2>
+          </EuiTitle>
+          <EuiSpacer
+            size="m"
           >
             <div
-              className="euiEmptyPrompt"
+              className="euiSpacer euiSpacer--m"
+            />
+          </EuiSpacer>
+          <EuiText>
+            <div
+              className="euiText euiText--medium"
             >
-              <EuiTextColor
-                color="subdued"
-              >
-                <span
-                  className="euiTextColor euiTextColor--subdued"
+              <p>
+                <FormattedMessage
+                  defaultMessage="The element did not provide any data."
+                  id="inspectorViews.data.noDataAvailableDescription"
+                  values={Object {}}
                 >
-                  <EuiTitle>
-                    <h2
-                      className="euiTitle euiTitle--medium"
-                    >
-                      <FormattedMessage
-                        defaultMessage="No data available"
-                        id="inspectorViews.data.noDataAvailableTitle"
-                        values={Object {}}
-                      >
-                        No data available
-                      </FormattedMessage>
-                    </h2>
-                  </EuiTitle>
-                  <EuiSpacer
-                    size="m"
-                  >
-                    <div
-                      className="euiSpacer euiSpacer--m"
-                    />
-                  </EuiSpacer>
-                  <EuiText>
-                    <div
-                      className="euiText euiText--medium"
-                    >
-                      <p>
-                        <FormattedMessage
-                          defaultMessage="The element did not provide any data."
-                          id="inspectorViews.data.noDataAvailableDescription"
-                          values={Object {}}
-                        >
-                          The element did not provide any data.
-                        </FormattedMessage>
-                      </p>
-                    </div>
-                  </EuiText>
-                </span>
-              </EuiTextColor>
+                  The element did not provide any data.
+                </FormattedMessage>
+              </p>
             </div>
-          </EuiEmptyPrompt>
-        </div>
-      </div>
-    </EuiFlyoutBody>
-  </InspectorView>
+          </EuiText>
+        </span>
+      </EuiTextColor>
+    </div>
+  </EuiEmptyPrompt>
 </DataViewComponent>
 `;
 
@@ -328,91 +312,85 @@ exports[`Inspector Data View component should render loading state 1`] = `
   }
   title="Test Data"
 >
-  <InspectorView
-    useFlex={true}
+  <EuiFlexGroup
+    alignItems="center"
+    justifyContent="center"
+    style={
+      Object {
+        "height": "100%",
+      }
+    }
   >
-    <EuiFlyoutBody
-      className="kbnInspectorView--flex"
+    <div
+      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+      style={
+        Object {
+          "height": "100%",
+        }
+      }
     >
-      <div
-        className="euiFlyoutBody kbnInspectorView--flex"
+      <EuiFlexItem
+        grow={false}
       >
         <div
-          className="euiFlyoutBody__overflow"
+          className="euiFlexItem euiFlexItem--flexGrowZero"
         >
-          <EuiFlexGroup
-            alignItems="center"
-            justifyContent="center"
+          <EuiPanel
+            className="eui-textCenter"
+            grow={true}
+            hasShadow={false}
+            paddingSize="m"
           >
             <div
-              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+              className="euiPanel euiPanel--paddingMedium eui-textCenter"
             >
-              <EuiFlexItem
-                grow={false}
+              <EuiLoadingChart
+                size="m"
+              >
+                <span
+                  className="euiLoadingChart euiLoadingChart--medium"
+                >
+                  <span
+                    className="euiLoadingChart__bar"
+                  />
+                  <span
+                    className="euiLoadingChart__bar"
+                  />
+                  <span
+                    className="euiLoadingChart__bar"
+                  />
+                  <span
+                    className="euiLoadingChart__bar"
+                  />
+                </span>
+              </EuiLoadingChart>
+              <EuiSpacer
+                size="s"
               >
                 <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                  className="euiSpacer euiSpacer--s"
+                />
+              </EuiSpacer>
+              <EuiText>
+                <div
+                  className="euiText euiText--medium"
                 >
-                  <EuiPanel
-                    className="eui-textCenter"
-                    grow={true}
-                    hasShadow={false}
-                    paddingSize="m"
-                  >
-                    <div
-                      className="euiPanel euiPanel--paddingMedium eui-textCenter"
+                  <p>
+                    <FormattedMessage
+                      defaultMessage="Gathering data"
+                      id="inspectorViews.data.gatheringDataLabel"
+                      values={Object {}}
                     >
-                      <EuiLoadingChart
-                        size="m"
-                      >
-                        <span
-                          className="euiLoadingChart euiLoadingChart--medium"
-                        >
-                          <span
-                            className="euiLoadingChart__bar"
-                          />
-                          <span
-                            className="euiLoadingChart__bar"
-                          />
-                          <span
-                            className="euiLoadingChart__bar"
-                          />
-                          <span
-                            className="euiLoadingChart__bar"
-                          />
-                        </span>
-                      </EuiLoadingChart>
-                      <EuiSpacer
-                        size="s"
-                      >
-                        <div
-                          className="euiSpacer euiSpacer--s"
-                        />
-                      </EuiSpacer>
-                      <EuiText>
-                        <div
-                          className="euiText euiText--medium"
-                        >
-                          <p>
-                            <FormattedMessage
-                              defaultMessage="Gathering data"
-                              id="inspectorViews.data.gatheringDataLabel"
-                              values={Object {}}
-                            >
-                              Gathering data
-                            </FormattedMessage>
-                          </p>
-                        </div>
-                      </EuiText>
-                    </div>
-                  </EuiPanel>
+                      Gathering data
+                    </FormattedMessage>
+                  </p>
                 </div>
-              </EuiFlexItem>
+              </EuiText>
             </div>
-          </EuiFlexGroup>
+          </EuiPanel>
         </div>
-      </div>
-    </EuiFlyoutBody>
-  </InspectorView>
+      </EuiFlexItem>
+    </div>
+  </EuiFlexGroup>
 </DataViewComponent>
 `;
diff --git a/src/legacy/core_plugins/inspector_views/public/data/data_view.js b/src/legacy/core_plugins/inspector_views/public/data/data_view.js
index 32c340f110fc1..265e4dde29636 100644
--- a/src/legacy/core_plugins/inspector_views/public/data/data_view.js
+++ b/src/legacy/core_plugins/inspector_views/public/data/data_view.js
@@ -29,8 +29,6 @@ import {
   EuiText,
 } from '@elastic/eui';
 
-import { InspectorView } from 'ui/inspector';
-
 import {
   DataTableFormat,
 } from './data_table';
@@ -102,54 +100,51 @@ class DataViewComponent extends Component {
 
   renderNoData() {
     return (
-      <InspectorView useFlex={true}>
-        <EuiEmptyPrompt
-          title={
-            <h2>
+      <EuiEmptyPrompt
+        title={
+          <h2>
+            <FormattedMessage
+              id="inspectorViews.data.noDataAvailableTitle"
+              defaultMessage="No data available"
+            />
+          </h2>
+        }
+        body={
+          <React.Fragment>
+            <p>
               <FormattedMessage
-                id="inspectorViews.data.noDataAvailableTitle"
-                defaultMessage="No data available"
+                id="inspectorViews.data.noDataAvailableDescription"
+                defaultMessage="The element did not provide any data."
               />
-            </h2>
-          }
-          body={
-            <React.Fragment>
-              <p>
-                <FormattedMessage
-                  id="inspectorViews.data.noDataAvailableDescription"
-                  defaultMessage="The element did not provide any data."
-                />
-              </p>
-            </React.Fragment>
-          }
-        />
-      </InspectorView>
+            </p>
+          </React.Fragment>
+        }
+      />
     );
   }
 
   renderLoading() {
     return (
-      <InspectorView useFlex={true}>
-        <EuiFlexGroup
-          justifyContent="center"
-          alignItems="center"
-        >
-          <EuiFlexItem grow={false}>
-            <EuiPanel className="eui-textCenter">
-              <EuiLoadingChart size="m" />
-              <EuiSpacer size="s" />
-              <EuiText>
-                <p>
-                  <FormattedMessage
-                    id="inspectorViews.data.gatheringDataLabel"
-                    defaultMessage="Gathering data"
-                  />
-                </p>
-              </EuiText>
-            </EuiPanel>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </InspectorView>
+      <EuiFlexGroup
+        justifyContent="center"
+        alignItems="center"
+        style={{ height: '100%' }}
+      >
+        <EuiFlexItem grow={false}>
+          <EuiPanel className="eui-textCenter">
+            <EuiLoadingChart size="m" />
+            <EuiSpacer size="s" />
+            <EuiText>
+              <p>
+                <FormattedMessage
+                  id="inspectorViews.data.gatheringDataLabel"
+                  defaultMessage="Gathering data"
+                />
+              </p>
+            </EuiText>
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGroup>
     );
   }
 
@@ -161,13 +156,11 @@ class DataViewComponent extends Component {
     }
 
     return (
-      <InspectorView>
-        <DataTableFormat
-          data={this.state.tabularData}
-          isFormatted={this.state.tabularOptions.returnsFormattedValues}
-          exportTitle={this.props.title}
-        />
-      </InspectorView>
+      <DataTableFormat
+        data={this.state.tabularData}
+        isFormatted={this.state.tabularOptions.returnsFormattedValues}
+        exportTitle={this.props.title}
+      />
     );
   }
 }
diff --git a/src/legacy/core_plugins/inspector_views/public/data/data_view.test.js b/src/legacy/core_plugins/inspector_views/public/data/data_view.test.js
index 29d536d60e83e..c616a7504d3e9 100644
--- a/src/legacy/core_plugins/inspector_views/public/data/data_view.test.js
+++ b/src/legacy/core_plugins/inspector_views/public/data/data_view.test.js
@@ -22,6 +22,7 @@ import { DataView } from './data_view';
 import { DataAdapter } from 'ui/inspector/adapters';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
+jest.mock('ui/new_platform');
 jest.mock('./lib/export_csv', () => ({
   exportAsCsv: jest.fn(),
 }));
diff --git a/src/legacy/core_plugins/inspector_views/public/requests/requests_view.js b/src/legacy/core_plugins/inspector_views/public/requests/requests_view.js
index 2ce47f62ef956..a949b2ebe6ea1 100644
--- a/src/legacy/core_plugins/inspector_views/public/requests/requests_view.js
+++ b/src/legacy/core_plugins/inspector_views/public/requests/requests_view.js
@@ -26,7 +26,6 @@ import {
   EuiTextColor,
 } from '@elastic/eui';
 
-import { InspectorView } from 'ui/inspector';
 import { RequestStatus } from 'ui/inspector/adapters';
 
 import { RequestSelector } from './request_selector';
@@ -68,36 +67,34 @@ class RequestsViewComponent extends Component {
 
   renderEmptyRequests() {
     return (
-      <InspectorView useFlex={true}>
-        <EuiEmptyPrompt
-          data-test-subj="inspectorNoRequestsMessage"
-          title={
-            <h2>
+      <EuiEmptyPrompt
+        data-test-subj="inspectorNoRequestsMessage"
+        title={
+          <h2>
+            <FormattedMessage
+              id="inspectorViews.requests.noRequestsLoggedTitle"
+              defaultMessage="No requests logged"
+            />
+          </h2>
+        }
+        body={
+          <React.Fragment>
+            <p>
               <FormattedMessage
-                id="inspectorViews.requests.noRequestsLoggedTitle"
-                defaultMessage="No requests logged"
+                id="inspectorViews.requests.noRequestsLoggedDescription.elementHasNotLoggedAnyRequestsText"
+                defaultMessage="The element hasn't logged any requests (yet)."
               />
-            </h2>
-          }
-          body={
-            <React.Fragment>
-              <p>
-                <FormattedMessage
-                  id="inspectorViews.requests.noRequestsLoggedDescription.elementHasNotLoggedAnyRequestsText"
-                  defaultMessage="The element hasn't logged any requests (yet)."
-                />
-              </p>
-              <p>
-                <FormattedMessage
-                  id="inspectorViews.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText"
-                  defaultMessage="This usually means that there was no need to fetch any data or
-                    that the element has not yet started fetching data."
-                />
-              </p>
-            </React.Fragment>
-          }
-        />
-      </InspectorView>
+            </p>
+            <p>
+              <FormattedMessage
+                id="inspectorViews.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText"
+                defaultMessage="This usually means that there was no need to fetch any data or
+                  that the element has not yet started fetching data."
+              />
+            </p>
+          </React.Fragment>
+        }
+      />
     );
   }
 
@@ -111,7 +108,7 @@ class RequestsViewComponent extends Component {
     ).length;
 
     return (
-      <InspectorView>
+      <>
         <EuiText size="xs">
           <p role="status" aria-live="polite" aria-atomic="true">
             <FormattedMessage
@@ -152,7 +149,7 @@ class RequestsViewComponent extends Component {
             request={this.state.request}
           />
         }
-      </InspectorView>
+      </>
     );
   }
 }
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
index f18a1b29f7181..2c9c6ca65a92e 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
@@ -34,6 +34,8 @@ jest.mock(
   { virtual: true }
 );
 
+jest.mock('ui/new_platform');
+
 import { migratePanelsTo730 } from './migrate_to_730_panels';
 import { SavedDashboardPanelTo60, SavedDashboardPanel730ToLatest } from '../types';
 import {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_core.test.mocks.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_core.test.mocks.ts
index fff5aeab599ea..e1d9cfac95268 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_core.test.mocks.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_core.test.mocks.ts
@@ -17,35 +17,11 @@
  * under the License.
  */
 
-import { fatalErrorsServiceMock, notificationServiceMock } from '../../../../../core/public/mocks';
-
 let modalContents: React.Component;
 
 export const getModalContents = () => modalContents;
 
-jest.doMock('ui/new_platform', () => {
-  return {
-    npStart: {
-      core: {
-        overlays: {
-          openFlyout: jest.fn(),
-          openModal: (component: React.Component) => {
-            modalContents = component;
-            return {
-              close: jest.fn(),
-            };
-          },
-        },
-      },
-    },
-    npSetup: {
-      core: {
-        fatalErrors: fatalErrorsServiceMock.createSetupContract(),
-        notifications: notificationServiceMock.createSetupContract(),
-      },
-    },
-  };
-});
+jest.mock('ui/new_platform');
 
 jest.doMock('ui/metadata', () => ({
   metadata: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js b/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js
index 4711fb1edb018..377fd72e9c771 100644
--- a/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js
@@ -554,8 +554,8 @@ function discoverController(
         $scope.$watchCollection('state.sort', function (sort) {
           if (!sort) return;
 
-          // get the current sort from {key: val} to ["key", "val"];
-          const currentSort = _.pairs($scope.searchSource.getField('sort')).pop();
+          // get the current sort from searchSource as array of arrays
+          const currentSort = getSort.array($scope.searchSource.getField('sort'), $scope.indexPattern);
 
           // if the searchSource doesn't know, tell it so
           if (!angular.equals(sort, currentSort)) $scope.fetch();
@@ -862,8 +862,8 @@ function discoverController(
       .setField('filter', queryFilter.getFilters());
   });
 
-  $scope.setSortOrder = function setSortOrder(columnName, direction) {
-    $scope.state.sort = [columnName, direction];
+  $scope.setSortOrder = function setSortOrder(sortPair) {
+    $scope.state.sort = sortPair;
   };
 
   // TODO: On array fields, negating does not negate the combination, rather all terms
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/lib/get_sort.js
index bec26d38d0fa7..b8b962b9f92d7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/lib/get_sort.js
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/lib/get_sort.js
@@ -23,7 +23,7 @@ import ngMock from 'ng_mock';
 import { getSort } from '../../lib/get_sort';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
-const defaultSort = { time: 'desc' };
+const defaultSort = [{ time: 'desc' }];
 let indexPattern;
 
 describe('docTable', function () {
@@ -38,11 +38,11 @@ describe('docTable', function () {
       expect(getSort).to.be.a(Function);
     });
 
-    it('should return an object if passed a 2 item array', function () {
-      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({ bytes: 'desc' });
+    it('should return an array of objects if passed a 2 item array', function () {
+      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql([{ bytes: 'desc' }]);
 
       delete indexPattern.timeFieldName;
-      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({ bytes: 'desc' });
+      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql([{ bytes: 'desc' }]);
     });
 
     it('should sort by the default when passed an unsortable field', function () {
@@ -50,7 +50,7 @@ describe('docTable', function () {
       expect(getSort(['lol_nope', 'asc'], indexPattern)).to.eql(defaultSort);
 
       delete indexPattern.timeFieldName;
-      expect(getSort(['non-sortable', 'asc'], indexPattern)).to.eql({ _score: 'desc' });
+      expect(getSort(['non-sortable', 'asc'], indexPattern)).to.eql([{ _score: 'desc' }]);
     });
 
     it('should sort in reverse chrono order otherwise on time based patterns', function () {
@@ -62,9 +62,9 @@ describe('docTable', function () {
     it('should sort by score on non-time patterns', function () {
       delete indexPattern.timeFieldName;
 
-      expect(getSort([], indexPattern)).to.eql({ _score: 'desc' });
-      expect(getSort(['foo'], indexPattern)).to.eql({ _score: 'desc' });
-      expect(getSort({ foo: 'bar' }, indexPattern)).to.eql({ _score: 'desc' });
+      expect(getSort([], indexPattern)).to.eql([{ _score: 'desc' }]);
+      expect(getSort(['foo'], indexPattern)).to.eql([{ _score: 'desc' }]);
+      expect(getSort({ foo: 'bar' }, indexPattern)).to.eql([{ _score: 'desc' }]);
     });
   });
 
@@ -73,8 +73,8 @@ describe('docTable', function () {
       expect(getSort.array).to.be.a(Function);
     });
 
-    it('should return an array for sortable fields', function () {
-      expect(getSort.array(['bytes', 'desc'], indexPattern)).to.eql([ 'bytes', 'desc' ]);
+    it('should return an array of arrays for sortable fields', function () {
+      expect(getSort.array(['bytes', 'desc'], indexPattern)).to.eql([[ 'bytes', 'desc' ]]);
     });
   });
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
index 689ec97154a15..3860a03d52716 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
@@ -19,7 +19,6 @@ exports[`TableHeader with time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-time-tt"
           aria-label="Sort time descending"
           class="fa fa-sort-up"
           data-test-subj="docTableHeaderFieldSort_time"
@@ -38,7 +37,6 @@ exports[`TableHeader with time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-first-tt"
           aria-label="Remove first column"
           class="fa fa-remove kbnDocTableHeader__move"
           data-test-subj="docTableRemoveHeader-first"
@@ -48,7 +46,6 @@ exports[`TableHeader with time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-first-tt"
           aria-label="Move first column to the right"
           class="fa fa-angle-double-right kbnDocTableHeader__move"
           data-test-subj="docTableMoveRightHeader-first"
@@ -67,7 +64,6 @@ exports[`TableHeader with time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-middle-tt"
           aria-label="Remove middle column"
           class="fa fa-remove kbnDocTableHeader__move"
           data-test-subj="docTableRemoveHeader-middle"
@@ -77,7 +73,6 @@ exports[`TableHeader with time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-middle-tt"
           aria-label="Move middle column to the left"
           class="fa fa-angle-double-left kbnDocTableHeader__move"
           data-test-subj="docTableMoveLeftHeader-middle"
@@ -87,7 +82,6 @@ exports[`TableHeader with time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-middle-tt"
           aria-label="Move middle column to the right"
           class="fa fa-angle-double-right kbnDocTableHeader__move"
           data-test-subj="docTableMoveRightHeader-middle"
@@ -106,7 +100,6 @@ exports[`TableHeader with time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-last-tt"
           aria-label="Remove last column"
           class="fa fa-remove kbnDocTableHeader__move"
           data-test-subj="docTableRemoveHeader-last"
@@ -116,7 +109,6 @@ exports[`TableHeader with time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-last-tt"
           aria-label="Move last column to the left"
           class="fa fa-angle-double-left kbnDocTableHeader__move"
           data-test-subj="docTableMoveLeftHeader-last"
@@ -146,7 +138,6 @@ exports[`TableHeader without time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-first-tt"
           aria-label="Remove first column"
           class="fa fa-remove kbnDocTableHeader__move"
           data-test-subj="docTableRemoveHeader-first"
@@ -156,7 +147,6 @@ exports[`TableHeader without time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-first-tt"
           aria-label="Move first column to the right"
           class="fa fa-angle-double-right kbnDocTableHeader__move"
           data-test-subj="docTableMoveRightHeader-first"
@@ -175,7 +165,6 @@ exports[`TableHeader without time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-middle-tt"
           aria-label="Remove middle column"
           class="fa fa-remove kbnDocTableHeader__move"
           data-test-subj="docTableRemoveHeader-middle"
@@ -185,7 +174,6 @@ exports[`TableHeader without time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-middle-tt"
           aria-label="Move middle column to the left"
           class="fa fa-angle-double-left kbnDocTableHeader__move"
           data-test-subj="docTableMoveLeftHeader-middle"
@@ -195,7 +183,6 @@ exports[`TableHeader without time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-middle-tt"
           aria-label="Move middle column to the right"
           class="fa fa-angle-double-right kbnDocTableHeader__move"
           data-test-subj="docTableMoveRightHeader-middle"
@@ -214,7 +201,6 @@ exports[`TableHeader without time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-last-tt"
           aria-label="Remove last column"
           class="fa fa-remove kbnDocTableHeader__move"
           data-test-subj="docTableRemoveHeader-last"
@@ -224,7 +210,6 @@ exports[`TableHeader without time column renders correctly 1`] = `
         class="euiToolTipAnchor"
       >
         <button
-          aria-describedby="docTableHeader-last-tt"
           aria-label="Move last column to the left"
           class="fa fa-angle-double-left kbnDocTableHeader__move"
           data-test-subj="docTableMoveLeftHeader-last"
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.test.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.test.tsx
index c294d43e4ff4b..ea2c65b1b8487 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.test.tsx
@@ -59,7 +59,7 @@ function getMockProps(props = {}) {
     indexPattern: getMockIndexPattern(),
     hideTimeColumn: false,
     columns: ['first', 'middle', 'last'],
-    sortOrder: ['time', 'asc'] as SortOrder,
+    sortOrder: [['time', 'asc']] as SortOrder[],
     isShortDots: true,
     onRemoveColumn: jest.fn(),
     onChangeSortOrder: jest.fn(),
@@ -89,7 +89,7 @@ describe('TableHeader with time column', () => {
 
   test('time column is sortable with button, cycling sort direction', () => {
     findTestSubject(wrapper, 'docTableHeaderFieldSort_time').simulate('click');
-    expect(props.onChangeSortOrder).toHaveBeenCalledWith('time', 'desc');
+    expect(props.onChangeSortOrder).toHaveBeenCalledWith([['time', 'desc']]);
   });
 
   test('time column is not removeable, no button displayed', () => {
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.tsx
index f67f3babe2b42..abc8077afb669 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.tsx
@@ -28,10 +28,10 @@ interface Props {
   hideTimeColumn: boolean;
   indexPattern: IndexPattern;
   isShortDots: boolean;
-  onChangeSortOrder?: (name: string, direction: 'asc' | 'desc') => void;
+  onChangeSortOrder?: (sortOrder: SortOrder[]) => void;
   onMoveColumn?: (name: string, index: number) => void;
   onRemoveColumn?: (name: string) => void;
-  sortOrder: SortOrder;
+  sortOrder: SortOrder[];
 }
 
 export function TableHeader({
@@ -45,7 +45,6 @@ export function TableHeader({
   sortOrder,
 }: Props) {
   const displayedColumns = getDisplayedColumns(columns, indexPattern, hideTimeColumn, isShortDots);
-  const [currColumnName, currDirection = 'asc'] = sortOrder;
 
   return (
     <tr data-test-subj="docTableHeader" className="kbnDocTableHeader">
@@ -55,7 +54,7 @@ export function TableHeader({
           <TableHeaderColumn
             key={col.name}
             {...col}
-            sortDirection={col.name === currColumnName ? currDirection : ''}
+            sortOrder={sortOrder}
             onMoveColumn={onMoveColumn}
             onRemoveColumn={onRemoveColumn}
             onChangeSortOrder={onChangeSortOrder}
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header_column.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header_column.tsx
index e796789ee9361..87d0482053188 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header_column.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header_column.tsx
@@ -22,6 +22,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiToolTip } from '@elastic/eui';
 // @ts-ignore
 import { shortenDottedString } from '../../../../../common/utils/shorten_dotted_string';
+import { SortOrder } from './helpers';
 
 interface Props {
   colLeftIdx: number; // idx of the column to the left, -1 if moving is not possible
@@ -30,12 +31,18 @@ interface Props {
   isRemoveable: boolean;
   isSortable: boolean;
   name: string;
-  onChangeSortOrder?: (name: string, direction: 'asc' | 'desc') => void;
+  onChangeSortOrder?: (sortOrder: SortOrder[]) => void;
   onMoveColumn?: (name: string, idx: number) => void;
   onRemoveColumn?: (name: string) => void;
-  sortDirection: 'asc' | 'desc' | ''; // asc|desc -> field is sorted in this direction, else ''
+  sortOrder: SortOrder[];
 }
 
+const sortDirectionToIcon = {
+  desc: 'fa fa-sort-down',
+  asc: 'fa fa-sort-up',
+  '': 'fa fa-sort',
+};
+
 export function TableHeaderColumn({
   colLeftIdx,
   colRightIdx,
@@ -46,43 +53,78 @@ export function TableHeaderColumn({
   onChangeSortOrder,
   onMoveColumn,
   onRemoveColumn,
-  sortDirection,
+  sortOrder,
 }: Props) {
-  const btnSortIcon = sortDirection === 'desc' ? 'fa fa-sort-down' : 'fa fa-sort-up';
+  const [, sortDirection = ''] = sortOrder.find(sortPair => name === sortPair[0]) || [];
+  const currentSortWithoutColumn = sortOrder.filter(pair => pair[0] !== name);
+  const currentColumnSort = sortOrder.find(pair => pair[0] === name);
+  const currentColumnSortDirection = (currentColumnSort && currentColumnSort[1]) || '';
+
+  const btnSortIcon = sortDirectionToIcon[sortDirection];
   const btnSortClassName =
     sortDirection !== '' ? btnSortIcon : `kbnDocTableHeader__sortChange ${btnSortIcon}`;
 
+  const handleChangeSortOrder = () => {
+    if (!onChangeSortOrder) return;
+
+    // Cycle goes Unsorted -> Asc -> Desc -> Unsorted
+    if (currentColumnSort === undefined) {
+      onChangeSortOrder([...currentSortWithoutColumn, [name, 'asc']]);
+    } else if (currentColumnSortDirection === 'asc') {
+      onChangeSortOrder([...currentSortWithoutColumn, [name, 'desc']]);
+    } else if (currentColumnSortDirection === 'desc' && currentSortWithoutColumn.length === 0) {
+      // If we're at the end of the cycle and this is the only existing sort, we switch
+      // back to ascending sort instead of removing it.
+      onChangeSortOrder([[name, 'asc']]);
+    } else {
+      onChangeSortOrder(currentSortWithoutColumn);
+    }
+  };
+
+  const getSortButtonAriaLabel = () => {
+    const sortAscendingMessage = i18n.translate(
+      'kbn.docTable.tableHeader.sortByColumnAscendingAriaLabel',
+      {
+        defaultMessage: 'Sort {columnName} ascending',
+        values: { columnName: name },
+      }
+    );
+    const sortDescendingMessage = i18n.translate(
+      'kbn.docTable.tableHeader.sortByColumnDescendingAriaLabel',
+      {
+        defaultMessage: 'Sort {columnName} descending',
+        values: { columnName: name },
+      }
+    );
+    const stopSortingMessage = i18n.translate(
+      'kbn.docTable.tableHeader.sortByColumnUnsortedAriaLabel',
+      {
+        defaultMessage: 'Stop sorting on {columnName}',
+        values: { columnName: name },
+      }
+    );
+
+    if (currentColumnSort === undefined) {
+      return sortAscendingMessage;
+    } else if (sortDirection === 'asc') {
+      return sortDescendingMessage;
+    } else if (sortDirection === 'desc' && currentSortWithoutColumn.length === 0) {
+      return sortAscendingMessage;
+    } else {
+      return stopSortingMessage;
+    }
+  };
+
   // action buttons displayed on the right side of the column name
   const buttons = [
     // Sort Button
     {
       active: isSortable && typeof onChangeSortOrder === 'function',
-      ariaLabel:
-        sortDirection === 'asc'
-          ? i18n.translate('kbn.docTable.tableHeader.sortByColumnDescendingAriaLabel', {
-              defaultMessage: 'Sort {columnName} descending',
-              values: { columnName: name },
-            })
-          : i18n.translate('kbn.docTable.tableHeader.sortByColumnAscendingAriaLabel', {
-              defaultMessage: 'Sort {columnName} ascending',
-              values: { columnName: name },
-            }),
+      ariaLabel: getSortButtonAriaLabel(),
       className: btnSortClassName,
-      onClick: () => {
-        /**
-         * cycle sorting direction
-         * asc -> desc, desc -> asc, default: asc
-         */
-        if (typeof onChangeSortOrder === 'function') {
-          const newDirection = sortDirection === 'asc' ? 'desc' : 'asc';
-          onChangeSortOrder(name, newDirection);
-        }
-      },
+      onClick: handleChangeSortOrder,
       testSubject: `docTableHeaderFieldSort_${name}`,
-      tooltip: i18n.translate('kbn.docTable.tableHeader.sortByColumnTooltip', {
-        defaultMessage: 'Sort by {columnName}',
-        values: { columnName: name },
-      }),
+      tooltip: getSortButtonAriaLabel(),
     },
     // Remove Button
     {
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.html b/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.html
index 075468b76090b..b73f204626b9c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.html
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.html
@@ -46,7 +46,6 @@
           filters="filters"
           class="kbnDocTable__row"
           on-add-column="onAddColumn"
-          on-change-sort-order="onChangeSortOrder"
           on-remove-column="onRemoveColumn"
         ></tr>
       </tbody>
@@ -98,7 +97,6 @@
         ng-class="{'kbnDocTable__row--highlight': row['$$_isAnchor']}"
         data-test-subj="docTableRow{{ row['$$_isAnchor'] ? ' docTableAnchorRow' : ''}}"
         on-add-column="onAddColumn"
-        on-change-sort-order="onChangeSortOrder"
         on-remove-column="onRemoveColumn"
       ></tr>
     </tbody>
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.js
index 82195823c6749..9aba887569dbf 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.js
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.js
@@ -19,42 +19,49 @@
 
 import _ from 'lodash';
 
+function isSortable(field, indexPattern) {
+  return (indexPattern.fields.byName[field] && indexPattern.fields.byName[field].sortable);
+}
+
+function createSortObject(sortPair, indexPattern) {
+
+  if (Array.isArray(sortPair) && sortPair.length === 2 && isSortable(sortPair[0], indexPattern)) {
+    const [ field, direction ] = sortPair;
+    return { [field]: direction };
+  }
+  else {
+    return undefined;
+  }
+}
+
 /**
  * Take a sorting array and make it into an object
- * @param {array} 2 item array [fieldToSort, directionToSort]
+ * @param {array} sort 2 item array [fieldToSort, directionToSort]
  * @param {object} indexPattern used for determining default sort
  * @returns {object} a sort object suitable for returning to elasticsearch
  */
 export function getSort(sort, indexPattern, defaultSortOrder = 'desc') {
-  const sortObj = {};
-  let field;
-  let direction;
 
-  function isSortable(field) {
-    return (indexPattern.fields.byName[field] && indexPattern.fields.byName[field].sortable);
+  let sortObjects;
+  if (Array.isArray(sort)) {
+    if (sort.length > 0 && !Array.isArray(sort[0])) {
+      sort = [sort];
+    }
+    sortObjects = _.compact(sort.map((sortPair) => createSortObject(sortPair, indexPattern)));
   }
 
-  if (Array.isArray(sort) && sort.length === 2 && isSortable(sort[0])) {
-    // At some point we need to refactor the sorting logic, this array sucks.
-    field = sort[0];
-    direction = sort[1];
-  } else if (indexPattern.timeFieldName && isSortable(indexPattern.timeFieldName)) {
-    field = indexPattern.timeFieldName;
-    direction = defaultSortOrder;
+  if (!_.isEmpty(sortObjects)) {
+    return sortObjects;
   }
-
-  if (field) {
-    sortObj[field] = direction;
-  } else {
-    sortObj._score = 'desc';
+  else if (indexPattern.timeFieldName && isSortable(indexPattern.timeFieldName, indexPattern)) {
+    return [{ [indexPattern.timeFieldName]: defaultSortOrder }];
+  }
+  else {
+    return [{ _score: 'desc' }];
   }
-
-
-
-  return sortObj;
 }
 
 getSort.array = function (sort, indexPattern, defaultSortOrder) {
-  return _(getSort(sort, indexPattern, defaultSortOrder)).pairs().pop();
+  return getSort(sort, indexPattern, defaultSortOrder).map((sortPair) => _(sortPair).pairs().pop());
 };
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
index 7dec893f68025..56f368f2a5161 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
@@ -45,11 +45,11 @@ import { ISearchEmbeddable, SearchInput, SearchOutput } from './types';
 interface SearchScope extends ng.IScope {
   columns?: string[];
   description?: string;
-  sort?: string[];
+  sort?: string[] | string[][];
   searchSource?: SearchSource;
   sharedItemTitle?: string;
   inspectorAdapters?: Adapters;
-  setSortOrder?: (column: string, columnDirection: string) => void;
+  setSortOrder?: (sortPair: [string, string]) => void;
   removeColumn?: (column: string) => void;
   addColumn?: (column: string) => void;
   moveColumn?: (column: string, index: number) => void;
@@ -201,8 +201,8 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
 
     this.pushContainerStateParamsToScope(searchScope);
 
-    searchScope.setSortOrder = (columnName, direction) => {
-      searchScope.sort = [columnName, direction];
+    searchScope.setSortOrder = sortPair => {
+      searchScope.sort = sortPair;
       this.updateInput({ sort: searchScope.sort });
     };
 
@@ -263,6 +263,9 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
     // been overridden in a dashboard.
     searchScope.columns = this.input.columns || this.savedSearch.columns;
     searchScope.sort = this.input.sort || this.savedSearch.sort;
+    if (searchScope.sort.length && !Array.isArray(searchScope.sort[0])) {
+      searchScope.sort = [searchScope.sort];
+    }
     searchScope.sharedItemTitle = this.panelTitle;
 
     if (
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
index 015683cdde671..0586647254e9c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
@@ -611,6 +611,7 @@ exports[`Flyout should render import step 1`] = `
       >
         <EuiFilePicker
           compressed={false}
+          display="large"
           initialPromptText={
             <FormattedMessage
               defaultMessage="Import"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
index b0e3503b73f25..e7f66a14cc827 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
@@ -899,6 +899,7 @@ exports[`Field for image setting should render as read only if saving is disable
           compressed={false}
           data-test-subj="advancedSetting-editField-image:test:setting"
           disabled={true}
+          display="large"
           initialPromptText="Select or drag and drop a file"
           onChange={[Function]}
           onKeyDown={[Function]}
@@ -1069,6 +1070,7 @@ exports[`Field for image setting should render custom setting icon if it is cust
           compressed={false}
           data-test-subj="advancedSetting-editField-image:test:setting"
           disabled={false}
+          display="large"
           initialPromptText="Select or drag and drop a file"
           onChange={[Function]}
           onKeyDown={[Function]}
@@ -1133,6 +1135,7 @@ exports[`Field for image setting should render default value if there is no user
           compressed={false}
           data-test-subj="advancedSetting-editField-image:test:setting"
           disabled={false}
+          display="large"
           initialPromptText="Select or drag and drop a file"
           onChange={[Function]}
           onKeyDown={[Function]}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
index 101a458198290..f8f2c5ed578a2 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
+++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
@@ -33,6 +33,7 @@
     show-query-bar is set to "true".
   -->
   <kbn-top-nav-v2 
+    ng-show="chrome.getVisible()"
     app-name="'visualize'"
     config="topNavMenu"
     show-search-bar="true"
diff --git a/src/legacy/core_plugins/kibana_react/public/index.ts b/src/legacy/core_plugins/kibana_react/public/index.ts
index 3c82192bda545..980fbe2e46167 100644
--- a/src/legacy/core_plugins/kibana_react/public/index.ts
+++ b/src/legacy/core_plugins/kibana_react/public/index.ts
@@ -24,4 +24,3 @@
 
 /** @public types */
 export { TopNavMenu, TopNavMenuData } from './top_nav_menu';
-export { SearchBar, SearchBarProps } from './search_bar';
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx
index 03213afa8a5d3..83212a4c7c64e 100644
--- a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx
+++ b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx
@@ -22,7 +22,10 @@ import { TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
-jest.mock('../search_bar', () => {
+import { coreMock } from '../../../../../core/public/mocks';
+const setupMock = coreMock.createSetup();
+
+jest.mock('../../../../core_plugins/data/public', () => {
   return {
     SearchBar: () => <div className="searchBar"></div>,
     SearchBarProps: {},
@@ -51,25 +54,31 @@ describe('TopNavMenu', () => {
   ];
 
   it('Should render nothing when no config is provided', () => {
-    const component = shallowWithIntl(<TopNavMenu name="test" />);
+    const component = shallowWithIntl(<TopNavMenu name="test" uiSettings={setupMock.uiSettings} />);
     expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(0);
     expect(component.find(SEARCH_BAR_SELECTOR).length).toBe(0);
   });
 
   it('Should render 1 menu item', () => {
-    const component = shallowWithIntl(<TopNavMenu name="test" config={[menuItems[0]]} />);
+    const component = shallowWithIntl(
+      <TopNavMenu name="test" uiSettings={setupMock.uiSettings} config={[menuItems[0]]} />
+    );
     expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(1);
     expect(component.find(SEARCH_BAR_SELECTOR).length).toBe(0);
   });
 
   it('Should render multiple menu items', () => {
-    const component = shallowWithIntl(<TopNavMenu name="test" config={menuItems} />);
+    const component = shallowWithIntl(
+      <TopNavMenu name="test" uiSettings={setupMock.uiSettings} config={menuItems} />
+    );
     expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(menuItems.length);
     expect(component.find(SEARCH_BAR_SELECTOR).length).toBe(0);
   });
 
   it('Should render search bar', () => {
-    const component = shallowWithIntl(<TopNavMenu name="test" showSearchBar={true} />);
+    const component = shallowWithIntl(
+      <TopNavMenu name="test" uiSettings={setupMock.uiSettings} showSearchBar={true} />
+    );
 
     expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(0);
     expect(component.find(`span > ${SEARCH_BAR_SELECTOR}`).length).toBe(1);
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx
index 31ad676bb4cb7..6b1c207982873 100644
--- a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx
+++ b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx
@@ -21,12 +21,14 @@ import React from 'react';
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n/react';
+import { UiSettingsClientContract } from 'src/core/public';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { TopNavMenuItem } from './top_nav_menu_item';
-import { SearchBar, SearchBarProps } from '../search_bar';
+import { SearchBar, SearchBarProps } from '../../../../core_plugins/data/public';
 
 type Props = Partial<SearchBarProps> & {
   name: string;
+  uiSettings: UiSettingsClientContract;
   config?: TopNavMenuData[];
   showSearchBar?: boolean;
 };
@@ -60,6 +62,7 @@ export function TopNavMenu(props: Props) {
       <SearchBar
         query={props.query}
         filters={props.filters}
+        uiSettings={props.uiSettings}
         showQueryBar={props.showQueryBar}
         showQueryInput={props.showQueryInput}
         showFilterBar={props.showFilterBar}
diff --git a/src/legacy/core_plugins/metrics/public/components/annotations_editor.js b/src/legacy/core_plugins/metrics/public/components/annotations_editor.js
index 7236a778703a3..f517875a522d7 100644
--- a/src/legacy/core_plugins/metrics/public/components/annotations_editor.js
+++ b/src/legacy/core_plugins/metrics/public/components/annotations_editor.js
@@ -28,8 +28,7 @@ import { FieldSelect } from './aggs/field_select';
 import uuid from 'uuid';
 import { IconSelect } from './icon_select';
 import { YesNo } from './yes_no';
-import { Storage } from 'ui/storage';
-import { QueryBarInput } from 'plugins/data';
+import { QueryBarWrapper } from './query_bar_wrapper';
 import { getDefaultQueryLanguage } from './lib/get_default_query_language';
 
 import {
@@ -61,7 +60,6 @@ function newAnnotation() {
 
 const RESTRICT_FIELDS = [ES_TYPES.DATE];
 
-const localStorage = new Storage(window.localStorage);
 export class AnnotationsEditor extends Component {
   constructor(props) {
     super(props);
@@ -172,16 +170,13 @@ export class AnnotationsEditor extends Component {
                   }
                   fullWidth
                 >
-                  <QueryBarInput
+                  <QueryBarWrapper
                     query={{
                       language: model.query_string.language || getDefaultQueryLanguage(),
                       query: model.query_string.query || '',
                     }}
                     onChange={query => this.handleQueryChange(model, query)}
-                    appName={'VisEditor'}
                     indexPatterns={[model.index_pattern]}
-                    store={localStorage}
-                    showDatePicker={false}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
@@ -344,4 +339,5 @@ AnnotationsEditor.propTypes = {
   model: PropTypes.object,
   name: PropTypes.string,
   onChange: PropTypes.func,
+  uiSettings: PropTypes.object,
 };
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config.js b/src/legacy/core_plugins/metrics/public/components/panel_config.js
index 2a8647febb912..d1487955887b6 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config.js
@@ -25,6 +25,7 @@ import { TablePanelConfig as table } from './panel_config/table';
 import { GaugePanelConfig as gauge } from './panel_config/gauge';
 import { MarkdownPanelConfig as markdown } from './panel_config/markdown';
 import { FormattedMessage } from '@kbn/i18n/react';
+
 import { FormValidationContext } from '../contexts/form_validation_context';
 import { VisDataContext } from '../contexts/vis_data_context';
 
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.js b/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.js
index c1f87204f614d..cc2306a5a17f9 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.js
@@ -43,9 +43,7 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
-import { QueryBarInput } from 'plugins/data';
-const localStorage = new Storage(window.localStorage);
+import { QueryBarWrapper } from '../query_bar_wrapper';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
 
 class GaugePanelConfigUi extends Component {
@@ -149,15 +147,13 @@ class GaugePanelConfigUi extends Component {
                   }
                   fullWidth
                 >
-                  <QueryBarInput
+                  <QueryBarWrapper
                     query={{
                       language: model.filter.language || getDefaultQueryLanguage(),
                       query: model.filter.query || '',
                     }}
                     onChange={filter => this.props.onChange({ filter })}
-                    appName={'VisEditor'}
                     indexPatterns={[model.index_pattern || model.default_index_pattern]}
-                    store={localStorage}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.test.js b/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.test.js
index 35b6d244498e2..7b8a7061e8bb1 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.test.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/gauge.test.js
@@ -19,6 +19,13 @@
 
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+
+jest.mock('plugins/data', () => {
+  return {
+    QueryBarInput: () => <div className="queryBarInput" />,
+  };
+});
+
 import { GaugePanelConfig } from './gauge';
 
 jest.mock('plugins/data', () => {
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/markdown.js b/src/legacy/core_plugins/metrics/public/components/panel_config/markdown.js
index f9ba313f2a4a7..b50a0d398edf6 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/markdown.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/markdown.js
@@ -44,11 +44,9 @@ import {
 } from '@elastic/eui';
 const lessC = less(window, { env: 'production' });
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
+import { QueryBarWrapper } from '../query_bar_wrapper';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
 import { VisDataContext } from './../../contexts/vis_data_context';
-import { QueryBarInput } from 'plugins/data';
-const localStorage = new Storage(window.localStorage);
 
 class MarkdownPanelConfigUi extends Component {
   constructor(props) {
@@ -158,7 +156,7 @@ class MarkdownPanelConfigUi extends Component {
                   }
                   fullWidth
                 >
-                  <QueryBarInput
+                  <QueryBarWrapper
                     query={{
                       language: model.filter.language
                         ? model.filter.language
@@ -166,9 +164,7 @@ class MarkdownPanelConfigUi extends Component {
                       query: model.filter.query || '',
                     }}
                     onChange={filter => this.props.onChange({ filter })}
-                    appName={'VisEditor'}
                     indexPatterns={[model.index_pattern || model.default_index_pattern]}
-                    store={localStorage}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/metric.js b/src/legacy/core_plugins/metrics/public/components/panel_config/metric.js
index a34d65129cce1..6aac01a93194c 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/metric.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/metric.js
@@ -39,10 +39,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { Storage } from 'ui/storage';
+import { QueryBarWrapper } from '../query_bar_wrapper';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
-import { QueryBarInput } from 'plugins/data';
-const localStorage = new Storage(window.localStorage);
 
 export class MetricPanelConfig extends Component {
   constructor(props) {
@@ -114,15 +112,13 @@ export class MetricPanelConfig extends Component {
                   }
                   fullWidth
                 >
-                  <QueryBarInput
+                  <QueryBarWrapper
                     query={{
                       language: model.filter.language || getDefaultQueryLanguage(),
                       query: model.filter.query || '',
                     }}
                     onChange={filter => this.props.onChange({ filter })}
-                    appName={'VisEditor'}
                     indexPatterns={[model.index_pattern || model.default_index_pattern]}
-                    store={localStorage}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/table.js b/src/legacy/core_plugins/metrics/public/components/panel_config/table.js
index 6d1bada7b37d0..c1351952b36a6 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/table.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/table.js
@@ -43,11 +43,8 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
-const localStorage = new Storage(window.localStorage);
+import { QueryBarWrapper } from '../query_bar_wrapper';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
-import { QueryBarInput } from 'plugins/data';
-
 export class TablePanelConfig extends Component {
   constructor(props) {
     super(props);
@@ -233,7 +230,7 @@ export class TablePanelConfig extends Component {
                   }
                   fullWidth
                 >
-                  <QueryBarInput
+                  <QueryBarWrapper
                     query={{
                       language: model.filter.language
                         ? model.filter.language
@@ -241,9 +238,7 @@ export class TablePanelConfig extends Component {
                       query: model.filter.query || '',
                     }}
                     onChange={filter => this.props.onChange({ filter })}
-                    appName={'VisEditor'}
                     indexPatterns={[model.index_pattern || model.default_index_pattern]}
-                    store={localStorage}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/timeseries.js b/src/legacy/core_plugins/metrics/public/components/panel_config/timeseries.js
index 9a43f1c4afd76..6b8147285ead3 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/timeseries.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/timeseries.js
@@ -42,10 +42,8 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
-import { QueryBarInput } from 'plugins/data';
-const localStorage = new Storage(window.localStorage);
+import { QueryBarWrapper } from '../query_bar_wrapper';
 class TimeseriesPanelConfigUi extends Component {
   constructor(props) {
     super(props);
@@ -186,15 +184,13 @@ class TimeseriesPanelConfigUi extends Component {
                   }
                   fullWidth
                 >
-                  <QueryBarInput
+                  <QueryBarWrapper
                     query={{
                       language: model.filter.language || getDefaultQueryLanguage(),
                       query: model.filter.query || '',
                     }}
                     onChange={filter => this.props.onChange({ filter })}
-                    appName={'VisEditor'}
                     indexPatterns={[model.index_pattern || model.default_index_pattern]}
-                    store={localStorage}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
diff --git a/src/legacy/core_plugins/metrics/public/components/panel_config/top_n.js b/src/legacy/core_plugins/metrics/public/components/panel_config/top_n.js
index c562b5b4a9741..1cf17b772a1c3 100644
--- a/src/legacy/core_plugins/metrics/public/components/panel_config/top_n.js
+++ b/src/legacy/core_plugins/metrics/public/components/panel_config/top_n.js
@@ -42,10 +42,8 @@ import {
   EuiCode,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
-import { QueryBarInput } from 'plugins/data';
-const localStorage = new Storage(window.localStorage);
+import { QueryBarWrapper } from '../query_bar_wrapper';
 
 export class TopNPanelConfig extends Component {
   constructor(props) {
@@ -142,7 +140,7 @@ export class TopNPanelConfig extends Component {
                   }
                   fullWidth
                 >
-                  <QueryBarInput
+                  <QueryBarWrapper
                     query={{
                       language: model.filter.language
                         ? model.filter.language
@@ -150,9 +148,7 @@ export class TopNPanelConfig extends Component {
                       query: model.filter.query || '',
                     }}
                     onChange={filter => this.props.onChange({ filter })}
-                    appName={'VisEditor'}
                     indexPatterns={[model.index_pattern || model.default_index_pattern]}
-                    store={localStorage}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
diff --git a/src/legacy/ui/public/inspector/ui/inspector_panel.d.ts b/src/legacy/core_plugins/metrics/public/components/query_bar_wrapper.js
similarity index 71%
rename from src/legacy/ui/public/inspector/ui/inspector_panel.d.ts
rename to src/legacy/core_plugins/metrics/public/components/query_bar_wrapper.js
index 154b1a58f5732..c8d81c9d2737a 100644
--- a/src/legacy/ui/public/inspector/ui/inspector_panel.d.ts
+++ b/src/legacy/core_plugins/metrics/public/components/query_bar_wrapper.js
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ComponentClass } from 'react';
 
-import { Adapters, InspectorViewDescription } from '../types';
+import React, { useContext } from 'react';
+import { CoreSetupContext } from '../contexts/query_input_bar_context';
+import { QueryBarInput } from 'plugins/data';
 
-interface InspectorPanelProps {
-  adapters: Adapters;
-  title?: string;
-  views: InspectorViewDescription[];
-}
+export function QueryBarWrapper(props) {
+  const coreSetupContext = useContext(CoreSetupContext);
 
-export const InspectorPanel: ComponentClass<InspectorPanelProps>;
+  return <QueryBarInput {...props} {...coreSetupContext} />;
+}
diff --git a/src/legacy/core_plugins/metrics/public/components/series_config.js b/src/legacy/core_plugins/metrics/public/components/series_config.js
index 3dad3fb9ad89f..4937e35fd609b 100644
--- a/src/legacy/core_plugins/metrics/public/components/series_config.js
+++ b/src/legacy/core_plugins/metrics/public/components/series_config.js
@@ -36,10 +36,8 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
 import { getDefaultQueryLanguage } from './lib/get_default_query_language';
-import { QueryBarInput } from 'plugins/data';
-const localStorage = new Storage(window.localStorage);
+import { QueryBarWrapper } from './query_bar_wrapper';
 
 export const SeriesConfig = props => {
   const defaults = { offset_time: '', value_template: '' };
@@ -63,7 +61,7 @@ export const SeriesConfig = props => {
         label={<FormattedMessage id="tsvb.seriesConfig.filterLabel" defaultMessage="Filter" />}
         fullWidth
       >
-        <QueryBarInput
+        <QueryBarWrapper
           query={{
             language:
               model.filter && model.filter.language
@@ -72,10 +70,7 @@ export const SeriesConfig = props => {
             query: model.filter && model.filter.query ? model.filter.query : '',
           }}
           onChange={filter => props.onChange({ filter })}
-          appName={'VisEditor'}
           indexPatterns={[seriesIndexPattern]}
-          store={localStorage}
-          showDatePicker={false}
         />
       </EuiFormRow>
 
diff --git a/src/legacy/core_plugins/metrics/public/components/splits/filter.js b/src/legacy/core_plugins/metrics/public/components/splits/filter.js
index 02277009313b0..cadeb3f13ae21 100644
--- a/src/legacy/core_plugins/metrics/public/components/splits/filter.js
+++ b/src/legacy/core_plugins/metrics/public/components/splits/filter.js
@@ -21,12 +21,10 @@ import { createSelectHandler } from '../lib/create_select_handler';
 import { GroupBySelect } from './group_by_select';
 import PropTypes from 'prop-types';
 import React from 'react';
-import { QueryBarInput } from 'plugins/data';
-import { Storage } from 'ui/storage';
 import { htmlIdGenerator, EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
-const localStorage = new Storage(window.localStorage);
+import { QueryBarWrapper } from '../query_bar_wrapper';
 
 export const SplitByFilter = props => {
   const { onChange, uiRestrictions, indexPattern } = props;
@@ -60,15 +58,13 @@ export const SplitByFilter = props => {
             />
           }
         >
-          <QueryBarInput
+          <QueryBarWrapper
             query={{
               language: model.filter.language || getDefaultQueryLanguage(),
               query: model.filter.query || '',
             }}
             onChange={filter => onChange({ filter })}
-            appName={'VisEditor'}
             indexPatterns={[indexPattern]}
-            store={localStorage}
           />
         </EuiFormRow>
       </EuiFlexItem>
diff --git a/src/legacy/core_plugins/metrics/public/components/splits/filter_items.js b/src/legacy/core_plugins/metrics/public/components/splits/filter_items.js
index 4e27ba8eb545c..5b0e1104c7004 100644
--- a/src/legacy/core_plugins/metrics/public/components/splits/filter_items.js
+++ b/src/legacy/core_plugins/metrics/public/components/splits/filter_items.js
@@ -24,12 +24,10 @@ import { collectionActions } from '../lib/collection_actions';
 import { AddDeleteButtons } from '../add_delete_buttons';
 import { ColorPicker } from '../color_picker';
 import uuid from 'uuid';
-import { QueryBarInput } from 'plugins/data';
-import { Storage } from 'ui/storage';
 import { EuiFieldText, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { injectI18n } from '@kbn/i18n/react';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
-const localStorage = new Storage(window.localStorage);
+import { QueryBarWrapper } from '../query_bar_wrapper';
 class FilterItemsUi extends Component {
   constructor(props) {
     super(props);
@@ -79,15 +77,13 @@ class FilterItemsUi extends Component {
           />
         </EuiFlexItem>
         <EuiFlexItem>
-          <QueryBarInput
+          <QueryBarWrapper
             query={{
               language: model.filter.language || getDefaultQueryLanguage(),
               query: model.filter.query || '',
             }}
             onChange={query => this.handleQueryChange(model, query)}
-            appName={'VisEditor'}
             indexPatterns={[indexPatterns]}
-            store={localStorage}
           />
         </EuiFlexItem>
         <EuiFlexItem>
diff --git a/src/legacy/core_plugins/metrics/public/components/vis_editor.js b/src/legacy/core_plugins/metrics/public/components/vis_editor.js
index 26e3fa9e2bde9..bc996d14745ff 100644
--- a/src/legacy/core_plugins/metrics/public/components/vis_editor.js
+++ b/src/legacy/core_plugins/metrics/public/components/vis_editor.js
@@ -19,7 +19,6 @@
 
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import chrome from 'ui/chrome';
 import * as Rx from 'rxjs';
 import { share } from 'rxjs/operators';
 import { isEqual, isEmpty, debounce } from 'lodash';
@@ -32,8 +31,13 @@ import { brushHandler } from '../lib/create_brush_handler';
 import { fetchFields } from '../lib/fetch_fields';
 import { extractIndexPatterns } from '../../common/extract_index_patterns';
 
+import { npSetup } from 'ui/new_platform';
+import { Storage } from 'ui/storage';
+import { CoreSetupContext } from '../contexts/query_input_bar_context';
+const localStorage = new Storage(window.localStorage);
+
 const VIS_STATE_DEBOUNCE_DELAY = 200;
-const queryOptions = chrome.getUiSettingsClient().get('query:allowLeadingWildcards');
+const APP_NAME = 'VisEditor';
 
 export class VisEditor extends Component {
   constructor(props) {
@@ -72,6 +76,7 @@ export class VisEditor extends Component {
   isValidKueryQuery = filterQuery => {
     if (filterQuery && filterQuery.language === 'kuery') {
       try {
+        const queryOptions = npSetup.uiSettings.get('query:allowLeadingWildcards');
         fromKueryExpression(filterQuery.query, { allowLeadingWildcards: queryOptions });
       } catch (error) {
         return false;
@@ -148,6 +153,14 @@ export class VisEditor extends Component {
     const { model } = this.state;
 
     if (model) {
+      // In new_platform, this context should be populated with
+      // core dependencies required by React components downstream.
+      const coreContext = {
+        appName: APP_NAME,
+        uiSettings: npSetup.core.uiSettings,
+        store: localStorage,
+      };
+
       return (
         <div className="tvbEditor" data-test-subj="tvbVisEditor">
           <div className="tvbEditor--hideForReporting">
@@ -168,14 +181,16 @@ export class VisEditor extends Component {
             onDataChange={this.onDataChange}
           />
           <div className="tvbEditor--hideForReporting">
-            <PanelConfig
-              fields={this.state.visFields}
-              model={model}
-              visData$={this.visData$}
-              dateFormat={this.props.config.get('dateFormat')}
-              onChange={this.handleChange}
-              getConfig={this.getConfig}
-            />
+            <CoreSetupContext.Provider value={coreContext}>
+              <PanelConfig
+                fields={this.state.visFields}
+                model={model}
+                visData$={this.visData$}
+                dateFormat={this.props.config.get('dateFormat')}
+                onChange={this.handleChange}
+                getConfig={this.getConfig}
+              />
+            </CoreSetupContext.Provider>
           </div>
         </div>
       );
diff --git a/src/legacy/core_plugins/metrics/public/components/vis_types/table/config.js b/src/legacy/core_plugins/metrics/public/components/vis_types/table/config.js
index ba83c66286df5..a9a9ec4de7bd7 100644
--- a/src/legacy/core_plugins/metrics/public/components/vis_types/table/config.js
+++ b/src/legacy/core_plugins/metrics/public/components/vis_types/table/config.js
@@ -40,10 +40,9 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
 import { getDefaultQueryLanguage } from '../../lib/get_default_query_language';
-import { QueryBarInput } from 'plugins/data';
-const localStorage = new Storage(window.localStorage);
+
+import { QueryBarWrapper } from '../../query_bar_wrapper';
 class TableSeriesConfigUI extends Component {
   componentWillMount() {
     const { model } = this.props;
@@ -158,7 +157,7 @@ class TableSeriesConfigUI extends Component {
               label={<FormattedMessage id="tsvb.table.filterLabel" defaultMessage="Filter" />}
               fullWidth
             >
-              <QueryBarInput
+              <QueryBarWrapper
                 query={{
                   language:
                     model.filter && model.filter.language
@@ -167,9 +166,7 @@ class TableSeriesConfigUI extends Component {
                   query: model.filter && model.filter.query ? model.filter.query : '',
                 }}
                 onChange={filter => this.props.onChange({ filter })}
-                appName={'VisEditor'}
                 indexPatterns={[this.props.indexPatternForQuery]}
-                store={localStorage}
               />
             </EuiFormRow>
           </EuiFlexItem>
diff --git a/src/legacy/core_plugins/metrics/public/components/vis_types/timeseries/config.js b/src/legacy/core_plugins/metrics/public/components/vis_types/timeseries/config.js
index 76bc589f5efe7..352b01a832694 100644
--- a/src/legacy/core_plugins/metrics/public/components/vis_types/timeseries/config.js
+++ b/src/legacy/core_plugins/metrics/public/components/vis_types/timeseries/config.js
@@ -24,8 +24,6 @@ import { createSelectHandler } from '../../lib/create_select_handler';
 import { YesNo } from '../../yes_no';
 import { createTextHandler } from '../../lib/create_text_handler';
 import { IndexPattern } from '../../index_pattern';
-import { QueryBarInput } from 'plugins/data';
-import { Storage } from 'ui/storage';
 import {
   htmlIdGenerator,
   EuiComboBox,
@@ -41,7 +39,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
 import { getDefaultQueryLanguage } from '../../lib/get_default_query_language';
-const localStorage = new Storage(window.localStorage);
+import { QueryBarWrapper } from '../../query_bar_wrapper';
 
 export const TimeseriesConfig = injectI18n(function(props) {
   const handleSelectChange = createSelectHandler(props.onChange);
@@ -357,7 +355,7 @@ export const TimeseriesConfig = injectI18n(function(props) {
           label={<FormattedMessage id="tsvb.timeSeries.filterLabel" defaultMessage="Filter" />}
           fullWidth
         >
-          <QueryBarInput
+          <QueryBarWrapper
             query={{
               language:
                 model.filter && model.filter.language
@@ -366,9 +364,7 @@ export const TimeseriesConfig = injectI18n(function(props) {
               query: model.filter && model.filter.query ? model.filter.query : '',
             }}
             onChange={filter => props.onChange({ filter })}
-            appName={'VisEditor'}
             indexPatterns={[seriesIndexPattern]}
-            store={localStorage}
           />
         </EuiFormRow>
       </EuiFlexItem>
diff --git a/src/legacy/ui/public/inspector/ui/index.ts b/src/legacy/core_plugins/metrics/public/contexts/query_input_bar_context.js
similarity index 90%
rename from src/legacy/ui/public/inspector/ui/index.ts
rename to src/legacy/core_plugins/metrics/public/contexts/query_input_bar_context.js
index c295c8eca1afc..ab358e833a386 100644
--- a/src/legacy/ui/public/inspector/ui/index.ts
+++ b/src/legacy/core_plugins/metrics/public/contexts/query_input_bar_context.js
@@ -17,4 +17,6 @@
  * under the License.
  */
 
-export { InspectorView } from './inspector_view';
+import React from 'react';
+
+export const CoreSetupContext = React.createContext({});
diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/request_processors/series/__tests__/query.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/request_processors/series/__tests__/query.js
index 819ecd04e3d7f..2f2e5f46f834e 100644
--- a/src/legacy/core_plugins/metrics/server/lib/vis_data/request_processors/series/__tests__/query.js
+++ b/src/legacy/core_plugins/metrics/server/lib/vis_data/request_processors/series/__tests__/query.js
@@ -126,8 +126,7 @@ describe('query(req, panel, series)', () => {
       size: 0,
       query: {
         bool: {
-          filter: [],
-          must: [
+          filter: [
             {
               bool: {
                 must: [
@@ -139,6 +138,8 @@ describe('query(req, panel, series)', () => {
                 ],
               },
             },
+          ],
+          must: [
             {
               range: {
                 timestamp: {
@@ -218,8 +219,7 @@ describe('query(req, panel, series)', () => {
       size: 0,
       query: {
         bool: {
-          filter: [],
-          must: [
+          filter: [
             {
               bool: {
                 must: [
@@ -231,6 +231,8 @@ describe('query(req, panel, series)', () => {
                 ],
               },
             },
+          ],
+          must: [
             {
               range: {
                 timestamp: {
diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/series/__tests__/build_request_body.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/series/__tests__/build_request_body.js
index 0406e5f567024..f21bf3d197969 100644
--- a/src/legacy/core_plugins/metrics/server/lib/vis_data/series/__tests__/build_request_body.js
+++ b/src/legacy/core_plugins/metrics/server/lib/vis_data/series/__tests__/build_request_body.js
@@ -106,8 +106,7 @@ describe('buildRequestBody(req)', () => {
       size: 0,
       query: {
         bool: {
-          filter: [],
-          must: [
+          filter: [
             {
               bool: {
                 must: [
@@ -121,6 +120,8 @@ describe('buildRequestBody(req)', () => {
                 must_not: [],
               },
             },
+          ],
+          must: [
             {
               range: {
                 '@timestamp': {
diff --git a/src/legacy/core_plugins/tests_bundle/index.js b/src/legacy/core_plugins/tests_bundle/index.js
index e10582df46b13..ae14438119da3 100644
--- a/src/legacy/core_plugins/tests_bundle/index.js
+++ b/src/legacy/core_plugins/tests_bundle/index.js
@@ -104,11 +104,25 @@ export default (kibana) => {
           modules: [...modules],
           template: createTestEntryTemplate(uiSettingDefaults),
           extendConfig(webpackConfig) {
-            return webpackMerge({
+            const mergedConfig = webpackMerge({
               resolve: {
                 extensions: ['.karma_mock.js', '.karma_mock.tsx', '.karma_mock.ts']
               }
             }, webpackConfig);
+
+            /**
+             * [..] it removes the commons bundle creation from the webpack
+             * config when we're building the bundle for the browser tests. It
+             * shouldn't be created, and by default isn't, but something is
+             * triggering it in webpack which breaks the tests so if we just
+             * remove the optimization config it will never happen and the tests
+             * will keep working [..]
+             *
+             * TLDR: If you have any questions about this line, ask Spencer.
+             */
+            delete mergedConfig.optimization.splitChunks.cacheGroups.commons;
+
+            return mergedConfig;
           }
         });
 
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
index eba6a16674705..cac74dff68fc6 100644
--- a/src/legacy/server/kbn_server.d.ts
+++ b/src/legacy/server/kbn_server.d.ts
@@ -19,6 +19,7 @@
 
 import { ResponseObject, Server } from 'hapi';
 
+import { SavedObjectsClientProviderOptions } from 'src/core/server';
 import {
   ConfigService,
   ElasticsearchServiceSetup,
@@ -74,7 +75,7 @@ declare module 'hapi' {
   }
 
   interface Request {
-    getSavedObjectsClient(): SavedObjectsClientContract;
+    getSavedObjectsClient(options?: SavedObjectsClientProviderOptions): SavedObjectsClientContract;
     getBasePath(): string;
     getUiSettingsService(): any;
     getCapabilities(): Promise<Capabilities>;
diff --git a/src/legacy/server/saved_objects/routes/import.test.ts b/src/legacy/server/saved_objects/routes/import.test.ts
index 5530170472f1c..5e859e7a57d8c 100644
--- a/src/legacy/server/saved_objects/routes/import.test.ts
+++ b/src/legacy/server/saved_objects/routes/import.test.ts
@@ -301,6 +301,9 @@ describe('POST /api/saved_objects/_import', () => {
           "type": "index-pattern",
         },
       ],
+      Object {
+        "namespace": undefined,
+      },
     ],
   ],
   "results": Array [
diff --git a/src/legacy/server/saved_objects/routes/resolve_import_errors.test.ts b/src/legacy/server/saved_objects/routes/resolve_import_errors.test.ts
index 64261f15a2e78..32adf18f7481c 100644
--- a/src/legacy/server/saved_objects/routes/resolve_import_errors.test.ts
+++ b/src/legacy/server/saved_objects/routes/resolve_import_errors.test.ts
@@ -161,29 +161,32 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
     expect(statusCode).toBe(200);
     expect(response).toEqual({ success: true, successCount: 1 });
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "Look at my dashboard",
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "Look at my dashboard",
+                },
+                "id": "my-dashboard",
+                "migrationVersion": Object {},
+                "type": "dashboard",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
           },
-          "id": "my-dashboard",
-          "migrationVersion": Object {},
-          "type": "dashboard",
-        },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+      }
+    `);
   });
 
   test('resolves conflicts for dashboard', async () => {
@@ -224,32 +227,33 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
     expect(statusCode).toBe(200);
     expect(response).toEqual({ success: true, successCount: 1 });
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "Look at my dashboard",
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "Look at my dashboard",
+                },
+                "id": "my-dashboard",
+                "migrationVersion": Object {},
+                "type": "dashboard",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+              "overwrite": true,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
           },
-          "id": "my-dashboard",
-          "migrationVersion": Object {},
-          "type": "dashboard",
-        },
-      ],
-      Object {
-        "overwrite": true,
-      },
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+      }
+    `);
   });
 
   test('resolves conflicts by replacing the visualization references', async () => {
@@ -306,58 +310,64 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
     expect(statusCode).toBe(200);
     expect(response).toEqual({ success: true, successCount: 1 });
     expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "attributes": Object {
-            "title": "Look at my visualization",
-          },
-          "id": "my-vis",
-          "migrationVersion": Object {},
-          "references": Array [
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "attributes": Object {
+                  "title": "Look at my visualization",
+                },
+                "id": "my-vis",
+                "migrationVersion": Object {},
+                "references": Array [
+                  Object {
+                    "id": "existing",
+                    "name": "ref_0",
+                    "type": "index-pattern",
+                  },
+                ],
+                "type": "visualization",
+              },
+            ],
             Object {
-              "id": "existing",
-              "name": "ref_0",
-              "type": "index-pattern",
+              "namespace": undefined,
             },
           ],
-          "type": "visualization",
-        },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
     expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "fields": Array [
-            "id",
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Array [
+              Object {
+                "fields": Array [
+                  "id",
+                ],
+                "id": "existing",
+                "type": "index-pattern",
+              },
+            ],
+            Object {
+              "namespace": undefined,
+            },
           ],
-          "id": "existing",
-          "type": "index-pattern",
-        },
-      ],
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": Promise {},
+          },
+        ],
+      }
+    `);
   });
 });
diff --git a/src/legacy/server/saved_objects/saved_objects_mixin.js b/src/legacy/server/saved_objects/saved_objects_mixin.js
index 29e2cb356da8e..d6ca2698395f3 100644
--- a/src/legacy/server/saved_objects/saved_objects_mixin.js
+++ b/src/legacy/server/saved_objects/saved_objects_mixin.js
@@ -27,7 +27,10 @@ import {
   SavedObjectsClient,
   SavedObjectsRepository,
   ScopedSavedObjectsClientProvider,
-} from '../../../core/server/saved_objects/service';
+  getSortedObjectsForExport,
+  importSavedObjects,
+  resolveImportErrors,
+} from '../../../core/server/saved_objects';
 import { getRootPropertiesObjects } from '../../../core/server/saved_objects/mappings';
 import { SavedObjectsManagement } from '../../../core/server/saved_objects/management';
 
@@ -144,6 +147,13 @@ export function savedObjectsMixin(kbnServer, server) {
     setScopedSavedObjectsClientFactory: (...args) => provider.setClientFactory(...args),
     addScopedSavedObjectsClientWrapperFactory: (...args) =>
       provider.addClientWrapperFactory(...args),
+    importExport: {
+      objectLimit: server.config().get('savedObjects.maxImportExportSize'),
+      importSavedObjects,
+      resolveImportErrors,
+      getSortedObjectsForExport,
+    },
+    schema,
   };
   server.decorate('server', 'savedObjects', service);
 
diff --git a/src/legacy/ui/public/_index.scss b/src/legacy/ui/public/_index.scss
index a54c100d52eae..3ae2533eb6b9d 100644
--- a/src/legacy/ui/public/_index.scss
+++ b/src/legacy/ui/public/_index.scss
@@ -18,7 +18,6 @@
 @import './error_url_overflow/index';
 @import './exit_full_screen/index';
 @import './field_editor/index';
-@import './inspector/index';
 @import './kbn_top_nav/index';
 @import './markdown/index';
 @import './notify/index';
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_terms_other_bucket_helper.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_terms_other_bucket_helper.js
index 6176901a13d24..2a804059edd2f 100644
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/_terms_other_bucket_helper.js
+++ b/src/legacy/ui/public/agg_types/__tests__/buckets/_terms_other_bucket_helper.js
@@ -182,8 +182,8 @@ describe('Terms Agg Other bucket helper', () => {
           filters: {
             '': {
               bool: {
-                must: [{ exists: { field: 'machine.os.raw' } }],
-                filter: [],
+                must: [],
+                filter: [{ exists: { field: 'machine.os.raw' } }],
                 should: [],
                 must_not: [
                   { match_phrase: { 'machine.os.raw': { query: 'ios' } } },
@@ -208,11 +208,11 @@ describe('Terms Agg Other bucket helper', () => {
             filters: {
               '-IN': {
                 bool: {
-                  must: [
+                  must: [],
+                  filter: [
                     { match_phrase: { 'geo.src': { query: 'IN' } } },
                     { exists: { field: 'machine.os.raw' } }
                   ],
-                  filter: [],
                   should: [],
                   must_not: [
                     { match_phrase: { 'machine.os.raw': { query: 'ios' } } },
@@ -222,11 +222,11 @@ describe('Terms Agg Other bucket helper', () => {
               },
               '-US': {
                 bool: {
-                  must: [
+                  must: [],
+                  filter: [
                     { match_phrase: { 'geo.src': { query: 'US' } } },
                     { exists: { field: 'machine.os.raw' } }
                   ],
-                  filter: [],
                   should: [],
                   must_not: [
                     { match_phrase: { 'machine.os.raw': { query: 'ios' } } },
diff --git a/src/legacy/ui/public/agg_types/buckets/filters.js b/src/legacy/ui/public/agg_types/buckets/filters.js
index d7553cf81a11a..591da661b7437 100644
--- a/src/legacy/ui/public/agg_types/buckets/filters.js
+++ b/src/legacy/ui/public/agg_types/buckets/filters.js
@@ -50,7 +50,7 @@ export const filtersBucketAgg = new BucketAggType({
         if (!_.size(inFilters)) return;
 
         inFilters.forEach((filter) => {
-          const persistedLog = getQueryLog('filtersAgg', filter.input.language);
+          const persistedLog = getQueryLog(config, 'filtersAgg', filter.input.language);
           persistedLog.add(filter.input.query);
         });
 
diff --git a/src/legacy/ui/public/agg_types/controls/filter.tsx b/src/legacy/ui/public/agg_types/controls/filter.tsx
index ce581837eb83c..86014c50ececb 100644
--- a/src/legacy/ui/public/agg_types/controls/filter.tsx
+++ b/src/legacy/ui/public/agg_types/controls/filter.tsx
@@ -28,8 +28,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { AggConfig } from 'ui/vis';
-// @ts-ignore
 import { Query, QueryBarInput } from 'plugins/data';
+import { npSetup } from 'ui/new_platform';
+import { Storage } from 'ui/storage';
+const localStorage = new Storage(window.localStorage);
 
 interface FilterRowProps {
   id: string;
@@ -108,6 +110,8 @@ function FilterRow({
           data-test-subj={dataTestSubj}
           bubbleSubmitEvent={true}
           languageSwitcherPopoverAnchorPosition="leftDown"
+          store={localStorage}
+          uiSettings={npSetup.core.uiSettings}
         />
       </EuiFormRow>
       {showCustomLabel ? (
diff --git a/src/legacy/ui/public/index_patterns/index_patterns.ts b/src/legacy/ui/public/index_patterns/index_patterns.ts
index 6f22c1c2a73ea..9ef38138cc68a 100644
--- a/src/legacy/ui/public/index_patterns/index_patterns.ts
+++ b/src/legacy/ui/public/index_patterns/index_patterns.ts
@@ -24,7 +24,7 @@ import { IndexPattern } from './_index_pattern';
 import { createIndexPatternCache } from './_pattern_cache';
 import { IndexPatternsApiClient } from './index_patterns_api_client';
 import { SavedObjectsClient, SimpleSavedObject } from '../saved_objects';
-import { UiSettingsClient } from '../../../../core/public';
+import { UiSettingsClientContract } from '../../../../core/public';
 
 const indexPatternCache = createIndexPatternCache();
 const apiClient = new IndexPatternsApiClient();
@@ -32,11 +32,11 @@ const apiClient = new IndexPatternsApiClient();
 export class IndexPatterns {
   fieldFormats: fieldFormats;
 
-  private config: UiSettingsClient;
+  private config: UiSettingsClientContract;
   private savedObjectsClient: SavedObjectsClient;
   private savedObjectsCache?: Array<SimpleSavedObject<{}>> | null;
 
-  constructor(config: UiSettingsClient, savedObjectsClient: SavedObjectsClient) {
+  constructor(config: UiSettingsClientContract, savedObjectsClient: SavedObjectsClient) {
     this.config = config;
     this.savedObjectsClient = savedObjectsClient;
   }
diff --git a/src/legacy/ui/public/inspector/README.md b/src/legacy/ui/public/inspector/README.md
index b4eb392812aee..c8133d0d9238d 100644
--- a/src/legacy/ui/public/inspector/README.md
+++ b/src/legacy/ui/public/inspector/README.md
@@ -1,127 +1,6 @@
 # Inspector
 
-The inspector is a contextual tool to gain insights into different elements
-in Kibana, e.g. visualizations. It has the form of a flyout panel.
-
-## Inspector Views
-
-The "Inspector Panel" can have multiple so called "Inspector Views" inside of it.
-These views are used to gain different information into the element you are inspecting.
-There is a request inspector view to gain information in the requests done for this
-element or a data inspector view to inspect the underlying data. Whether or not
-a specific view is available depends on the used adapters.
-
-## Inspector Adapters
-
-Since the Inspector panel itself is not tied to a specific type of elements (visualizations,
-saved searches, etc.), everything you need to open the inspector is a collection
-of so called inspector adapters. A single adapter can be any type of JavaScript class.
-
-Most likely an adapter offers some kind of logging capabilities for the element, that
-uses it e.g. the request adapter allows element (like visualizations) to log requests
-they make.
-
-The corresponding inspector view will then use the information inside the adapter
-to present the data in the panel. That concept allows different types of elements
-to use the Inspector panel, while they can use completely or partial different adapters
-and inspector views than other elements.
-
-For example a visualization could provide the request and data adapter while a saved
-search could only provide the request adapter and a Vega visualization could additionally
-provide a Vega adapter.
-
-There is no 1 to 1 relationship between adapters and views. An adapter could be used
-by multiple views and a view can use data from multiple adapters. It's up to the
-view to decide whether or not it wants to be shown for a given adapters list.
-
-## Develop custom inspectors
-
-You can extend the inspector panel by adding custom inspector views and inspector
-adapters via a plugin.
-
-### Develop inspector views
-
-To develop custom inspector views you should first register your file via `uiExports`
-in your plugin config:
-
-```js
-export default (kibana) => {
-  return new kibana.Plugin({
-    uiExports: {
-      inspectorViews: [ 'plugins/your_plugin/custom_view' ],
-    }
-  });
-};
-```
-
-Within the `custom_view.js` file in your `public` folder, you can define your
-inspector view as follows:
-
-```js
-import React from 'react';
-import { InspectorView, viewRegistry } from 'ui/inspector';
-
-function MyInspectorComponent(props) {
-  // props.adapters is the object of all adapters and may vary depending
-  // on who and where this inspector was opened. You should check for all
-  // adapters you need, in the below shouldShow method, before accessing
-  // them here.
-  return (
-    <InspectorView>
-      { /* Always use InspectorView as the wrapping element! */ }
-    </InspectorView>
-  );
-}
-
-const MyLittleInspectorView = {
-  // Title shown to select this view
-  title: 'Display Name',
-  // An icon id from the EUI icon list
-  icon: 'iconName',
-  // An order to sort the views (lower means first)
-  order: 10,
-  // An additional helptext, that wil
-  help: `And additional help text, that will be shown in the inspector help.`,
-  shouldShow(adapters) {
-    // Only show if `someAdapter` is available. Make sure to check for
-    // all adapters that you want to access in your view later on and
-    // any additional condition you want to be true to be shown.
-    return adapters.someAdapter;
-  },
-  // A React component, that will be used for rendering
-  component: MyInspectorComponent
-};
-
-viewRegistry.register(MyLittleInspectorView);
-```
-
-### Develop custom adapters
-
-An inspector adapter is just a plain JavaScript class, that can e.g. be attached
-to custom visualization types, so an inspector view can show additional information for this
-visualization.
-
-To add additional adapters to your visualization type, use the `inspectorAdapters.custom`
-object when defining the visualization type:
-
-```js
-class MyCustomInspectorAdapter {
-  // ....
-}
-
-// inside your visualization type description (usually passed to VisFactory.create...Type)
-{
-  // ...
-  inspectorAdapters: {
-    custom: {
-      someAdapter: MyCustomInspectorAdapter
-    }
-  }
-}
-```
-
-An instance of MyCustomInspectorAdapter will now be available on each visualization
-of that type and can be accessed via `vis.API.inspectorAdapters.someInspector`.
-
-Custom inspector views can now check for the presence of `adapters.someAdapter`
-in their `shouldShow` method and use this adapter in their component.
+- Inspector has been moved to `inspector` New Platform plugin.
+- You can find its documentation in `src/plugins/inspector/README.md`.
+- This folder will be deleted soon, it is deprecated, do not use anything from here.
+- This folder is ready to be deleted, as soon as nothing imports from here anymore.
diff --git a/src/legacy/ui/public/inspector/_index.scss b/src/legacy/ui/public/inspector/_index.scss
deleted file mode 100644
index a51fde079f10b..0000000000000
--- a/src/legacy/ui/public/inspector/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './ui/index';
diff --git a/src/legacy/ui/public/inspector/adapters/index.ts b/src/legacy/ui/public/inspector/adapters/index.ts
index 8e1979ab33275..55df5a33a178b 100644
--- a/src/legacy/ui/public/inspector/adapters/index.ts
+++ b/src/legacy/ui/public/inspector/adapters/index.ts
@@ -17,5 +17,11 @@
  * under the License.
  */
 
-export { DataAdapter, FormattedData } from './data';
-export { RequestAdapter, RequestStatus } from './request';
+/* eslint-disable */
+
+/**
+ * Do not use this, use NP `inspector` plugin instead.
+ * 
+ * @deprecated
+ */
+export * from '../../../../../plugins/inspector/public/adapters/index';
diff --git a/src/legacy/ui/public/inspector/build_tabular_inspector_data.js b/src/legacy/ui/public/inspector/build_tabular_inspector_data.js
deleted file mode 100644
index 8539f0e0833d1..0000000000000
--- a/src/legacy/ui/public/inspector/build_tabular_inspector_data.js
+++ /dev/null
@@ -1,68 +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 { set } from 'lodash';
-import { createFilter } from '../vis/vis_filters';
-import { FormattedData } from './adapters/data';
-
-/**
- * This function builds tabular data from the response and attaches it to the
- * inspector. It will only be called when the data view in the inspector is opened.
- */
-export async function buildTabularInspectorData(table, queryFilter) {
-  const aggConfigs = table.columns.map(column => column.aggConfig);
-  const rows = table.rows.map(row => {
-    return table.columns.reduce((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));
-      return prev;
-    }, {});
-  });
-
-  const columns = table.columns.map((col, colIndex) => {
-    const field = col.aggConfig.getField();
-    const isCellContentFilterable =
-      col.aggConfig.isFilterable()
-      && (!field || field.filterable);
-    return ({
-      name: col.name,
-      field: `col-${colIndex}-${col.aggConfig.id}`,
-      filter: isCellContentFilterable && (value => {
-        const rowIndex = rows.findIndex(row => row[`col-${colIndex}-${col.aggConfig.id}`].raw === value.raw);
-        const filter = createFilter(aggConfigs, table, colIndex, rowIndex, value.raw);
-        queryFilter.addFilters(filter);
-      }),
-      filterOut: isCellContentFilterable && (value => {
-        const rowIndex = rows.findIndex(row => row[`col-${colIndex}-${col.aggConfig.id}`].raw === value.raw);
-        const filter = createFilter(aggConfigs, table, colIndex, rowIndex, value.raw);
-        const notOther = value.raw !== '__other__';
-        const notMissing = value.raw !== '__missing__';
-        if (Array.isArray(filter)) {
-          filter.forEach(f => set(f, 'meta.negate', (notOther && notMissing)));
-        } else {
-          set(filter, 'meta.negate', (notOther && notMissing));
-        }
-        queryFilter.addFilters(filter);
-      }),
-    });
-  });
-
-  return { columns, rows };
-}
diff --git a/src/legacy/ui/public/inspector/build_tabular_inspector_data.ts b/src/legacy/ui/public/inspector/build_tabular_inspector_data.ts
new file mode 100644
index 0000000000000..ceeed4e9e1d67
--- /dev/null
+++ b/src/legacy/ui/public/inspector/build_tabular_inspector_data.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 { set } from 'lodash';
+// @ts-ignore
+import { createFilter } from '../vis/vis_filters';
+import { FormattedData } from './adapters';
+
+interface Column {
+  id: string;
+  name: string;
+  aggConfig: any;
+}
+
+interface Row {
+  [key: string]: any;
+}
+
+interface Table {
+  columns: Column[];
+  rows: Row[];
+}
+
+/**
+ * @deprecated
+ *
+ * Do not use this function.
+ *
+ * @todo This function is used only by Courier. Courier will
+ *   soon be removed, and this function will be deleted, too. If Courier is not removed,
+ *   move this function inside Courier.
+ *
+ * ---
+ *
+ * This function builds tabular data from the response and attaches it to the
+ * inspector. It will only be called when the data view in the inspector is opened.
+ */
+export async function buildTabularInspectorData(
+  table: Table,
+  queryFilter: { addFilters: (filter: any) => void }
+) {
+  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));
+      return prev;
+    }, {});
+  });
+
+  const columns = table.columns.map((col, colIndex) => {
+    const field = col.aggConfig.getField();
+    const isCellContentFilterable = col.aggConfig.isFilterable() && (!field || field.filterable);
+    return {
+      name: col.name,
+      field: `col-${colIndex}-${col.aggConfig.id}`,
+      filter:
+        isCellContentFilterable &&
+        ((value: { raw: unknown }) => {
+          const rowIndex = rows.findIndex(
+            row => row[`col-${colIndex}-${col.aggConfig.id}`].raw === value.raw
+          );
+          const filter = createFilter(aggConfigs, table, colIndex, rowIndex, value.raw);
+          queryFilter.addFilters(filter);
+        }),
+      filterOut:
+        isCellContentFilterable &&
+        ((value: { raw: unknown }) => {
+          const rowIndex = rows.findIndex(
+            row => row[`col-${colIndex}-${col.aggConfig.id}`].raw === value.raw
+          );
+          const filter = createFilter(aggConfigs, table, colIndex, rowIndex, value.raw);
+          const notOther = value.raw !== '__other__';
+          const notMissing = value.raw !== '__missing__';
+          if (Array.isArray(filter)) {
+            filter.forEach(f => set(f, 'meta.negate', notOther && notMissing));
+          } else {
+            set(filter, 'meta.negate', notOther && notMissing);
+          }
+          queryFilter.addFilters(filter);
+        }),
+    };
+  });
+
+  return { columns, rows };
+}
diff --git a/src/legacy/ui/public/inspector/index.ts b/src/legacy/ui/public/inspector/index.ts
index 8169e544cbb45..db82508f36ada 100644
--- a/src/legacy/ui/public/inspector/index.ts
+++ b/src/legacy/ui/public/inspector/index.ts
@@ -17,10 +17,6 @@
  * under the License.
  */
 
-export { InspectorView } from './ui';
-
 export { Inspector } from './inspector';
-
 export { viewRegistry } from './view_registry';
-
 export { Adapters } from './types';
diff --git a/src/legacy/ui/public/inspector/inspector.test.js b/src/legacy/ui/public/inspector/inspector.test.js
deleted file mode 100644
index 75b7804d47ffb..0000000000000
--- a/src/legacy/ui/public/inspector/inspector.test.js
+++ /dev/null
@@ -1,66 +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 { Inspector } from './inspector';
-jest.mock('./view_registry', () => ({
-  viewRegistry: {
-    getVisible: jest.fn(),
-  },
-}));
-jest.mock('./ui/inspector_panel', () => ({
-  InspectorPanel: () => 'InspectorPanel',
-}));
-jest.mock('ui/i18n', () => ({ I18nContext: ({ children }) => children }));
-
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    core: {
-      overlay: {
-        openFlyout: jest.fn(),
-      },
-    }
-  },
-}));
-
-import { viewRegistry } from './view_registry';
-
-function setViews(views) {
-  viewRegistry.getVisible.mockImplementation(() => views);
-}
-
-describe('Inspector', () => {
-  describe('isAvailable()', () => {
-    it('should return false if no view would be available', () => {
-      setViews([]);
-      expect(Inspector.isAvailable({})).toBe(false);
-    });
-
-    it('should return true if views would be available', () => {
-      setViews([{}]);
-      expect(Inspector.isAvailable({})).toBe(true);
-    });
-  });
-
-  describe('open()', () => {
-    it('should throw an error if no views available', () => {
-      setViews([]);
-      expect(() => Inspector.open({})).toThrow();
-    });
-  });
-});
diff --git a/src/legacy/ui/public/inspector/inspector.tsx b/src/legacy/ui/public/inspector/inspector.tsx
index 84e03df440e41..d65245c11cfe1 100644
--- a/src/legacy/ui/public/inspector/inspector.tsx
+++ b/src/legacy/ui/public/inspector/inspector.tsx
@@ -16,75 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
 
-import { i18n } from '@kbn/i18n';
-import { OverlayRef } from '../../../../core/public';
 import { npStart } from '../new_platform';
-import { Adapters } from './types';
-import { InspectorPanel } from './ui/inspector_panel';
-import { viewRegistry } from './view_registry';
-
-const closeButtonLabel = i18n.translate('common.ui.inspector.closeButton', {
-  defaultMessage: 'Close Inspector',
-});
+export { InspectorSession } from '../../../../plugins/inspector/public';
 
 /**
- * Checks if a inspector panel could be shown based on the passed adapters.
+ * @deprecated
  *
- * @param {object} adapters - An object of adapters. This should be the same
- *    you would pass into `open`.
- * @returns {boolean} True, if a call to `open` with the same adapters
- *    would have shown the inspector panel, false otherwise.
- */
-function isAvailable(adapters?: Adapters): boolean {
-  return viewRegistry.getVisible(adapters).length > 0;
-}
-
-/**
- * Options that can be specified when opening the inspector.
- * @property {string} title - An optional title, that will be shown in the header
- *    of the inspector. Can be used to give more context about what is being inspected.
+ * Do not use this, use New Platform `inspector` plugin instead.
  */
-interface InspectorOptions {
-  title?: string;
-}
-
-export type InspectorSession = OverlayRef;
-
-/**
- * Opens the inspector panel for the given adapters and close any previously opened
- * inspector panel. The previously panel will be closed also if no new panel will be
- * opened (e.g. because of the passed adapters no view is available). You can use
- * {@link InspectorSession#close} on the return value to close that opened panel again.
- *
- * @param {object} adapters - An object of adapters for which you want to show
- *    the inspector panel.
- * @param {InspectorOptions} options - Options that configure the inspector. See InspectorOptions type.
- * @return {InspectorSession} The session instance for the opened inspector.
- */
-function open(adapters: Adapters, options: InspectorOptions = {}): InspectorSession {
-  const views = viewRegistry.getVisible(adapters);
-
-  // Don't open inspector if there are no views available for the passed adapters
-  if (!views || views.length === 0) {
-    throw new Error(`Tried to open an inspector without views being available.
-      Make sure to call Inspector.isAvailable() with the same adapters before to check
-      if an inspector can be shown.`);
-  }
-
-  return npStart.core.overlays.openFlyout(
-    <InspectorPanel views={views} adapters={adapters} title={options.title} />,
-    {
-      'data-test-subj': 'inspectorPanel',
-      closeButtonAriaLabel: closeButtonLabel,
-    }
-  );
-}
-
-const Inspector = {
-  isAvailable,
-  open,
+export const Inspector = {
+  /**
+   * @deprecated
+   *
+   * Do not use this, use New Platform `inspector` plugin instead.
+   */
+  isAvailable: npStart.plugins.inspector.isAvailable,
+
+  /**
+   * @deprecated
+   *
+   * Do not use this, use New Platform `inspector` plugin instead.
+   */
+  open: npStart.plugins.inspector.open,
 };
-
-export { Inspector };
diff --git a/src/legacy/ui/public/inspector/types.ts b/src/legacy/ui/public/inspector/types.ts
index 668e9347cc56c..98f2cf487eb43 100644
--- a/src/legacy/ui/public/inspector/types.ts
+++ b/src/legacy/ui/public/inspector/types.ts
@@ -18,46 +18,16 @@
  */
 
 /**
- * The interface that the adapters used to open an inspector have to fullfill.
- */
-export interface Adapters {
-  [key: string]: any;
-}
-
-/**
- * The props interface that a custom inspector view component, that will be passed
- * to {@link InspectorViewDescription#component}, must use.
- */
-export interface InspectorViewProps {
-  /**
-   * The adapters thta has been used to open the inspector.
-   */
-  adapters: Adapters;
-  /**
-   * The title that the inspector is currently using e.g. a visualization name.
-   */
-  title: string;
-}
-
-/**
- * An object describing an inspector view.
- * @typedef {object} InspectorViewDescription
- * @property {string} title - The title that will be used to present that view.
- * @property {string} icon - An icon name to present this view. Must match an EUI icon.
- * @property {React.ComponentType<InspectorViewProps>} component - The actual React component to render that
- *    that view. It should always return an `InspectorView` element at the toplevel.
- * @property {number} [order=9000] - An order for this view. Views are ordered from lower
- *    order values to higher order values in the UI.
- * @property {string} [help=''] - An help text for this view, that gives a brief description
- *    of this view.
- * @property {viewShouldShowFunc} [shouldShow] - A function, that determines whether
- *    this view should be visible for a given collection of adapters. If not specified
- *    the view will always be visible.
+ * Do not import these types from here, instead import them from `inspector` plugin.
+ *
+ * ```ts
+ * import { InspectorViewDescription } from 'src/plugins/inspector/public';
+ * ```
+ *
+ * @deprecated
  */
-export interface InspectorViewDescription {
-  component: React.ComponentType<InspectorViewProps>;
-  help?: string;
-  order?: number;
-  shouldShow?: (adapters: Adapters) => boolean;
-  title: string;
-}
+export {
+  Adapters,
+  InspectorViewProps,
+  InspectorViewDescription,
+} from '../../../../plugins/inspector/public';
diff --git a/src/legacy/ui/public/inspector/ui/_index.scss b/src/legacy/ui/public/inspector/ui/_index.scss
deleted file mode 100644
index e5cd29059a8a6..0000000000000
--- a/src/legacy/ui/public/inspector/ui/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './inspector';
diff --git a/src/legacy/ui/public/inspector/ui/_inspector.scss b/src/legacy/ui/public/inspector/ui/_inspector.scss
deleted file mode 100644
index 88962905854e0..0000000000000
--- a/src/legacy/ui/public/inspector/ui/_inspector.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.kbnInspectorView--flex {
-  display: flex;
-}
diff --git a/src/legacy/ui/public/storage/storage_service.ts b/src/legacy/ui/public/inspector/ui/inspector_panel.tsx
similarity index 81%
rename from src/legacy/ui/public/storage/storage_service.ts
rename to src/legacy/ui/public/inspector/ui/inspector_panel.tsx
index eb697be0ac07a..92ed169bf15e8 100644
--- a/src/legacy/ui/public/storage/storage_service.ts
+++ b/src/legacy/ui/public/inspector/ui/inspector_panel.tsx
@@ -17,7 +17,11 @@
  * under the License.
  */
 
-import { Storage } from './storage';
+/* eslint-disable */
 
-export const localStorage = new Storage(window.localStorage);
-export const sessionStorage = new Storage(window.sessionStorage);
+/**
+ * Do not use this, use NP `inspector` plugin instead.
+ * 
+ * @deprecated
+ */
+export * from '../../../../../plugins/inspector/public/ui/inspector_panel';
diff --git a/src/legacy/ui/public/inspector/ui/inspector_view.tsx b/src/legacy/ui/public/inspector/ui/inspector_view.tsx
deleted file mode 100644
index 45d7c95d0d7d9..0000000000000
--- a/src/legacy/ui/public/inspector/ui/inspector_view.tsx
+++ /dev/null
@@ -1,45 +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 classNames from 'classnames';
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import { EuiFlyoutBody } from '@elastic/eui';
-
-/**
- * The InspectorView component should be the top most element in every implemented
- * inspector view. It makes sure, that the appropriate stylings are applied to the
- * view.
- */
-const InspectorView: React.SFC<{ useFlex?: boolean }> = ({ useFlex, children }) => {
-  const classes = classNames({
-    'kbnInspectorView--flex': Boolean(useFlex),
-  });
-  return <EuiFlyoutBody className={classes}>{children}</EuiFlyoutBody>;
-};
-
-InspectorView.propTypes = {
-  /**
-   * Set to true if the element should have display: flex set.
-   */
-  useFlex: PropTypes.bool,
-};
-
-export { InspectorView };
diff --git a/src/legacy/ui/public/inspector/ui/inspector_view_chooser.tsx b/src/legacy/ui/public/inspector/ui/inspector_view_chooser.tsx
new file mode 100644
index 0000000000000..017e5c91095f6
--- /dev/null
+++ b/src/legacy/ui/public/inspector/ui/inspector_view_chooser.tsx
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint-disable */
+
+/**
+ * Do not use this, use NP `inspector` plugin instead.
+ * 
+ * @deprecated
+ */
+export * from '../../../../../plugins/inspector/public/ui/inspector_view_chooser';
diff --git a/src/legacy/ui/public/inspector/view_registry.ts b/src/legacy/ui/public/inspector/view_registry.ts
index a4be902fc8ee1..199087960ba89 100644
--- a/src/legacy/ui/public/inspector/view_registry.ts
+++ b/src/legacy/ui/public/inspector/view_registry.ts
@@ -17,66 +17,19 @@
  * under the License.
  */
 
-import { EventEmitter } from 'events';
-import { Adapters, InspectorViewDescription } from './types';
+import { npSetup } from 'ui/new_platform';
+export { InspectorViewDescription } from './types';
 
 /**
- * @callback viewShouldShowFunc
- * @param {object} adapters - A list of adapters to check whether or not this view
- *    should be shown for.
- * @returns {boolean} true - if this view should be shown for the given adapters.
- */
-
-/**
- * A registry that will hold inspector views.
- */
-class InspectorViewRegistry extends EventEmitter {
-  private views: InspectorViewDescription[] = [];
-
-  /**
-   * Register a new inspector view to the registry. Check the README.md in the
-   * inspector directory for more information of the object format to register
-   * here. This will also emit a 'change' event on the registry itself.
-   *
-   * @param {InspectorViewDescription} view - The view description to add to the registry.
-   */
-  public register(view: InspectorViewDescription): void {
-    if (!view) {
-      return;
-    }
-    this.views.push(view);
-    // Keep registry sorted by the order property
-    this.views.sort((a, b) => (a.order || Number.MAX_VALUE) - (b.order || Number.MAX_VALUE));
-    this.emit('change');
-  }
-
-  /**
-   * Retrieve all views currently registered with the registry.
-   * @returns {InspectorViewDescription[]} A by `order` sorted list of all registered
-   *    inspector views.
-   */
-  public getAll(): InspectorViewDescription[] {
-    return this.views;
-  }
-
-  /**
-   * Retrieve all registered views, that want to be visible for the specified adapters.
-   * @param {object} adapters - an adapter configuration
-   * @returns {InspectorViewDescription[]} All inespector view descriptions visible
-   *    for the specific adapters.
-   */
-  public getVisible(adapters?: Adapters): InspectorViewDescription[] {
-    if (!adapters) {
-      return [];
-    }
-    return this.views.filter(view => !view.shouldShow || view.shouldShow(adapters));
-  }
-}
-
-/**
- * The global view registry. In the long run this should be solved by a registry
- * system introduced by the new platform instead, to not keep global state like that.
+ * Do not use this, instead use `inspector` plugin directly.
+ *
+ * ```ts
+ * import { npSetup } from 'ui/new_platform';
+ *
+ * npSetup.plugins.inspector.registerView(view);
+ * ```
+ *
+ * @deprecated
  */
-const viewRegistry = new InspectorViewRegistry();
-
-export { viewRegistry, InspectorViewRegistry, InspectorViewDescription };
+export const viewRegistry =
+  npSetup.plugins.inspector.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.views;
diff --git a/src/legacy/ui/public/kbn_top_nav/kbn_top_nav2.js b/src/legacy/ui/public/kbn_top_nav/kbn_top_nav2.js
index 8c1feb922a25b..e4af4192a7fd0 100644
--- a/src/legacy/ui/public/kbn_top_nav/kbn_top_nav2.js
+++ b/src/legacy/ui/public/kbn_top_nav/kbn_top_nav2.js
@@ -22,6 +22,8 @@ import { wrapInI18nContext } from 'ui/i18n';
 import { uiModules } from 'ui/modules';
 import { TopNavMenu } from '../../../core_plugins/kibana_react/public';
 import { Storage } from 'ui/storage';
+import chrome from 'ui/chrome';
+
 
 const module = uiModules.get('kibana');
 
@@ -44,12 +46,14 @@ module.directive('kbnTopNavV2', () => {
       // Pass in storage
       const localStorage = new Storage(window.localStorage);
       child.setAttribute('store', 'store');
+      child.setAttribute('ui-settings', 'uiSettings');
 
       // Append helper directive
       elem.append(child);
 
       const linkFn = ($scope, _, $attr) => {
         $scope.store = localStorage;
+        $scope.uiSettings = chrome.getUiSettingsClient();
 
         // Watch config changes
         $scope.$watch(() => {
@@ -89,6 +93,7 @@ module.directive('kbnTopNavV2Helper', (reactDirective) => {
 
       ['query', { watchDepth: 'reference' }],
       ['store', { watchDepth: 'reference' }],
+      ['uiSettings', { watchDepth: 'reference' }],
       ['intl', { watchDepth: 'reference' }],
       ['store', { watchDepth: 'reference' }],
 
diff --git a/src/legacy/ui/public/new_platform/__mocks__/helpers.ts b/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
index 439d158802659..838d94264848d 100644
--- a/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
+++ b/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
@@ -17,16 +17,20 @@
  * under the License.
  */
 
+/* eslint-disable @kbn/eslint/no-restricted-paths */
 import { coreMock } from '../../../../../core/public/mocks';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { dataPluginMock } from '../../../../../plugins/data/public/mocks';
+import { inspectorPluginMock } from '../../../../../plugins/inspector/public/mocks';
+/* eslint-enable @kbn/eslint/no-restricted-paths */
 
 export const pluginsMock = {
   createSetup: () => ({
     data: dataPluginMock.createSetupContract(),
+    inspector: inspectorPluginMock.createSetupContract(),
   }),
   createStart: () => ({
     data: dataPluginMock.createStartContract(),
+    inspector: inspectorPluginMock.createStartContract(),
   }),
 };
 
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index c66f4aa5bc2b3..ecbf514892a2e 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -29,6 +29,14 @@ export const npSetup = {
         registerType: sinon.fake(),
       },
     },
+    inspector: {
+      registerView: () => undefined,
+      __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+        views: {
+          register: () => undefined,
+        },
+      },
+    },
   },
 };
 
@@ -36,6 +44,13 @@ export const npStart = {
   core: {},
   plugins: {
     data: {},
+    inspector: {
+      isAvailable: () => false,
+      open: () => ({
+        onClose: Promise.resolve(undefined),
+        close: () => Promise.resolve(undefined),
+      }),
+    },
   },
 };
 
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index cfcf99fcbc9f2..5e0eb2feeb450 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -18,13 +18,19 @@
  */
 import { InternalCoreSetup, InternalCoreStart } from '../../../../core/public';
 import { Plugin as DataPlugin } from '../../../../plugins/data/public';
+import {
+  Setup as InspectorSetup,
+  Start as InspectorStart,
+} from '../../../../plugins/inspector/public';
 
 export interface PluginsSetup {
   data: ReturnType<DataPlugin['setup']>;
+  inspector: InspectorSetup;
 }
 
 export interface PluginsStart {
   data: ReturnType<DataPlugin['start']>;
+  inspector: InspectorStart;
 }
 
 export const npSetup = {
diff --git a/src/legacy/ui/public/styles/_legacy/components/_table.scss b/src/legacy/ui/public/styles/_legacy/components/_table.scss
index 94f30fa1f3498..e7c1bda829f0e 100644
--- a/src/legacy/ui/public/styles/_legacy/components/_table.scss
+++ b/src/legacy/ui/public/styles/_legacy/components/_table.scss
@@ -33,14 +33,14 @@ table {
     button.fa-sort-down,
     i.fa-sort-asc,
     i.fa-sort-down {
-      color: $euiColorLightShade;
+      color: $euiColorPrimary;
     }
 
     button.fa-sort-desc,
     button.fa-sort-up,
     i.fa-sort-desc,
     i.fa-sort-up {
-      color: $euiColorLightShade;
+      color: $euiColorPrimary;
     }
   }
 }
diff --git a/src/legacy/ui/public/vis/editors/default/components/__snapshots__/default_editor_agg.test.tsx.snap b/src/legacy/ui/public/vis/editors/default/components/__snapshots__/default_editor_agg.test.tsx.snap
new file mode 100644
index 0000000000000..5790e0d4e872f
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/components/__snapshots__/default_editor_agg.test.tsx.snap
@@ -0,0 +1,69 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DefaultEditorAgg component should init with the default set of props 1`] = `
+<EuiAccordion
+  aria-label="Toggle Schema name editor"
+  buttonClassName="eui-textTruncate"
+  buttonContent={
+    <React.Fragment>
+      Schema name
+       
+    </React.Fragment>
+  }
+  buttonContentClassName="visEditorSidebar__aggGroupAccordionButtonContent eui-textTruncate"
+  className="visEditorSidebar__section visEditorSidebar__collapsible visEditorSidebar__collapsible--marginBottom"
+  data-test-subj="visEditorAggAccordion1"
+  extraAction={
+    <div>
+      <EuiToolTip
+        content="Enable aggregation"
+        delay="regular"
+        position="bottom"
+      >
+        <EuiButtonIcon
+          aria-label="Enable aggregation"
+          color="text"
+          data-test-subj="toggleDisableAggregationBtn enable"
+          iconSize="m"
+          iconType="eyeClosed"
+          onClick={[Function]}
+          type="button"
+        />
+      </EuiToolTip>
+    </div>
+  }
+  id="visEditorAggAccordion1"
+  initialIsOpen={true}
+  onToggle={[Function]}
+  paddingSize="none"
+>
+  <EuiSpacer
+    size="m"
+  />
+  <DefaultEditorAggParams
+    agg={
+      Object {
+        "brandNew": true,
+        "getIndexPattern": [Function],
+        "id": 1,
+        "params": Object {},
+        "schema": Object {
+          "title": "Schema name",
+        },
+        "title": "Metrics",
+      }
+    }
+    aggIndex={0}
+    aggIsTooLow={false}
+    formIsTouched={false}
+    groupName="metrics"
+    indexPattern={Object {}}
+    metricAggs={Array []}
+    onAggParamsChange={[MockFunction]}
+    onAggTypeChange={[Function]}
+    setTouched={[MockFunction]}
+    setValidity={[Function]}
+    state={Object {}}
+  />
+</EuiAccordion>
+`;
diff --git a/src/legacy/ui/public/vis/editors/default/components/__snapshots__/default_editor_agg_group.test.tsx.snap b/src/legacy/ui/public/vis/editors/default/components/__snapshots__/default_editor_agg_group.test.tsx.snap
new file mode 100644
index 0000000000000..813b7978d2667
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/components/__snapshots__/default_editor_agg_group.test.tsx.snap
@@ -0,0 +1,42 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DefaultEditorAgg component should init with the default set of props 1`] = `
+<eui-drag-drop-context
+  onDragEnd={[Function]}
+>
+  <eui-panel
+    paddingSize="s"
+  >
+    <eui-title
+      size="xs"
+    >
+      <div>
+        Metrics
+      </div>
+    </eui-title>
+    <eui-spacer
+      size="s"
+    />
+    <eui-droppable
+      droppableId="agg_group_dnd_metrics"
+    >
+      <EuiDraggable
+        customDragHandle={true}
+        draggableId="agg_group_dnd_metrics_1"
+        index={0}
+        key="1"
+      >
+        <Component />
+      </EuiDraggable>
+      <EuiDraggable
+        customDragHandle={true}
+        draggableId="agg_group_dnd_metrics_3"
+        index={1}
+        key="3"
+      >
+        <Component />
+      </EuiDraggable>
+    </eui-droppable>
+  </eui-panel>
+</eui-drag-drop-context>
+`;
diff --git a/src/legacy/ui/public/vis/editors/default/components/default_editor_agg.test.tsx b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg.test.tsx
new file mode 100644
index 0000000000000..ce12b18cf777a
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg.test.tsx
@@ -0,0 +1,279 @@
+/*
+ * 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 { mount, shallow } from 'enzyme';
+import { VisState } from 'ui/vis';
+import { AggGroupNames } from '../agg_groups';
+import { DefaultEditorAgg, DefaultEditorAggProps } from './default_editor_agg';
+import { act } from 'react-dom/test-utils';
+import { DefaultEditorAggParams } from './default_editor_agg_params';
+
+jest.mock('./default_editor_agg_params', () => ({
+  DefaultEditorAggParams: () => null,
+}));
+
+describe('DefaultEditorAgg component', () => {
+  let defaultProps: DefaultEditorAggProps;
+  let onAggParamsChange: jest.Mock;
+  let setTouched: jest.Mock;
+  let onToggleEnableAgg: jest.Mock;
+  let removeAgg: jest.Mock;
+  let setValidity: jest.Mock;
+
+  beforeEach(() => {
+    onAggParamsChange = jest.fn();
+    setTouched = jest.fn();
+    onToggleEnableAgg = jest.fn();
+    removeAgg = jest.fn();
+    setValidity = jest.fn();
+
+    defaultProps = {
+      agg: {
+        id: 1,
+        brandNew: true,
+        getIndexPattern: () => ({}),
+        schema: { title: 'Schema name' },
+        title: 'Metrics',
+        params: {},
+      },
+      aggIndex: 0,
+      aggIsTooLow: false,
+      dragHandleProps: null,
+      formIsTouched: false,
+      groupName: AggGroupNames.Metrics,
+      isDraggable: false,
+      isLastBucket: false,
+      isRemovable: false,
+      metricAggs: [],
+      state: {} as VisState,
+      onAggParamsChange,
+      onAggTypeChange: () => {},
+      setValidity,
+      setTouched,
+      onToggleEnableAgg,
+      removeAgg,
+    };
+  });
+
+  it('should init with the default set of props', () => {
+    const comp = shallow(<DefaultEditorAgg {...defaultProps} />);
+
+    expect(comp).toMatchSnapshot();
+  });
+
+  it('should open accordion initially', () => {
+    const comp = shallow(<DefaultEditorAgg {...defaultProps} />);
+
+    expect(comp.props()).toHaveProperty('initialIsOpen', true);
+  });
+
+  it('should not show description when agg is invalid', () => {
+    defaultProps.agg.brandNew = false;
+    const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+
+    act(() => {
+      comp
+        .find(DefaultEditorAggParams)
+        .props()
+        .setValidity(false);
+    });
+    comp.update();
+    expect(setValidity).toBeCalledWith(false);
+
+    expect(
+      comp.find('.visEditorSidebar__aggGroupAccordionButtonContent span').exists()
+    ).toBeFalsy();
+  });
+
+  it('should show description when agg is valid', () => {
+    defaultProps.agg.brandNew = false;
+    defaultProps.agg.type = {
+      makeLabel: () => 'Agg description',
+    };
+    const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+
+    act(() => {
+      comp
+        .find(DefaultEditorAggParams)
+        .props()
+        .setValidity(true);
+    });
+    comp.update();
+    expect(setValidity).toBeCalledWith(true);
+
+    expect(comp.find('.visEditorSidebar__aggGroupAccordionButtonContent span').text()).toBe(
+      'Agg description'
+    );
+  });
+
+  it('should call setTouched when accordion is collapsed', () => {
+    const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+    expect(defaultProps.setTouched).toBeCalledTimes(0);
+
+    comp.find('.euiAccordion__button').simulate('click');
+    // make sure that the accordion is collapsed
+    expect(comp.find('.euiAccordion-isOpen').exists()).toBeFalsy();
+
+    expect(defaultProps.setTouched).toBeCalledWith(true);
+  });
+
+  it('should call setValidity inside onSetValidity', () => {
+    const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+
+    act(() => {
+      comp
+        .find(DefaultEditorAggParams)
+        .props()
+        .setValidity(false);
+    });
+
+    expect(setValidity).toBeCalledWith(false);
+
+    expect(
+      comp.find('.visEditorSidebar__aggGroupAccordionButtonContent span').exists()
+    ).toBeFalsy();
+  });
+
+  it('should add schema component', () => {
+    defaultProps.agg.schema = {
+      editorComponent: () => <div className="schemaComponent"></div>,
+    };
+    const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+
+    expect(comp.find('.schemaComponent').exists()).toBeTruthy();
+  });
+
+  describe('agg actions', () => {
+    beforeEach(() => {
+      defaultProps.agg.enabled = true;
+    });
+
+    it('should not have actions', () => {
+      const comp = shallow(<DefaultEditorAgg {...defaultProps} />);
+      const actions = shallow(comp.prop('extraAction'));
+
+      expect(actions.children().exists()).toBeFalsy();
+    });
+
+    it('should have disable and remove actions', () => {
+      defaultProps.isRemovable = true;
+      const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+
+      expect(
+        comp.find('[data-test-subj="toggleDisableAggregationBtn disable"] button').exists()
+      ).toBeTruthy();
+      expect(comp.find('[data-test-subj="removeDimensionBtn"] button').exists()).toBeTruthy();
+    });
+
+    it('should have draggable action', () => {
+      defaultProps.isDraggable = true;
+      const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+
+      expect(comp.find('[data-test-subj="dragHandleBtn"]').exists()).toBeTruthy();
+    });
+
+    it('should disable agg', () => {
+      defaultProps.isRemovable = true;
+      const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+      comp.find('[data-test-subj="toggleDisableAggregationBtn disable"] button').simulate('click');
+
+      expect(defaultProps.onToggleEnableAgg).toBeCalledWith(defaultProps.agg, false);
+    });
+
+    it('should enable agg', () => {
+      defaultProps.agg.enabled = false;
+      const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+      comp.find('[data-test-subj="toggleDisableAggregationBtn enable"] button').simulate('click');
+
+      expect(defaultProps.onToggleEnableAgg).toBeCalledWith(defaultProps.agg, true);
+    });
+
+    it('should call removeAgg', () => {
+      defaultProps.isRemovable = true;
+      const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+      comp.find('[data-test-subj="removeDimensionBtn"] button').simulate('click');
+
+      expect(defaultProps.removeAgg).toBeCalledWith(defaultProps.agg);
+    });
+  });
+
+  describe('last bucket', () => {
+    beforeEach(() => {
+      defaultProps.isLastBucket = true;
+      defaultProps.lastParentPipelineAggTitle = 'ParentPipelineAgg';
+    });
+
+    it('should disable min_doc_count when agg is histogram or date_histogram', () => {
+      defaultProps.agg.type = {
+        name: 'histogram',
+      };
+      const compHistogram = shallow(<DefaultEditorAgg {...defaultProps} />);
+      defaultProps.agg.type = {
+        name: 'date_histogram',
+      };
+      const compDateHistogram = shallow(<DefaultEditorAgg {...defaultProps} />);
+
+      expect(compHistogram.find(DefaultEditorAggParams).props()).toHaveProperty('disabledParams', [
+        'min_doc_count',
+      ]);
+      expect(compDateHistogram.find(DefaultEditorAggParams).props()).toHaveProperty(
+        'disabledParams',
+        ['min_doc_count']
+      );
+    });
+
+    it('should set error when agg is not histogram or date_histogram', () => {
+      defaultProps.agg.type = {
+        name: 'aggType',
+      };
+      const comp = shallow(<DefaultEditorAgg {...defaultProps} />);
+
+      expect(comp.find(DefaultEditorAggParams).prop('aggError')).toBeDefined();
+    });
+
+    it('should set min_doc_count to true when agg type was changed to histogram', () => {
+      defaultProps.agg.type = {
+        name: 'aggType',
+      };
+      const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+      comp.setProps({ agg: { ...defaultProps.agg, type: { name: 'histogram' } } });
+
+      expect(defaultProps.onAggParamsChange).toHaveBeenCalledWith(
+        defaultProps.agg.params,
+        'min_doc_count',
+        true
+      );
+    });
+
+    it('should set min_doc_count to 0 when agg type was changed to date_histogram', () => {
+      defaultProps.agg.type = {
+        name: 'aggType',
+      };
+      const comp = mount(<DefaultEditorAgg {...defaultProps} />);
+      comp.setProps({ agg: { ...defaultProps.agg, type: { name: 'date_histogram' } } });
+
+      expect(defaultProps.onAggParamsChange).toHaveBeenCalledWith(
+        defaultProps.agg.params,
+        'min_doc_count',
+        0
+      );
+    });
+  });
+});
diff --git a/src/legacy/ui/public/vis/editors/default/components/default_editor_agg.tsx b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg.tsx
index 7d6bc34ac06c9..40fb8a7b63a29 100644
--- a/src/legacy/ui/public/vis/editors/default/components/default_editor_agg.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg.tsx
@@ -32,7 +32,7 @@ import { AggConfig } from '../../../';
 import { DefaultEditorAggParams } from './default_editor_agg_params';
 import { DefaultEditorAggCommonProps } from './default_editor_agg_common_props';
 
-interface DefaultEditorAggProps extends DefaultEditorAggCommonProps {
+export interface DefaultEditorAggProps extends DefaultEditorAggCommonProps {
   agg: AggConfig;
   aggIndex: number;
   aggIsTooLow: boolean;
@@ -137,7 +137,7 @@ function DefaultEditorAgg({
         tooltip: i18n.translate('common.ui.vis.editors.agg.disableAggButtonTooltip', {
           defaultMessage: 'Disable aggregation',
         }),
-        dataTestSubj: 'toggleDisableAggregationBtn',
+        dataTestSubj: 'toggleDisableAggregationBtn disable',
       });
     }
     if (!agg.enabled) {
@@ -149,7 +149,7 @@ function DefaultEditorAgg({
         tooltip: i18n.translate('common.ui.vis.editors.agg.enableAggButtonTooltip', {
           defaultMessage: 'Enable aggregation',
         }),
-        dataTestSubj: 'toggleDisableAggregationBtn',
+        dataTestSubj: 'toggleDisableAggregationBtn enable',
       });
     }
     if (isDraggable) {
diff --git a/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group.test.tsx b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group.test.tsx
new file mode 100644
index 0000000000000..17be226e32db6
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group.test.tsx
@@ -0,0 +1,221 @@
+/*
+ * 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 { mount, shallow } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+import { VisState } from '../../../';
+import { Schema } from '../schemas';
+import { AggGroupNames } from '../agg_groups';
+import { AggConfig } from '../../../agg_config';
+import { AggConfigs } from '../../../agg_configs';
+import { DefaultEditorAggGroup, DefaultEditorAggGroupProps } from './default_editor_agg_group';
+import { DefaultEditorAgg } from './default_editor_agg';
+import { DefaultEditorAggAdd } from './default_editor_agg_add';
+
+jest.mock('@elastic/eui', () => ({
+  EuiTitle: 'eui-title',
+  EuiDragDropContext: 'eui-drag-drop-context',
+  EuiDroppable: 'eui-droppable',
+  EuiDraggable: (props: any) => props.children({ dragHandleProps: {} }),
+  EuiSpacer: 'eui-spacer',
+  EuiPanel: 'eui-panel',
+}));
+
+jest.mock('./default_editor_agg', () => ({
+  DefaultEditorAgg: () => <div />,
+}));
+
+jest.mock('./default_editor_agg_add', () => ({
+  DefaultEditorAggAdd: () => <div />,
+}));
+
+describe('DefaultEditorAgg component', () => {
+  let defaultProps: DefaultEditorAggGroupProps;
+  let aggs: AggConfigs;
+  let setTouched: jest.Mock;
+  let setValidity: jest.Mock;
+  let reorderAggs: jest.Mock;
+
+  beforeEach(() => {
+    setTouched = jest.fn();
+    setValidity = jest.fn();
+    reorderAggs = jest.fn();
+
+    aggs = [
+      {
+        id: 1,
+        title: 'Metrics',
+        params: {
+          field: {
+            type: 'number',
+          },
+        },
+        group: 'metrics',
+        schema: {},
+      },
+      {
+        id: 3,
+        title: 'Agg',
+        params: {
+          field: {
+            type: 'string',
+          },
+        },
+        group: 'metrics',
+        schema: {},
+      },
+      {
+        id: 2,
+        title: 'Buckets',
+        params: {
+          field: {
+            type: 'number',
+          },
+        },
+        group: 'buckets',
+        schema: {},
+      },
+    ] as AggConfigs;
+
+    Object.defineProperty(aggs, 'bySchemaGroup', {
+      get: () =>
+        aggs.reduce((acc: { [key: string]: AggConfig }, option: AggConfig) => {
+          if (acc[option.group]) {
+            acc[option.group].push(option);
+          } else {
+            acc[option.group] = [option];
+          }
+
+          return acc;
+        }, {}),
+    });
+
+    defaultProps = {
+      formIsTouched: false,
+      metricAggs: [],
+      groupName: AggGroupNames.Metrics,
+      state: {
+        aggs,
+      } as VisState,
+      schemas: [
+        {
+          max: 1,
+        } as Schema,
+        {
+          max: 1,
+        } as Schema,
+      ],
+      setTouched,
+      setValidity,
+      reorderAggs,
+      addSchema: () => {},
+      removeAgg: () => {},
+      onAggParamsChange: () => {},
+      onAggTypeChange: () => {},
+      onToggleEnableAgg: () => {},
+    };
+  });
+
+  it('should init with the default set of props', () => {
+    const comp = shallow(<DefaultEditorAggGroup {...defaultProps} />);
+
+    expect(comp).toMatchSnapshot();
+  });
+
+  it('should call setTouched with false', () => {
+    mount(<DefaultEditorAggGroup {...defaultProps} />);
+
+    expect(setTouched).toBeCalledWith(false);
+  });
+
+  it('should mark group as touched when all invalid aggs are touched', () => {
+    defaultProps.groupName = AggGroupNames.Buckets;
+    const comp = mount(<DefaultEditorAggGroup {...defaultProps} />);
+    act(() => {
+      const aggProps = comp.find(DefaultEditorAgg).props();
+      aggProps.setValidity(false);
+      aggProps.setTouched(true);
+    });
+
+    expect(setTouched).toBeCalledWith(true);
+  });
+
+  it('should mark group as touched when the form applied', () => {
+    const comp = mount(<DefaultEditorAggGroup {...defaultProps} />);
+    act(() => {
+      comp
+        .find(DefaultEditorAgg)
+        .first()
+        .props()
+        .setValidity(false);
+    });
+    expect(setTouched).toBeCalledWith(false);
+    comp.setProps({ formIsTouched: true });
+
+    expect(setTouched).toBeCalledWith(true);
+  });
+
+  it('should mark group as invalid when at least one agg is invalid', () => {
+    const comp = mount(<DefaultEditorAggGroup {...defaultProps} />);
+    act(() => {
+      comp
+        .find(DefaultEditorAgg)
+        .first()
+        .props()
+        .setValidity(false);
+    });
+
+    expect(setValidity).toBeCalledWith(false);
+  });
+
+  it('should last bucket has truthy isLastBucket prop', () => {
+    defaultProps.groupName = AggGroupNames.Buckets;
+    const comp = mount(<DefaultEditorAggGroup {...defaultProps} />);
+    const lastAgg = comp.find(DefaultEditorAgg).last();
+
+    expect(lastAgg.props()).toHaveProperty('isLastBucket', true);
+  });
+
+  it('should call reorderAggs when dragging ended', () => {
+    const comp = shallow(<DefaultEditorAggGroup {...defaultProps} />);
+    act(() => {
+      // simulate dragging ending
+      comp.props().onDragEnd({ source: { index: 0 }, destination: { index: 1 } });
+    });
+
+    expect(reorderAggs).toHaveBeenCalledWith([
+      defaultProps.state.aggs[1],
+      defaultProps.state.aggs[0],
+    ]);
+  });
+
+  it('should show add button when schemas count is less than max', () => {
+    defaultProps.groupName = AggGroupNames.Buckets;
+    const comp = shallow(<DefaultEditorAggGroup {...defaultProps} />);
+
+    expect(comp.find(DefaultEditorAggAdd).exists()).toBeTruthy();
+  });
+
+  it('should not show add button when schemas count is not less than max', () => {
+    const comp = shallow(<DefaultEditorAggGroup {...defaultProps} />);
+
+    expect(comp.find(DefaultEditorAggAdd).exists()).toBeFalsy();
+  });
+});
diff --git a/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group.tsx b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group.tsx
index 4a5f012f8783c..d645efa818c14 100644
--- a/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group.tsx
@@ -40,7 +40,7 @@ import {
 import { aggGroupReducer, initAggsState, AGGS_ACTION_KEYS } from './default_editor_agg_group_state';
 import { Schema } from '../schemas';
 
-interface DefaultEditorAggGroupProps extends DefaultEditorAggCommonProps {
+export interface DefaultEditorAggGroupProps extends DefaultEditorAggCommonProps {
   schemas: Schema[];
   addSchema: (schems: Schema) => void;
   reorderAggs: (group: AggConfig[]) => void;
diff --git a/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group_helper.test.ts b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group_helper.test.ts
new file mode 100644
index 0000000000000..36b5ad82ae29f
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group_helper.test.ts
@@ -0,0 +1,139 @@
+/*
+ * 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 { AggConfig } from '../../../agg_config';
+import {
+  isAggRemovable,
+  calcAggIsTooLow,
+  isInvalidAggsTouched,
+} from './default_editor_agg_group_helper';
+import { AggsState } from './default_editor_agg_group_state';
+
+describe('DefaultEditorGroup helpers', () => {
+  let group: AggConfig;
+
+  beforeEach(() => {
+    group = [
+      {
+        id: 1,
+        title: 'Test1',
+        params: {
+          field: {
+            type: 'number',
+          },
+        },
+        group: 'metrics',
+        schema: { name: 'metric', min: 1, mustBeFirst: true },
+      },
+      {
+        id: 2,
+        title: 'Test2',
+        params: {
+          field: {
+            type: 'string',
+          },
+        },
+        group: 'metrics',
+        schema: { name: 'metric', min: 2 },
+      },
+    ];
+  });
+  describe('isAggRemovable', () => {
+    it('should return true when the number of aggs with the same schema is above the min', () => {
+      const isRemovable = isAggRemovable(group[0], group);
+
+      expect(isRemovable).toBeTruthy();
+    });
+
+    it('should return false when the number of aggs with the same schema is not above the min', () => {
+      const isRemovable = isAggRemovable(group[1], group);
+
+      expect(isRemovable).toBeFalsy();
+    });
+  });
+
+  describe('calcAggIsTooLow', () => {
+    it('should return false when agg.schema.mustBeFirst has falsy value', () => {
+      const isRemovable = calcAggIsTooLow(group[1], 0, group);
+
+      expect(isRemovable).toBeFalsy();
+    });
+
+    it('should return false when there is no different schema', () => {
+      group[1].schema = group[0].schema;
+      const isRemovable = calcAggIsTooLow(group[0], 0, group);
+
+      expect(isRemovable).toBeFalsy();
+    });
+
+    it('should return false when different schema is not less than agg index', () => {
+      const isRemovable = calcAggIsTooLow(group[0], 0, group);
+
+      expect(isRemovable).toBeFalsy();
+    });
+
+    it('should return true when agg index is greater than different schema index', () => {
+      const isRemovable = calcAggIsTooLow(group[0], 2, group);
+
+      expect(isRemovable).toBeTruthy();
+    });
+  });
+
+  describe('isInvalidAggsTouched', () => {
+    let aggsState: AggsState;
+
+    beforeEach(() => {
+      aggsState = {
+        1: {
+          valid: true,
+          touched: false,
+        },
+        2: {
+          valid: true,
+          touched: false,
+        },
+        3: {
+          valid: true,
+          touched: false,
+        },
+      };
+    });
+
+    it('should return false when there are no invalid aggs', () => {
+      const isAllInvalidAggsTouched = isInvalidAggsTouched(aggsState);
+
+      expect(isAllInvalidAggsTouched).toBeFalsy();
+    });
+
+    it('should return false when not all invalid aggs are touched', () => {
+      aggsState[1].valid = false;
+      const isAllInvalidAggsTouched = isInvalidAggsTouched(aggsState);
+
+      expect(isAllInvalidAggsTouched).toBeFalsy();
+    });
+
+    it('should return true when all invalid aggs are touched', () => {
+      aggsState[1].valid = false;
+      aggsState[1].touched = true;
+      const isAllInvalidAggsTouched = isInvalidAggsTouched(aggsState);
+
+      expect(isAllInvalidAggsTouched).toBeTruthy();
+    });
+  });
+});
diff --git a/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group_helper.tsx b/src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group_helper.ts
similarity index 100%
rename from src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group_helper.tsx
rename to src/legacy/ui/public/vis/editors/default/components/default_editor_agg_group_helper.ts
diff --git a/src/legacy/ui/public/visualize/loader/__tests__/visualize_loader.js b/src/legacy/ui/public/visualize/loader/__tests__/visualize_loader.js
index f48e2014385b5..aedb2f016b50d 100644
--- a/src/legacy/ui/public/visualize/loader/__tests__/visualize_loader.js
+++ b/src/legacy/ui/public/visualize/loader/__tests__/visualize_loader.js
@@ -36,8 +36,7 @@ import { dispatchRenderComplete } from '../../../render_complete';
 import { PipelineDataLoader } from '../pipeline_data_loader';
 import { VisualizeDataLoader } from '../visualize_data_loader';
 import { PersistedState } from '../../../persisted_state';
-import { DataAdapter } from '../../../inspector/adapters/data';
-import { RequestAdapter } from '../../../inspector/adapters/request';
+import { DataAdapter, RequestAdapter } from '../../../inspector/adapters';
 
 describe('visualize loader', () => {
 
diff --git a/src/plugins/inspector/README.md b/src/plugins/inspector/README.md
new file mode 100644
index 0000000000000..e56db65cb90cb
--- /dev/null
+++ b/src/plugins/inspector/README.md
@@ -0,0 +1,122 @@
+# Inspector
+
+The inspector is a contextual tool to gain insights into different elements
+in Kibana, e.g. visualizations. It has the form of a flyout panel.
+
+## Inspector Views
+
+The "Inspector Panel" can have multiple so called "Inspector Views" inside of it.
+These views are used to gain different information into the element you are inspecting.
+There is a request inspector view to gain information in the requests done for this
+element or a data inspector view to inspect the underlying data. Whether or not
+a specific view is available depends on the used adapters.
+
+## Inspector Adapters
+
+Since the Inspector panel itself is not tied to a specific type of elements (visualizations,
+saved searches, etc.), everything you need to open the inspector is a collection
+of so called inspector adapters. A single adapter can be any type of JavaScript class.
+
+Most likely an adapter offers some kind of logging capabilities for the element, that
+uses it e.g. the request adapter allows element (like visualizations) to log requests
+they make.
+
+The corresponding inspector view will then use the information inside the adapter
+to present the data in the panel. That concept allows different types of elements
+to use the Inspector panel, while they can use completely or partial different adapters
+and inspector views than other elements.
+
+For example a visualization could provide the request and data adapter while a saved
+search could only provide the request adapter and a Vega visualization could additionally
+provide a Vega adapter.
+
+There is no 1 to 1 relationship between adapters and views. An adapter could be used
+by multiple views and a view can use data from multiple adapters. It's up to the
+view to decide whether or not it wants to be shown for a given adapters list.
+
+## Develop custom inspectors
+
+You can extend the inspector panel by adding custom inspector views and inspector
+adapters via a plugin.
+
+### Develop inspector views
+
+To develop custom inspector views you can define your
+inspector view as follows:
+
+```js
+import React from 'react';
+import { viewRegistry } from 'ui/inspector';
+
+function MyInspectorComponent(props) {
+  // props.adapters is the object of all adapters and may vary depending
+  // on who and where this inspector was opened. You should check for all
+  // adapters you need, in the below shouldShow method, before accessing
+  // them here.
+  return (
+    <>
+      My custom view....
+    </>
+  );
+}
+
+const MyLittleInspectorView = {
+  // Title shown to select this view
+  title: 'Display Name',
+  // An icon id from the EUI icon list
+  icon: 'iconName',
+  // An order to sort the views (lower means first)
+  order: 10,
+  // An additional helptext, that wil
+  help: `And additional help text, that will be shown in the inspector help.`,
+  shouldShow(adapters) {
+    // Only show if `someAdapter` is available. Make sure to check for
+    // all adapters that you want to access in your view later on and
+    // any additional condition you want to be true to be shown.
+    return adapters.someAdapter;
+  },
+  // A React component, that will be used for rendering
+  component: MyInspectorComponent
+};
+```
+
+Then register your view in *setup* life-cycle with `inspector` plugin.
+
+```ts
+class MyPlugin extends Plugin {
+  setup(core, { inspector }) {
+    inspector.registerView(MyLittleInspectorView);
+  }
+}
+```
+
+### Develop custom adapters
+
+An inspector adapter is just a plain JavaScript class, that can e.g. be attached
+to custom visualization types, so an inspector view can show additional information for this
+visualization.
+
+To add additional adapters to your visualization type, use the `inspectorAdapters.custom`
+object when defining the visualization type:
+
+```js
+class MyCustomInspectorAdapter {
+  // ....
+}
+
+// inside your visualization type description (usually passed to VisFactory.create...Type)
+{
+  // ...
+  inspectorAdapters: {
+    custom: {
+      someAdapter: MyCustomInspectorAdapter
+    }
+  }
+}
+```
+
+An instance of MyCustomInspectorAdapter will now be available on each visualization
+of that type and can be accessed via `vis.API.inspectorAdapters.someInspector`.
+
+Custom inspector views can now check for the presence of `adapters.someAdapter`
+in their `shouldShow` method and use this adapter in their component.
diff --git a/src/plugins/inspector/kibana.json b/src/plugins/inspector/kibana.json
new file mode 100644
index 0000000000000..39d3ff65eed53
--- /dev/null
+++ b/src/plugins/inspector/kibana.json
@@ -0,0 +1,6 @@
+{
+  "id": "inspector",
+  "version": "kibana",
+  "server": false,
+  "ui": true
+}
diff --git a/src/legacy/ui/public/inspector/adapters/data/data_adapter.ts b/src/plugins/inspector/public/adapters/data/data_adapter.ts
similarity index 100%
rename from src/legacy/ui/public/inspector/adapters/data/data_adapter.ts
rename to src/plugins/inspector/public/adapters/data/data_adapter.ts
diff --git a/src/legacy/ui/public/inspector/adapters/data/data_adapters.test.ts b/src/plugins/inspector/public/adapters/data/data_adapters.test.ts
similarity index 100%
rename from src/legacy/ui/public/inspector/adapters/data/data_adapters.test.ts
rename to src/plugins/inspector/public/adapters/data/data_adapters.test.ts
diff --git a/src/legacy/ui/public/inspector/adapters/data/formatted_data.ts b/src/plugins/inspector/public/adapters/data/formatted_data.ts
similarity index 100%
rename from src/legacy/ui/public/inspector/adapters/data/formatted_data.ts
rename to src/plugins/inspector/public/adapters/data/formatted_data.ts
diff --git a/src/legacy/ui/public/inspector/adapters/data/index.ts b/src/plugins/inspector/public/adapters/data/index.ts
similarity index 100%
rename from src/legacy/ui/public/inspector/adapters/data/index.ts
rename to src/plugins/inspector/public/adapters/data/index.ts
diff --git a/test/api_integration/services/index.js b/src/plugins/inspector/public/adapters/index.ts
similarity index 86%
rename from test/api_integration/services/index.js
rename to src/plugins/inspector/public/adapters/index.ts
index 2d363d1ac552b..8e1979ab33275 100644
--- a/test/api_integration/services/index.js
+++ b/src/plugins/inspector/public/adapters/index.ts
@@ -17,5 +17,5 @@
  * under the License.
  */
 
-export { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest';
-export { ChanceProvider } from './chance';
+export { DataAdapter, FormattedData } from './data';
+export { RequestAdapter, RequestStatus } from './request';
diff --git a/src/legacy/ui/public/inspector/adapters/request/index.ts b/src/plugins/inspector/public/adapters/request/index.ts
similarity index 100%
rename from src/legacy/ui/public/inspector/adapters/request/index.ts
rename to src/plugins/inspector/public/adapters/request/index.ts
diff --git a/src/legacy/ui/public/inspector/adapters/request/request_adapter.test.ts b/src/plugins/inspector/public/adapters/request/request_adapter.test.ts
similarity index 100%
rename from src/legacy/ui/public/inspector/adapters/request/request_adapter.test.ts
rename to src/plugins/inspector/public/adapters/request/request_adapter.test.ts
diff --git a/src/legacy/ui/public/inspector/adapters/request/request_adapter.ts b/src/plugins/inspector/public/adapters/request/request_adapter.ts
similarity index 100%
rename from src/legacy/ui/public/inspector/adapters/request/request_adapter.ts
rename to src/plugins/inspector/public/adapters/request/request_adapter.ts
diff --git a/src/legacy/ui/public/inspector/adapters/request/request_responder.ts b/src/plugins/inspector/public/adapters/request/request_responder.ts
similarity index 93%
rename from src/legacy/ui/public/inspector/adapters/request/request_responder.ts
rename to src/plugins/inspector/public/adapters/request/request_responder.ts
index 31aa56030d874..36ae6a147b999 100644
--- a/src/legacy/ui/public/inspector/adapters/request/request_responder.ts
+++ b/src/plugins/inspector/public/adapters/request/request_responder.ts
@@ -48,11 +48,11 @@ export class RequestResponder {
     const startDate = new Date(this.request.startTime);
 
     this.request.stats.requestTimestamp = {
-      label: i18n.translate('common.ui.inspector.reqTimestampKey', {
+      label: i18n.translate('inspector.reqTimestampKey', {
         defaultMessage: 'Request timestamp',
       }),
       value: startDate.toISOString(),
-      description: i18n.translate('common.ui.inspector.reqTimestampDescription', {
+      description: i18n.translate('inspector.reqTimestampDescription', {
         defaultMessage: 'Time when the start of the request has been logged',
       }),
     };
diff --git a/src/legacy/ui/public/inspector/adapters/request/types.ts b/src/plugins/inspector/public/adapters/request/types.ts
similarity index 100%
rename from src/legacy/ui/public/inspector/adapters/request/types.ts
rename to src/plugins/inspector/public/adapters/request/types.ts
diff --git a/src/plugins/inspector/public/index.ts b/src/plugins/inspector/public/index.ts
new file mode 100644
index 0000000000000..ad0c9b77e915e
--- /dev/null
+++ b/src/plugins/inspector/public/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.
+ */
+
+import { PluginInitializerContext } from '../../../core/public';
+import { InspectorPublicPlugin } from './plugin';
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new InspectorPublicPlugin(initializerContext);
+}
+
+export { InspectorPublicPlugin as Plugin, Setup, Start } from './plugin';
+export * from './types';
diff --git a/src/plugins/inspector/public/mocks.ts b/src/plugins/inspector/public/mocks.ts
new file mode 100644
index 0000000000000..0e605b1dd3069
--- /dev/null
+++ b/src/plugins/inspector/public/mocks.ts
@@ -0,0 +1,78 @@
+/*
+ * 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 { Setup as PluginSetup, Start as PluginStart } from '.';
+import { InspectorViewRegistry } from './view_registry';
+import { plugin as pluginInitializer } from '.';
+// eslint-disable-next-line
+import { coreMock } from '../../../core/public/mocks';
+
+export type Setup = jest.Mocked<PluginSetup>;
+export type Start = jest.Mocked<PluginStart>;
+
+const createSetupContract = (): Setup => {
+  const views = new InspectorViewRegistry();
+
+  const setupContract: Setup = {
+    registerView: jest.fn(views.register.bind(views)),
+
+    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+      views,
+    },
+  };
+  return setupContract;
+};
+
+const createStartContract = (): Start => {
+  const startContract: Start = {
+    isAvailable: jest.fn(),
+    open: jest.fn(),
+  };
+
+  const openResult = {
+    onClose: Promise.resolve(undefined),
+    close: jest.fn(() => Promise.resolve(undefined)),
+  } as ReturnType<Start['open']>;
+  startContract.open.mockImplementation(() => openResult);
+
+  return startContract;
+};
+
+const createPlugin = async () => {
+  const pluginInitializerContext = coreMock.createPluginInitializerContext();
+  const coreSetup = coreMock.createSetup();
+  const coreStart = coreMock.createStart();
+  const plugin = pluginInitializer(pluginInitializerContext);
+  const setup = await plugin.setup(coreSetup);
+
+  return {
+    pluginInitializerContext,
+    coreSetup,
+    coreStart,
+    plugin,
+    setup,
+    doStart: async () => await plugin.start(coreStart),
+  };
+};
+
+export const inspectorPluginMock = {
+  createSetupContract,
+  createStartContract,
+  createPlugin,
+};
diff --git a/src/plugins/inspector/public/plugin.tsx b/src/plugins/inspector/public/plugin.tsx
new file mode 100644
index 0000000000000..53a7adde9b3a6
--- /dev/null
+++ b/src/plugins/inspector/public/plugin.tsx
@@ -0,0 +1,112 @@
+/*
+ * 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 * as React from 'react';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { InspectorViewRegistry } from './view_registry';
+import { Adapters, InspectorOptions, InspectorSession } from './types';
+import { InspectorPanel } from './ui/inspector_panel';
+
+export interface Setup {
+  registerView: InspectorViewRegistry['register'];
+
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+    views: InspectorViewRegistry;
+  };
+}
+
+export interface Start {
+  /**
+   * Checks if a inspector panel could be shown based on the passed adapters.
+   *
+   * @param {object} adapters - An object of adapters. This should be the same
+   *    you would pass into `open`.
+   * @returns {boolean} True, if a call to `open` with the same adapters
+   *    would have shown the inspector panel, false otherwise.
+   */
+  isAvailable: (adapters?: Adapters) => boolean;
+
+  /**
+   * Opens the inspector panel for the given adapters and close any previously opened
+   * inspector panel. The previously panel will be closed also if no new panel will be
+   * opened (e.g. because of the passed adapters no view is available). You can use
+   * {@link InspectorSession#close} on the return value to close that opened panel again.
+   *
+   * @param {object} adapters - An object of adapters for which you want to show
+   *    the inspector panel.
+   * @param {InspectorOptions} options - Options that configure the inspector. See InspectorOptions type.
+   * @return {InspectorSession} The session instance for the opened inspector.
+   * @throws {Error}
+   */
+  open: (adapters: Adapters, options?: InspectorOptions) => InspectorSession;
+}
+
+export class InspectorPublicPlugin implements Plugin<Setup, Start> {
+  views: InspectorViewRegistry | undefined;
+
+  constructor(initializerContext: PluginInitializerContext) {}
+
+  public async setup(core: CoreSetup) {
+    this.views = new InspectorViewRegistry();
+
+    return {
+      registerView: this.views!.register.bind(this.views),
+
+      __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+        views: this.views,
+      },
+    };
+  }
+
+  public start(core: CoreStart) {
+    const isAvailable: Start['isAvailable'] = adapters =>
+      this.views!.getVisible(adapters).length > 0;
+
+    const closeButtonLabel = i18n.translate('inspector.closeButton', {
+      defaultMessage: 'Close Inspector',
+    });
+
+    const open: Start['open'] = (adapters, options = {}) => {
+      const views = this.views!.getVisible(adapters);
+
+      // Don't open inspector if there are no views available for the passed adapters
+      if (!views || views.length === 0) {
+        throw new Error(`Tried to open an inspector without views being available.
+          Make sure to call Inspector.isAvailable() with the same adapters before to check
+          if an inspector can be shown.`);
+      }
+
+      return core.overlays.openFlyout(
+        <InspectorPanel views={views} adapters={adapters} title={options.title} />,
+        {
+          'data-test-subj': 'inspectorPanel',
+          closeButtonAriaLabel: closeButtonLabel,
+        }
+      );
+    };
+
+    return {
+      isAvailable,
+      open,
+    };
+  }
+
+  public stop() {}
+}
diff --git a/src/plugins/inspector/public/test/is_available.test.ts b/src/plugins/inspector/public/test/is_available.test.ts
new file mode 100644
index 0000000000000..1aeffd68a9f3d
--- /dev/null
+++ b/src/plugins/inspector/public/test/is_available.test.ts
@@ -0,0 +1,52 @@
+/*
+ * 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 { inspectorPluginMock } from '../mocks';
+import { DataAdapter } from '../adapters/data/data_adapter';
+import { RequestAdapter } from '../adapters/request/request_adapter';
+
+const adapter1 = new DataAdapter();
+const adapter2 = new RequestAdapter();
+
+describe('inspector', () => {
+  describe('isAvailable()', () => {
+    it('should return false if no view would be available', async () => {
+      const { doStart } = await inspectorPluginMock.createPlugin();
+      const start = await doStart();
+      expect(start.isAvailable({ adapter1 })).toBe(false);
+    });
+
+    it('should return true if views would be available, false otherwise', async () => {
+      const { setup, doStart } = await inspectorPluginMock.createPlugin();
+
+      setup.registerView({
+        title: 'title',
+        help: 'help',
+        shouldShow(adapters: any) {
+          return 'adapter1' in adapters;
+        },
+      } as any);
+
+      const start = await doStart();
+
+      expect(start.isAvailable({ adapter1 })).toBe(true);
+      expect(start.isAvailable({ adapter2 })).toBe(false);
+    });
+  });
+});
diff --git a/src/plugins/inspector/public/test/open.test.ts b/src/plugins/inspector/public/test/open.test.ts
new file mode 100644
index 0000000000000..94cf161bb11c2
--- /dev/null
+++ b/src/plugins/inspector/public/test/open.test.ts
@@ -0,0 +1,30 @@
+/*
+ * 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 { inspectorPluginMock } from '../mocks';
+
+describe('inspector', () => {
+  describe('open()', () => {
+    it('should throw an error if no views available', async () => {
+      const { doStart } = await inspectorPluginMock.createPlugin();
+      const start = await doStart();
+      expect(() => start.open({})).toThrow();
+    });
+  });
+});
diff --git a/src/plugins/inspector/public/types.ts b/src/plugins/inspector/public/types.ts
new file mode 100644
index 0000000000000..5c3fd770c28d3
--- /dev/null
+++ b/src/plugins/inspector/public/types.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 { OverlayRef } from '../../../core/public';
+
+/**
+ * The interface that the adapters used to open an inspector have to fullfill.
+ */
+export interface Adapters {
+  [key: string]: any;
+}
+
+/**
+ * The props interface that a custom inspector view component, that will be passed
+ * to {@link InspectorViewDescription#component}, must use.
+ */
+export interface InspectorViewProps {
+  /**
+   * Adapters used to open the inspector.
+   */
+  adapters: Adapters;
+  /**
+   * The title that the inspector is currently using e.g. a visualization name.
+   */
+  title: string;
+}
+
+/**
+ * An object describing an inspector view.
+ * @typedef {object} InspectorViewDescription
+ * @property {string} title - The title that will be used to present that view.
+ * @property {string} icon - An icon name to present this view. Must match an EUI icon.
+ * @property {React.ComponentType<InspectorViewProps>} component - The actual React component to render that view.
+ * @property {number} [order=9000] - An order for this view. Views are ordered from lower
+ *    order values to higher order values in the UI.
+ * @property {string} [help=''] - An help text for this view, that gives a brief description
+ *    of this view.
+ * @property {viewShouldShowFunc} [shouldShow] - A function, that determines whether
+ *    this view should be visible for a given collection of adapters. If not specified
+ *    the view will always be visible.
+ */
+export interface InspectorViewDescription {
+  component: React.ComponentType<InspectorViewProps>;
+  help?: string;
+  order?: number;
+  shouldShow?: (adapters: Adapters) => boolean;
+  title: string;
+}
+
+/**
+ * Options that can be specified when opening the inspector.
+ * @property {string} title - An optional title, that will be shown in the header
+ *    of the inspector. Can be used to give more context about what is being inspected.
+ */
+export interface InspectorOptions {
+  title?: string;
+}
+
+export type InspectorSession = OverlayRef;
diff --git a/src/legacy/ui/public/inspector/ui/__snapshots__/inspector_panel.test.js.snap b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
similarity index 94%
rename from src/legacy/ui/public/inspector/ui/__snapshots__/inspector_panel.test.js.snap
rename to src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
index 6506774cca887..843fd78b24be9 100644
--- a/src/legacy/ui/public/inspector/ui/__snapshots__/inspector_panel.test.js.snap
+++ b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
@@ -112,7 +112,6 @@ exports[`InspectorPanel should render as expected 1`] = `
       "timeZone": null,
     }
   }
-  onClose={[Function]}
   title="Inspector"
   views={
     Array [
@@ -217,7 +216,7 @@ exports[`InspectorPanel should render as expected 1`] = `
                     >
                       <FormattedMessage
                         defaultMessage="View: {viewName}"
-                        id="common.ui.inspector.view"
+                        id="inspector.view"
                         values={
                           Object {
                             "viewName": "View 1",
@@ -298,7 +297,7 @@ exports[`InspectorPanel should render as expected 1`] = `
                               >
                                 <FormattedMessage
                                   defaultMessage="View: {viewName}"
-                                  id="common.ui.inspector.view"
+                                  id="inspector.view"
                                   values={
                                     Object {
                                       "viewName": "View 1",
@@ -322,20 +321,30 @@ exports[`InspectorPanel should render as expected 1`] = `
       </EuiFlexGroup>
     </div>
   </EuiFlyoutHeader>
-  <component
-    adapters={
-      Object {
-        "bardapter": Object {},
-        "foodapter": Object {
-          "foo": [Function],
-        },
-      }
-    }
-    title="Inspector"
-  >
-    <h1>
-      View 1
-    </h1>
-  </component>
+  <EuiFlyoutBody>
+    <div
+      className="euiFlyoutBody"
+    >
+      <div
+        className="euiFlyoutBody__overflow"
+      >
+        <component
+          adapters={
+            Object {
+              "bardapter": Object {},
+              "foodapter": Object {
+                "foo": [Function],
+              },
+            }
+          }
+          title="Inspector"
+        >
+          <h1>
+            View 1
+          </h1>
+        </component>
+      </div>
+    </div>
+  </EuiFlyoutBody>
 </InspectorPanel>
 `;
diff --git a/src/legacy/ui/public/inspector/ui/inspector_panel.test.js b/src/plugins/inspector/public/ui/inspector_panel.test.tsx
similarity index 71%
rename from src/legacy/ui/public/inspector/ui/inspector_panel.test.js
rename to src/plugins/inspector/public/ui/inspector_panel.test.tsx
index d4c72ba0132e4..c482b6fa8033b 100644
--- a/src/legacy/ui/public/inspector/ui/inspector_panel.test.js
+++ b/src/plugins/inspector/public/ui/inspector_panel.test.tsx
@@ -18,65 +18,55 @@
  */
 
 import React from 'react';
-import { InspectorPanel } from './inspector_panel';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { InspectorPanel } from './inspector_panel';
+import { Adapters, InspectorViewDescription } from '../types';
 
 describe('InspectorPanel', () => {
-
-  let adapters;
-  let views;
+  let adapters: Adapters;
+  let views: InspectorViewDescription[];
 
   beforeEach(() => {
     adapters = {
       foodapter: {
-        foo() { return 42; }
+        foo() {
+          return 42;
+        },
       },
-      bardapter: {
-
-      }
+      bardapter: {},
     };
     views = [
       {
         title: 'View 1',
         order: 200,
-        component: () => (<h1>View 1</h1>),
-      }, {
+        component: () => <h1>View 1</h1>,
+      },
+      {
         title: 'Foo View',
         order: 100,
-        component: () => (<h1>Foo view</h1>),
-        shouldShow(adapters) {
-          return adapters.foodapter;
-        }
-      }, {
+        component: () => <h1>Foo view</h1>,
+        shouldShow(adapters2: Adapters) {
+          return adapters2.foodapter;
+        },
+      },
+      {
         title: 'Never',
         order: 200,
         component: () => null,
         shouldShow() {
           return false;
-        }
-      }
+        },
+      },
     ];
   });
 
   it('should render as expected', () => {
-    const component = mountWithIntl(
-      <InspectorPanel
-        adapters={adapters}
-        onClose={() => true}
-        views={views}
-      />
-    );
+    const component = mountWithIntl(<InspectorPanel adapters={adapters} views={views} />);
     expect(component).toMatchSnapshot();
   });
 
   it('should not allow updating adapters', () => {
-    const component = mountWithIntl(
-      <InspectorPanel
-        adapters={adapters}
-        onClose={() => true}
-        views={views}
-      />
-    );
+    const component = mountWithIntl(<InspectorPanel adapters={adapters} views={views} />);
     adapters.notAllowed = {};
     expect(() => component.setProps({ adapters })).toThrow();
   });
diff --git a/src/legacy/ui/public/inspector/ui/inspector_panel.js b/src/plugins/inspector/public/ui/inspector_panel.tsx
similarity index 52%
rename from src/legacy/ui/public/inspector/ui/inspector_panel.js
rename to src/plugins/inspector/public/ui/inspector_panel.tsx
index 26f100b89c172..953bf7e1f073b 100644
--- a/src/legacy/ui/public/inspector/ui/inspector_panel.js
+++ b/src/plugins/inspector/public/ui/inspector_panel.tsx
@@ -20,52 +20,73 @@
 import { i18n } from '@kbn/i18n';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFlyoutHeader,
-  EuiTitle,
-} from '@elastic/eui';
-
+import { EuiFlexGroup, EuiFlexItem, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eui';
+import { Adapters, InspectorViewDescription } from '../types';
 import { InspectorViewChooser } from './inspector_view_chooser';
 
-function hasAdaptersChanged(oldAdapters, newAdapters) {
-  return Object.keys(oldAdapters).length !== Object.keys(newAdapters).length
-    || Object.keys(oldAdapters).some(key => oldAdapters[key] !== newAdapters[key]);
+function hasAdaptersChanged(oldAdapters: Adapters, newAdapters: Adapters) {
+  return (
+    Object.keys(oldAdapters).length !== Object.keys(newAdapters).length ||
+    Object.keys(oldAdapters).some(key => oldAdapters[key] !== newAdapters[key])
+  );
 }
 
-const inspectorTitle = i18n.translate('common.ui.inspector.title', {
+const inspectorTitle = i18n.translate('inspector.title', {
   defaultMessage: 'Inspector',
 });
 
-class InspectorPanel extends Component {
+interface InspectorPanelProps {
+  adapters: Adapters;
+  title?: string;
+  views: InspectorViewDescription[];
+}
 
-  constructor(props) {
-    super(props);
-    this.state = {
-      selectedView: props.views[0],
-      views: props.views,
-      // Clone adapters array so we can validate that this prop never change
-      adapters: { ...props.adapters },
-    };
-  }
+interface InspectorPanelState {
+  selectedView: InspectorViewDescription;
+  views: InspectorViewDescription[];
+  adapters: Adapters;
+}
+
+export class InspectorPanel extends Component<InspectorPanelProps, InspectorPanelState> {
+  static defaultProps = {
+    title: inspectorTitle,
+  };
 
-  static getDerivedStateFromProps(nextProps, prevState) {
+  static propTypes = {
+    adapters: PropTypes.object.isRequired,
+    views: (props: InspectorPanelProps, propName: string, componentName: string) => {
+      if (!Array.isArray(props.views) || props.views.length < 1) {
+        throw new Error(
+          `${propName} prop must be an array of at least one element in ${componentName}.`
+        );
+      }
+    },
+    title: PropTypes.string,
+  };
+
+  state: InspectorPanelState = {
+    selectedView: this.props.views[0],
+    views: this.props.views,
+    // Clone adapters array so we can validate that this prop never change
+    adapters: { ...this.props.adapters },
+  };
+
+  static getDerivedStateFromProps(nextProps: InspectorPanelProps, prevState: InspectorPanelState) {
     if (hasAdaptersChanged(prevState.adapters, nextProps.adapters)) {
       throw new Error('Adapters are not allowed to be changed on an open InspectorPanel.');
     }
-    const selectedViewMustChange = nextProps.views !== prevState.views
-        && !nextProps.views.includes(prevState.selectedView);
+    const selectedViewMustChange =
+      nextProps.views !== prevState.views && !nextProps.views.includes(prevState.selectedView);
     return {
       views: nextProps.views,
       selectedView: selectedViewMustChange ? nextProps.views[0] : prevState.selectedView,
     };
   }
 
-  onViewSelected = (view) => {
+  onViewSelected = (view: InspectorViewDescription) => {
     if (view !== this.state.selectedView) {
       this.setState({
-        selectedView: view
+        selectedView: view,
       });
     }
   };
@@ -74,7 +95,7 @@ class InspectorPanel extends Component {
     return (
       <this.state.selectedView.component
         adapters={this.props.adapters}
-        title={this.props.title}
+        title={this.props.title || ''}
       />
     );
   }
@@ -86,13 +107,10 @@ class InspectorPanel extends Component {
     return (
       <React.Fragment>
         <EuiFlyoutHeader hasBorder>
-          <EuiFlexGroup
-            justifyContent="spaceBetween"
-            alignItems="center"
-          >
+          <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
             <EuiFlexItem grow={true}>
               <EuiTitle size="s">
-                <h1>{ title }</h1>
+                <h1>{title}</h1>
               </EuiTitle>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
@@ -104,26 +122,8 @@ class InspectorPanel extends Component {
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlyoutHeader>
-        { this.renderSelectedPanel() }
+        <EuiFlyoutBody>{this.renderSelectedPanel()}</EuiFlyoutBody>
       </React.Fragment>
     );
   }
 }
-
-InspectorPanel.defaultProps = {
-  title: inspectorTitle,
-};
-
-InspectorPanel.propTypes = {
-  adapters: PropTypes.object.isRequired,
-  views: (props, propName, componentName) => {
-    if (!Array.isArray(props[propName]) || props[propName].length < 1) {
-      throw new Error(
-        `${propName} prop must be an array of at least one element in ${componentName}.`
-      );
-    }
-  },
-  title: PropTypes.string,
-};
-
-export { InspectorPanel };
diff --git a/src/legacy/ui/public/inspector/ui/inspector_view_chooser.js b/src/plugins/inspector/public/ui/inspector_view_chooser.tsx
similarity index 74%
rename from src/legacy/ui/public/inspector/ui/inspector_view_chooser.js
rename to src/plugins/inspector/public/ui/inspector_view_chooser.tsx
index 2ab4c57ce8bb8..ce6027ad383cf 100644
--- a/src/legacy/ui/public/inspector/ui/inspector_view_chooser.js
+++ b/src/plugins/inspector/public/ui/inspector_view_chooser.tsx
@@ -20,7 +20,6 @@
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-
 import {
   EuiButtonEmpty,
   EuiContextMenuItem,
@@ -28,26 +27,42 @@ import {
   EuiPopover,
   EuiToolTip,
 } from '@elastic/eui';
+import { InspectorViewDescription } from '../types';
+
+interface Props {
+  views: InspectorViewDescription[];
+  onViewSelected: (view: InspectorViewDescription) => void;
+  selectedView: InspectorViewDescription;
+}
 
-class InspectorViewChooser extends Component {
+interface State {
+  isSelectorOpen: boolean;
+}
+
+export class InspectorViewChooser extends Component<Props, State> {
+  static propTypes = {
+    views: PropTypes.array.isRequired,
+    onViewSelected: PropTypes.func.isRequired,
+    selectedView: PropTypes.object.isRequired,
+  };
 
-  state = {
-    isSelectorOpen: false
+  state: State = {
+    isSelectorOpen: false,
   };
 
   toggleSelector = () => {
-    this.setState((prev) => ({
-      isSelectorOpen: !prev.isSelectorOpen
+    this.setState(prev => ({
+      isSelectorOpen: !prev.isSelectorOpen,
     }));
   };
 
   closeSelector = () => {
     this.setState({
-      isSelectorOpen: false
+      isSelectorOpen: false,
     });
   };
 
-  renderView = (view, index) => {
+  renderView = (view: InspectorViewDescription, index: number) => {
     return (
       <EuiContextMenuItem
         key={index}
@@ -62,7 +77,7 @@ class InspectorViewChooser extends Component {
         {view.title}
       </EuiContextMenuItem>
     );
-  }
+  };
 
   renderViewButton() {
     return (
@@ -74,7 +89,7 @@ class InspectorViewChooser extends Component {
         data-test-subj="inspectorViewChooser"
       >
         <FormattedMessage
-          id="common.ui.inspector.view"
+          id="inspector.view"
           defaultMessage="View: {viewName}"
           values={{ viewName: this.props.selectedView.title }}
         />
@@ -84,12 +99,9 @@ class InspectorViewChooser extends Component {
 
   renderSingleView() {
     return (
-      <EuiToolTip
-        position="bottom"
-        content={this.props.selectedView.help}
-      >
+      <EuiToolTip position="bottom" content={this.props.selectedView.help}>
         <FormattedMessage
-          id="common.ui.inspector.view"
+          id="inspector.view"
           defaultMessage="View: {viewName}"
           values={{ viewName: this.props.selectedView.title }}
         />
@@ -117,18 +129,8 @@ class InspectorViewChooser extends Component {
         anchorPosition="downRight"
         repositionOnScroll
       >
-        <EuiContextMenuPanel
-          items={views.map(this.renderView)}
-        />
+        <EuiContextMenuPanel items={views.map(this.renderView)} />
       </EuiPopover>
     );
   }
 }
-
-InspectorViewChooser.propTypes = {
-  views: PropTypes.array.isRequired,
-  onViewSelected: PropTypes.func.isRequired,
-  selectedView: PropTypes.object.isRequired,
-};
-
-export { InspectorViewChooser };
diff --git a/src/legacy/ui/public/inspector/view_registry.test.ts b/src/plugins/inspector/public/view_registry.test.ts
similarity index 96%
rename from src/legacy/ui/public/inspector/view_registry.test.ts
rename to src/plugins/inspector/public/view_registry.test.ts
index e073c6431892f..830ee107213fb 100644
--- a/src/legacy/ui/public/inspector/view_registry.test.ts
+++ b/src/plugins/inspector/public/view_registry.test.ts
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { InspectorViewDescription, InspectorViewRegistry } from './view_registry';
+import { InspectorViewRegistry } from './view_registry';
+import { InspectorViewDescription } from './types';
 
 import { Adapters } from './types';
 
diff --git a/src/plugins/inspector/public/view_registry.ts b/src/plugins/inspector/public/view_registry.ts
new file mode 100644
index 0000000000000..4a35baf1f3ef4
--- /dev/null
+++ b/src/plugins/inspector/public/view_registry.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 { EventEmitter } from 'events';
+import { Adapters, InspectorViewDescription } from './types';
+
+/**
+ * @callback viewShouldShowFunc
+ * @param {object} adapters - A list of adapters to check whether or not this view
+ *    should be shown for.
+ * @returns {boolean} true - if this view should be shown for the given adapters.
+ */
+
+/**
+ * A registry that will hold inspector views.
+ */
+export class InspectorViewRegistry extends EventEmitter {
+  private views: InspectorViewDescription[] = [];
+
+  /**
+   * Register a new inspector view to the registry. Check the README.md in the
+   * inspector directory for more information of the object format to register
+   * here. This will also emit a 'change' event on the registry itself.
+   *
+   * @param {InspectorViewDescription} view - The view description to add to the registry.
+   */
+  public register(view: InspectorViewDescription): void {
+    if (!view) {
+      return;
+    }
+    this.views.push(view);
+    // Keep registry sorted by the order property
+    this.views.sort((a, b) => (a.order || Number.MAX_VALUE) - (b.order || Number.MAX_VALUE));
+    this.emit('change');
+  }
+
+  /**
+   * Retrieve all views currently registered with the registry.
+   * @returns {InspectorViewDescription[]} A by `order` sorted list of all registered
+   *    inspector views.
+   */
+  public getAll(): InspectorViewDescription[] {
+    return this.views;
+  }
+
+  /**
+   * Retrieve all registered views, that want to be visible for the specified adapters.
+   * @param {object} adapters - an adapter configuration
+   * @returns {InspectorViewDescription[]} All inespector view descriptions visible
+   *    for the specific adapters.
+   */
+  public getVisible(adapters?: Adapters): InspectorViewDescription[] {
+    if (!adapters) {
+      return [];
+    }
+    return this.views.filter(view => !view.shouldShow || view.shouldShow(adapters));
+  }
+}
diff --git a/test/api_integration/config.js b/test/api_integration/config.js
index 443dc2ab7a68b..d14630f932bf6 100644
--- a/test/api_integration/config.js
+++ b/test/api_integration/config.js
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-import {
-  KibanaSupertestProvider,
-  ElasticsearchSupertestProvider,
-  ChanceProvider,
-} from './services';
+import { services } from './services';
 
 export default async function ({ readConfigFile }) {
   const commonConfig = await readConfigFile(require.resolve('../common/config'));
@@ -31,14 +27,7 @@ export default async function ({ readConfigFile }) {
     testFiles: [
       require.resolve('./apis'),
     ],
-    services: {
-      es: commonConfig.get('services.es'),
-      esArchiver: commonConfig.get('services.esArchiver'),
-      retry: commonConfig.get('services.retry'),
-      supertest: KibanaSupertestProvider,
-      esSupertest: ElasticsearchSupertestProvider,
-      chance: ChanceProvider,
-    },
+    services,
     servers: commonConfig.get('servers'),
     junit: {
       reportName: 'API Integration Tests'
diff --git a/test/api_integration/services/index.ts b/test/api_integration/services/index.ts
new file mode 100644
index 0000000000000..d0fcd94a6a204
--- /dev/null
+++ b/test/api_integration/services/index.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 { services as commonServices } from '../../common/services';
+
+// @ts-ignore not TS yet
+import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest';
+
+// @ts-ignore not TS yet
+import { ChanceProvider } from './chance';
+
+export const services = {
+  es: commonServices.es,
+  esArchiver: commonServices.esArchiver,
+  retry: commonServices.retry,
+  supertest: KibanaSupertestProvider,
+  esSupertest: ElasticsearchSupertestProvider,
+  chance: ChanceProvider,
+};
diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js
index 4b85593d1f02c..f0d34207a87a2 100644
--- a/test/functional/apps/discover/_shared_links.js
+++ b/test/functional/apps/discover/_shared_links.js
@@ -71,7 +71,7 @@ export default function ({ getService, getPageObjects }) {
           ':(from:\'2015-09-19T06:31:44.000Z\',to:\'2015-09' +
           '-23T18:31:44.000Z\'))&_a=(columns:!(_source),index:\'logstash-' +
           '*\',interval:auto,query:(language:kuery,query:\'\')' +
-          ',sort:!(\'@timestamp\',desc))';
+          ',sort:!(!(\'@timestamp\',desc)))';
         const actualUrl = await PageObjects.share.getSharedUrl();
         // strip the timestamp out of each URL
         expect(actualUrl.replace(/_t=\d{13}/, '_t=TIMESTAMP')).to.be(
diff --git a/test/functional/services/apps_menu.ts b/test/functional/services/apps_menu.ts
index 93858cdb44523..a4cd98b2a06ec 100644
--- a/test/functional/services/apps_menu.ts
+++ b/test/functional/services/apps_menu.ts
@@ -31,12 +31,9 @@ export function AppsMenuProvider({ getService }: FtrProviderContext) {
       const appMenu = await testSubjects.find('navDrawer');
       const $ = await appMenu.parseDomContent();
 
-      const links: Array<{
-        text: string;
-        href: string;
-      }> = $.findTestSubjects('navDrawerAppsMenuLink')
+      const links = $.findTestSubjects('navDrawerAppsMenuLink')
         .toArray()
-        .map((link: any) => {
+        .map(link => {
           return {
             text: $(link).text(),
             href: $(link).attr('href'),
diff --git a/test/functional/services/doc_table.ts b/test/functional/services/doc_table.ts
index 0b3b77157d562..e09500317cd32 100644
--- a/test/functional/services/doc_table.ts
+++ b/test/functional/services/doc_table.ts
@@ -34,10 +34,10 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
       return await testSubjects.find('docTable');
     }
 
-    public async getRowsText(): Promise<string[]> {
+    public async getRowsText() {
       const table = await this.getTable();
       const $ = await table.parseDomContent();
-      return $('[data-test-subj~="docTableRow"]')
+      return $.findTestSubjects('docTableRow')
         .toArray()
         .map((row: any) =>
           $(row)
@@ -93,15 +93,11 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
       return await detailsRow.findAllByCssSelector('[data-test-subj~="docTableRowAction"]');
     }
 
-    public async getFields(
-      options: { isAnchorRow: boolean } = { isAnchorRow: false }
-    ): Promise<string[][]> {
+    public async getFields(options: { isAnchorRow: boolean } = { isAnchorRow: false }) {
       const table = await this.getTable();
       const $ = await table.parseDomContent();
-      const rowLocator = options.isAnchorRow
-        ? '[data-test-subj~="docTableAnchorRow"]'
-        : '[data-test-subj~="docTableRow"]';
-      const rows = $(rowLocator).toArray();
+      const rowLocator = options.isAnchorRow ? 'docTableAnchorRow' : 'docTableRow';
+      const rows = $.findTestSubjects(rowLocator).toArray();
       const fields = rows.map((row: any) =>
         $(row)
           .find('[data-test-subj~="docTableField"]')
@@ -114,7 +110,7 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
     public async getHeaderFields(): Promise<string[]> {
       const table = await this.getTable();
       const $ = await table.parseDomContent();
-      return $('[data-test-subj~="docTableHeaderField"]')
+      return $.findTestSubjects('docTableHeaderField')
         .toArray()
         .map((field: any) =>
           $(field)
diff --git a/test/functional/services/lib/web_element_wrapper/custom_cheerio_api.ts b/test/functional/services/lib/web_element_wrapper/custom_cheerio_api.ts
new file mode 100644
index 0000000000000..301eb656ed6f6
--- /dev/null
+++ b/test/functional/services/lib/web_element_wrapper/custom_cheerio_api.ts
@@ -0,0 +1,246 @@
+/* eslint-disable */
+
+/**
+ * Type interfaces extracted from node_modules/@types/cheerio/index.d.ts
+ * and customized to include our custom methods
+ */
+
+interface CheerioSelector {
+  (selector: string): CustomCheerio;
+  (selector: string, context: string): CustomCheerio;
+  (selector: string, context: CheerioElement): CustomCheerio;
+  (selector: string, context: CheerioElement[]): CustomCheerio;
+  (selector: string, context: Cheerio): CustomCheerio;
+  (selector: string, context: string, root: string): CustomCheerio;
+  (selector: string, context: CheerioElement, root: string): CustomCheerio;
+  (selector: string, context: CheerioElement[], root: string): CustomCheerio;
+  (selector: string, context: Cheerio, root: string): CustomCheerio;
+  (selector: any): CustomCheerio;
+}
+
+export interface CustomCheerioStatic extends CheerioSelector {
+  // Document References
+  // Cheerio https://github.com/cheeriojs/cheerio
+  // JQuery http://api.jquery.com
+  xml(): string;
+  root(): CustomCheerio;
+  contains(container: CheerioElement, contained: CheerioElement): boolean;
+  parseHTML(data: string, context?: Document, keepScripts?: boolean): Document[];
+
+  html(options?: CheerioOptionsInterface): string;
+  html(selector: string, options?: CheerioOptionsInterface): string;
+  html(element: CustomCheerio, options?: CheerioOptionsInterface): string;
+  html(element: CheerioElement, options?: CheerioOptionsInterface): string;
+
+  //
+  // CUSTOM METHODS
+  //
+  findTestSubjects(selector: string): CustomCheerio;
+  findTestSubject(selector: string): CustomCheerio;
+}
+
+export interface CustomCheerio {
+  // Document References
+  // Cheerio https://github.com/cheeriojs/cheerio
+  // JQuery http://api.jquery.com
+
+  [index: number]: CheerioElement;
+  length: number;
+
+  // Attributes
+
+  attr(): { [attr: string]: string };
+  attr(name: string): string;
+  attr(name: string, value: any): CustomCheerio;
+
+  data(): any;
+  data(name: string): any;
+  data(name: string, value: any): any;
+
+  val(): string;
+  val(value: string): CustomCheerio;
+
+  removeAttr(name: string): CustomCheerio;
+
+  has(selector: string): CustomCheerio;
+  has(element: CheerioElement): CustomCheerio;
+
+  hasClass(className: string): boolean;
+  addClass(classNames: string): CustomCheerio;
+
+  removeClass(): CustomCheerio;
+  removeClass(className: string): CustomCheerio;
+  removeClass(func: (index: number, className: string) => string): CustomCheerio;
+
+  toggleClass(className: string): CustomCheerio;
+  toggleClass(className: string, toggleSwitch: boolean): CustomCheerio;
+  toggleClass(toggleSwitch?: boolean): CustomCheerio;
+  toggleClass(
+    func: (index: number, className: string, toggleSwitch: boolean) => string,
+    toggleSwitch?: boolean
+  ): CustomCheerio;
+
+  is(selector: string): boolean;
+  is(element: CheerioElement): boolean;
+  is(element: CheerioElement[]): boolean;
+  is(selection: CustomCheerio): boolean;
+  is(func: (index: number, element: CheerioElement) => boolean): boolean;
+
+  // Form
+  serialize(): string;
+  serializeArray(): Array<{ name: string; value: string }>;
+
+  // Traversing
+
+  find(selector: string): CustomCheerio;
+  find(element: CustomCheerio): CustomCheerio;
+
+  parent(selector?: string): CustomCheerio;
+  parents(selector?: string): CustomCheerio;
+  parentsUntil(selector?: string, filter?: string): CustomCheerio;
+  parentsUntil(element: CheerioElement, filter?: string): CustomCheerio;
+  parentsUntil(element: CustomCheerio, filter?: string): CustomCheerio;
+
+  prop(name: string): any;
+  prop(name: string, value: any): CustomCheerio;
+
+  closest(): CustomCheerio;
+  closest(selector: string): CustomCheerio;
+
+  next(selector?: string): CustomCheerio;
+  nextAll(): CustomCheerio;
+  nextAll(selector: string): CustomCheerio;
+
+  nextUntil(selector?: string, filter?: string): CustomCheerio;
+  nextUntil(element: CheerioElement, filter?: string): CustomCheerio;
+  nextUntil(element: CustomCheerio, filter?: string): CustomCheerio;
+
+  prev(selector?: string): CustomCheerio;
+  prevAll(): CustomCheerio;
+  prevAll(selector: string): CustomCheerio;
+
+  prevUntil(selector?: string, filter?: string): CustomCheerio;
+  prevUntil(element: CheerioElement, filter?: string): CustomCheerio;
+  prevUntil(element: CustomCheerio, filter?: string): CustomCheerio;
+
+  slice(start: number, end?: number): CustomCheerio;
+
+  siblings(selector?: string): CustomCheerio;
+
+  children(selector?: string): CustomCheerio;
+
+  contents(): CustomCheerio;
+
+  each(func: (index: number, element: CheerioElement) => any): CustomCheerio;
+  map(func: (index: number, element: CheerioElement) => any): CustomCheerio;
+
+  filter(selector: string): CustomCheerio;
+  filter(selection: CustomCheerio): CustomCheerio;
+  filter(element: CheerioElement): CustomCheerio;
+  filter(elements: CheerioElement[]): CustomCheerio;
+  filter(func: (index: number, element: CheerioElement) => boolean): CustomCheerio;
+
+  not(selector: string): CustomCheerio;
+  not(selection: CustomCheerio): CustomCheerio;
+  not(element: CheerioElement): CustomCheerio;
+  not(func: (index: number, element: CheerioElement) => boolean): CustomCheerio;
+
+  first(): CustomCheerio;
+  last(): CustomCheerio;
+
+  eq(index: number): CustomCheerio;
+
+  get(): any[];
+  get(index: number): any;
+
+  index(): number;
+  index(selector: string): number;
+  index(selection: CustomCheerio): number;
+
+  end(): CustomCheerio;
+
+  add(selectorOrHtml: string): CustomCheerio;
+  add(selector: string, context: Document): CustomCheerio;
+  add(element: CheerioElement): CustomCheerio;
+  add(elements: CheerioElement[]): CustomCheerio;
+  add(selection: CustomCheerio): CustomCheerio;
+
+  addBack(): CustomCheerio;
+  addBack(filter: string): CustomCheerio;
+
+  // Manipulation
+  appendTo(target: CustomCheerio): CustomCheerio;
+  prependTo(target: CustomCheerio): CustomCheerio;
+
+  append(content: string, ...contents: any[]): CustomCheerio;
+  append(content: Document, ...contents: any[]): CustomCheerio;
+  append(content: Document[], ...contents: any[]): CustomCheerio;
+  append(content: CustomCheerio, ...contents: any[]): CustomCheerio;
+
+  prepend(content: string, ...contents: any[]): CustomCheerio;
+  prepend(content: Document, ...contents: any[]): CustomCheerio;
+  prepend(content: Document[], ...contents: any[]): CustomCheerio;
+  prepend(content: CustomCheerio, ...contents: any[]): CustomCheerio;
+
+  after(content: string, ...contents: any[]): CustomCheerio;
+  after(content: Document, ...contents: any[]): CustomCheerio;
+  after(content: Document[], ...contents: any[]): CustomCheerio;
+  after(content: CustomCheerio, ...contents: any[]): CustomCheerio;
+
+  insertAfter(content: string): CustomCheerio;
+  insertAfter(content: Document): CustomCheerio;
+  insertAfter(content: CustomCheerio): CustomCheerio;
+
+  before(content: string, ...contents: any[]): CustomCheerio;
+  before(content: Document, ...contents: any[]): CustomCheerio;
+  before(content: Document[], ...contents: any[]): CustomCheerio;
+  before(content: CustomCheerio, ...contents: any[]): CustomCheerio;
+
+  insertBefore(content: string): CustomCheerio;
+  insertBefore(content: Document): CustomCheerio;
+  insertBefore(content: CustomCheerio): CustomCheerio;
+
+  remove(selector?: string): CustomCheerio;
+
+  replaceWith(content: string): CustomCheerio;
+  replaceWith(content: CheerioElement): CustomCheerio;
+  replaceWith(content: CheerioElement[]): CustomCheerio;
+  replaceWith(content: CustomCheerio): CustomCheerio;
+  replaceWith(content: () => CustomCheerio): CustomCheerio;
+
+  empty(): CustomCheerio;
+
+  html(): string | null;
+  html(html: string): CustomCheerio;
+
+  text(): string;
+  text(text: string): CustomCheerio;
+
+  wrap(content: string): CustomCheerio;
+  wrap(content: Document): CustomCheerio;
+  wrap(content: CustomCheerio): CustomCheerio;
+
+  css(propertyName: string): string;
+  css(propertyNames: string[]): string[];
+  css(propertyName: string, value: string): CustomCheerio;
+  css(propertyName: string, value: number): CustomCheerio;
+  css(propertyName: string, func: (index: number, value: string) => string): CustomCheerio;
+  css(propertyName: string, func: (index: number, value: string) => number): CustomCheerio;
+  css(properties: Record<string, any>): CustomCheerio;
+
+  // Rendering
+
+  // Miscellaneous
+
+  clone(): CustomCheerio;
+
+  // Not Documented
+
+  toArray(): CheerioElement[];
+
+  //
+  // CUSTOM METHODS
+  //
+  findTestSubjects(selector: string): CustomCheerio;
+  findTestSubject(selector: string): CustomCheerio;
+}
diff --git a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
index 2ae4616283205..b05485618da01 100644
--- a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
+++ b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
@@ -25,6 +25,7 @@ import { PNG } from 'pngjs';
 import cheerio from 'cheerio';
 import testSubjSelector from '@kbn/test-subj-selector';
 import { ToolingLog } from '@kbn/dev-utils';
+import { CustomCheerio, CustomCheerioStatic } from './custom_cheerio_api';
 // @ts-ignore not supported yet
 import { scrollIntoViewIfNecessary } from './scroll_into_view_if_necessary';
 import { Browsers } from '../../remote/browsers';
@@ -650,24 +651,28 @@ export class WebElementWrapper {
    * Gets element innerHTML and wrap it up with cheerio
    *
    * @nonstandard
-   * @return {Promise<void>}
+   * @return {Promise<CustomCheerioStatic>}
    */
-  public async parseDomContent(): Promise<any> {
+  public async parseDomContent(): Promise<CustomCheerioStatic> {
     const htmlContent: any = await this.getAttribute('innerHTML');
     const $: any = cheerio.load(htmlContent, {
       normalizeWhitespace: true,
       xmlMode: true,
     });
 
-    $.findTestSubjects = function testSubjects(selector: string) {
+    $.findTestSubjects = function findTestSubjects(this: CustomCheerioStatic, selector: string) {
       return this(testSubjSelector(selector));
     };
 
-    $.fn.findTestSubjects = function testSubjects(selector: string) {
+    $.fn.findTestSubjects = function findTestSubjects(this: CustomCheerio, selector: string) {
       return this.find(testSubjSelector(selector));
     };
 
-    $.findTestSubject = $.fn.findTestSubject = function testSubjects(selector: string) {
+    $.findTestSubject = function findTestSubject(this: CustomCheerioStatic, selector: string) {
+      return this.findTestSubjects(selector).first();
+    };
+
+    $.fn.findTestSubject = function findTestSubject(this: CustomCheerio, selector: string) {
       return this.findTestSubjects(selector).first();
     };
 
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index b2d29f553acb7..f120e4051d705 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.0.0",
+    "@elastic/eui": "13.1.1",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   }
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app.js b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app.js
index ea5d894b21d46..bd58184cd1185 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app.js
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app.js
@@ -23,8 +23,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { uiModules } from 'ui/modules';
 import chrome from 'ui/chrome';
 
-import { RequestAdapter } from 'ui/inspector/adapters/request';
-import { DataAdapter } from 'ui/inspector/adapters/data';
+import { RequestAdapter, DataAdapter } from 'ui/inspector/adapters';
 import { runPipeline } from 'ui/visualize/loader/pipeline_helpers';
 import { visualizationLoader } from 'ui/visualize/loader/visualization_loader';
 
diff --git a/test/types/mocha_decorations.d.ts b/test/mocha_decorations.d.ts
similarity index 100%
rename from test/types/mocha_decorations.d.ts
rename to test/mocha_decorations.d.ts
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index db8e1611fc3b6..c624057bdd8e9 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.0.0",
+    "@elastic/eui": "13.1.1",
     "react": "^16.8.0"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
index 8e4b9d5382647..bc031dc374a40 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.0.0",
+    "@elastic/eui": "13.1.1",
     "react": "^16.8.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
index 8c768877ebe06..07854b083e509 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.0.0",
+    "@elastic/eui": "13.1.1",
     "react": "^16.8.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
index b5db69f7fa72b..d71ed95166f9b 100644
--- a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.0.0",
+    "@elastic/eui": "13.1.1",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   }
diff --git a/x-pack/dev-tools/jest/setup/polyfills.js b/x-pack/dev-tools/jest/setup/polyfills.js
index ee7de375c1120..e949b0ef6fe40 100644
--- a/x-pack/dev-tools/jest/setup/polyfills.js
+++ b/x-pack/dev-tools/jest/setup/polyfills.js
@@ -12,15 +12,4 @@ const bluebird = require('bluebird');
 bluebird.Promise.setScheduler(function (fn) { global.setImmediate.call(global, fn); });
 
 const MutationObserver = require('mutation-observer');
-// There's a bug in mutation-observer around the `attributes` option
-// https://dom.spec.whatwg.org/#mutationobserver
-// If either options's attributeOldValue or attributeFilter is present and options's attributes is omitted, then set options's attributes to true.
-const _observe = MutationObserver.prototype.observe;
-MutationObserver.prototype.observe = function observe(target, options) {
-  const needsAttributes = options.hasOwnProperty('attributeOldValue') || options.hasOwnProperty('attributeFilter');
-  if (needsAttributes && !options.hasOwnProperty('attributes')) {
-    options.attributes = true;
-  }
-  Function.prototype.call(_observe, this, target, options);
-};
 Object.defineProperty(window, 'MutationObserver', { value: MutationObserver });
diff --git a/x-pack/legacy/plugins/actions/README.md b/x-pack/legacy/plugins/actions/README.md
index abfd0dbae0e99..f17456d6ea393 100644
--- a/x-pack/legacy/plugins/actions/README.md
+++ b/x-pack/legacy/plugins/actions/README.md
@@ -72,11 +72,10 @@ Payload:
 
 |Property|Description|Type|
 |---|---|---|
-|attributes.description|A description to reference and search in the future. This value will be used to populate dropdowns.|string|
-|attributes.actionTypeId|The id value of the action type you want to call when the action executes.|string|
-|attributes.actionTypeConfig|The configuration the action type expects. See related action type to see what attributes is expected. This will also validate against the action type if config validation is defined.|object|
-|references|An array of `name`, `type` and `id`. This is the same as `references` in the saved objects API. See the saved objects API documentation.<br><br>In most cases, you can leave this empty.|Array|
-|migrationVersion|The version of the most recent migrations. This is the same as `migrationVersion` in the saved objects API. See the saved objects API documentation.<br><br>In most cases, you can leave this empty.|object|
+|description|A description to reference and search in the future. This value will be used to populate dropdowns.|string|
+|actionTypeId|The id value of the action type you want to call when the action executes.|string|
+|config|The configuration the action type expects. See related action type to see what attributes are expected. This will also validate against the action type if config validation is defined.|object|
+|secrets|The secrets the action type expects. See related action type to see what attributes are expected. This will also validate against the action type if secrets validation is defined.|object|
 
 #### `DELETE /api/action/{id}`: Delete action
 
@@ -116,10 +115,9 @@ Payload:
 
 |Property|Description|Type|
 |---|---|---|
-|attributes.description|A description to reference and search in the future. This value will be used to populate dropdowns.|string|
-|attributes.actionTypeConfig|The configuration the action type expects. See related action type to see what attributes is expected. This will also validate against the action type if config validation is defined.|object|
-|references|An array of `name`, `type` and `id`. This is the same as `references` in the saved objects API. See the saved objects API documentation.<br><br>In most cases, you can leave this empty.|Array|
-|version|The document version when read|string|
+|description|A description to reference and search in the future. This value will be used to populate dropdowns.|string|
+|config|The configuration the action type expects. See related action type to see what attributes are expected. This will also validate against the action type if config validation is defined.|object|
+|secrets|The secrets the action type expects. See related action type to see what attributes are expected. This will also validate against the action type if secrets validation is defined.|object|
 
 #### `POST /api/action/{id}/_fire`: Fire action
 
@@ -147,8 +145,7 @@ The following table describes the properties of the `options` object.
 |---|---|---|
 |id|The id of the action you want to fire.|string|
 |params|The `params` value to give the action type executor.|object|
-|namespace|The saved object namespace the action exists within.|string|
-|basePath|This is a temporary parameter, but we need to capture and track the value of `request.getBasePath()` until future changes are made.<br><br>In most cases this can be `undefined` unless you need cross spaces support.|string|
+|spaceId|The space id the action is within.|string|
 
 ### Example
 
@@ -157,14 +154,13 @@ This example makes action `3c5b2bd4-5424-4e4b-8cf5-c0a58c762cc5` fire an email.
 ```
 server.plugins.actions.fire({
   id: '3c5b2bd4-5424-4e4b-8cf5-c0a58c762cc5',
+  spaceId: 'default', // The spaceId of the action
   params: {
     from: 'example@elastic.co',
     to: ['destination@elastic.co'],
     subject: 'My email subject',
     body: 'My email body',
   },
-  namespace: undefined, // The namespace the action exists within
-  basePath: undefined, // Usually `request.getBasePath();` or `undefined`
 });
 ```
 
@@ -281,7 +277,7 @@ $ kbn-action create .slack "post to slack" '{"webhookUrl": "https://hooks.slack.
     "attributes": {
         "actionTypeId": ".slack",
         "description": "post to slack",
-        "actionTypeConfig": {}
+        "config": {}
     },
     "references": [],
     "updated_at": "2019-06-26T17:55:42.728Z",
diff --git a/x-pack/legacy/plugins/actions/mappings.json b/x-pack/legacy/plugins/actions/mappings.json
index e76612ca56c48..e2649568f25ec 100644
--- a/x-pack/legacy/plugins/actions/mappings.json
+++ b/x-pack/legacy/plugins/actions/mappings.json
@@ -7,11 +7,11 @@
       "actionTypeId": {
         "type": "keyword"
       },
-      "actionTypeConfig": {
+      "config": {
         "enabled": false,
         "type": "object"
       },
-      "actionTypeConfigSecrets": {
+      "secrets": {
         "type": "binary"
       }
     }
diff --git a/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts b/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
index 0c1643e20d8bf..dcb8b8b299d1a 100644
--- a/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
+++ b/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
@@ -28,6 +28,8 @@ const actionTypeRegistryParams = {
   getServices,
   taskManager: mockTaskManager,
   encryptedSavedObjectsPlugin: encryptedSavedObjectsMock.create(),
+  spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+  getBasePath: jest.fn().mockReturnValue(undefined),
 };
 
 beforeEach(() => jest.resetAllMocks());
@@ -45,7 +47,6 @@ describe('register()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       executor,
     });
     expect(actionTypeRegistry.has('my-action-type')).toEqual(true);
@@ -75,14 +76,12 @@ describe('register()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       executor,
     });
     expect(() =>
       actionTypeRegistry.register({
         id: 'my-action-type',
         name: 'My action type',
-        unencryptedAttributes: [],
         executor,
       })
     ).toThrowErrorMatchingInlineSnapshot(
@@ -95,7 +94,6 @@ describe('register()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       executor,
     });
     expect(mockTaskManager.registerTaskDefinitions).toHaveBeenCalledTimes(1);
@@ -118,7 +116,6 @@ describe('get()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       executor,
     });
     const actionType = actionTypeRegistry.get('my-action-type');
@@ -127,7 +124,6 @@ describe('get()', () => {
         "executor": [Function],
         "id": "my-action-type",
         "name": "My action type",
-        "unencryptedAttributes": Array [],
       }
     `);
   });
@@ -146,7 +142,6 @@ describe('list()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       executor,
     });
     const actionTypes = actionTypeRegistry.list();
@@ -170,7 +165,6 @@ describe('has()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       executor,
     });
     expect(actionTypeRegistry.has('my-action-type'));
diff --git a/x-pack/legacy/plugins/actions/server/action_type_registry.ts b/x-pack/legacy/plugins/actions/server/action_type_registry.ts
index 72ba36c402bf9..635d618878260 100644
--- a/x-pack/legacy/plugins/actions/server/action_type_registry.ts
+++ b/x-pack/legacy/plugins/actions/server/action_type_registry.ts
@@ -10,28 +10,35 @@ import { ActionType, GetServicesFunction } from './types';
 import { TaskManager, TaskRunCreatorFunction } from '../../task_manager';
 import { getCreateTaskRunnerFunction, ExecutorError } from './lib';
 import { EncryptedSavedObjectsPlugin } from '../../encrypted_saved_objects';
+import { SpacesPlugin } from '../../spaces';
 
 interface ConstructorOptions {
   taskManager: TaskManager;
   getServices: GetServicesFunction;
   encryptedSavedObjectsPlugin: EncryptedSavedObjectsPlugin;
+  spaceIdToNamespace: SpacesPlugin['spaceIdToNamespace'];
+  getBasePath: SpacesPlugin['getBasePath'];
 }
 
 export class ActionTypeRegistry {
   private readonly taskRunCreatorFunction: TaskRunCreatorFunction;
-  private readonly getServices: GetServicesFunction;
   private readonly taskManager: TaskManager;
   private readonly actionTypes: Map<string, ActionType> = new Map();
-  private readonly encryptedSavedObjectsPlugin: EncryptedSavedObjectsPlugin;
 
-  constructor({ getServices, taskManager, encryptedSavedObjectsPlugin }: ConstructorOptions) {
-    this.getServices = getServices;
+  constructor({
+    getServices,
+    taskManager,
+    encryptedSavedObjectsPlugin,
+    spaceIdToNamespace,
+    getBasePath,
+  }: ConstructorOptions) {
     this.taskManager = taskManager;
-    this.encryptedSavedObjectsPlugin = encryptedSavedObjectsPlugin;
     this.taskRunCreatorFunction = getCreateTaskRunnerFunction({
+      getServices,
       actionTypeRegistry: this,
-      getServices: this.getServices,
-      encryptedSavedObjectsPlugin: this.encryptedSavedObjectsPlugin,
+      encryptedSavedObjectsPlugin,
+      spaceIdToNamespace,
+      getBasePath,
     });
   }
 
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.test.ts b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
index bf16b1190e7fc..d724c28d72ea5 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
@@ -10,16 +10,14 @@ import { ActionTypeRegistry } from './action_type_registry';
 import { ActionsClient } from './actions_client';
 import { ExecutorType } from './types';
 import { taskManagerMock } from '../../task_manager/task_manager.mock';
-import { EncryptedSavedObjectsPlugin } from '../../encrypted_saved_objects';
 import { SavedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/plugin.mock';
 
 const savedObjectsClient = SavedObjectsClientMock.create();
 
 const mockTaskManager = taskManagerMock.create();
 
-const mockEncryptedSavedObjectsPlugin = {
-  getDecryptedAsInternalUser: jest.fn() as EncryptedSavedObjectsPlugin['getDecryptedAsInternalUser'],
-} as EncryptedSavedObjectsPlugin;
+const mockEncryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create();
 
 function getServices() {
   return {
@@ -33,6 +31,8 @@ const actionTypeRegistryParams = {
   getServices,
   taskManager: mockTaskManager,
   encryptedSavedObjectsPlugin: mockEncryptedSavedObjectsPlugin,
+  spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+  getBasePath: jest.fn().mockReturnValue(undefined),
 };
 
 const executor: ExecutorType = async options => {
@@ -43,55 +43,56 @@ beforeEach(() => jest.resetAllMocks());
 
 describe('create()', () => {
   test('creates an action with all given properties', async () => {
-    const expectedResult = {
+    const savedObjectCreateResult = {
       id: '1',
       type: 'type',
-      attributes: {},
+      attributes: {
+        description: 'my description',
+        actionTypeId: 'my-action-type',
+        config: {},
+      },
       references: [],
     };
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       executor,
     });
     const actionsClient = new ActionsClient({
       actionTypeRegistry,
       savedObjectsClient,
     });
-    savedObjectsClient.create.mockResolvedValueOnce(expectedResult);
+    savedObjectsClient.create.mockResolvedValueOnce(savedObjectCreateResult);
     const result = await actionsClient.create({
-      attributes: {
+      action: {
         description: 'my description',
         actionTypeId: 'my-action-type',
-        actionTypeConfig: {},
-      },
-      options: {
-        migrationVersion: {},
-        references: [],
+        config: {},
+        secrets: {},
       },
     });
-    expect(result).toEqual(expectedResult);
+    expect(result).toEqual({
+      id: '1',
+      description: 'my description',
+      actionTypeId: 'my-action-type',
+      config: {},
+    });
     expect(savedObjectsClient.create).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.create.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         "action",
         Object {
-          "actionTypeConfig": Object {},
-          "actionTypeConfigSecrets": Object {},
           "actionTypeId": "my-action-type",
+          "config": Object {},
           "description": "my description",
-        },
-        Object {
-          "migrationVersion": Object {},
-          "references": Array [],
+          "secrets": Object {},
         },
       ]
     `);
   });
 
-  test('validates actionTypeConfig', async () => {
+  test('validates config', async () => {
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     const actionsClient = new ActionsClient({
       actionTypeRegistry,
@@ -100,7 +101,6 @@ describe('create()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       validate: {
         config: schema.object({
           param1: schema.string(),
@@ -110,14 +110,15 @@ describe('create()', () => {
     });
     await expect(
       actionsClient.create({
-        attributes: {
+        action: {
           description: 'my description',
           actionTypeId: 'my-action-type',
-          actionTypeConfig: {},
+          config: {},
+          secrets: {},
         },
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [param1]: expected value of type [string] but got [undefined]"`
+      `"error validating action type config: [param1]: expected value of type [string] but got [undefined]"`
     );
   });
 
@@ -129,10 +130,11 @@ describe('create()', () => {
     });
     await expect(
       actionsClient.create({
-        attributes: {
+        action: {
           description: 'my description',
           actionTypeId: 'unregistered-action-type',
-          actionTypeConfig: {},
+          config: {},
+          secrets: {},
         },
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -141,52 +143,67 @@ describe('create()', () => {
   });
 
   test('encrypts action type options unless specified not to', async () => {
-    const expectedResult = {
-      id: '1',
-      type: 'type',
-      attributes: {},
-      references: [],
-    };
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: ['a', 'c'],
       executor,
     });
     const actionsClient = new ActionsClient({
       actionTypeRegistry,
       savedObjectsClient,
     });
-    savedObjectsClient.create.mockResolvedValueOnce(expectedResult);
-    const result = await actionsClient.create({
+    savedObjectsClient.create.mockResolvedValueOnce({
+      id: '1',
+      type: 'type',
       attributes: {
         description: 'my description',
         actionTypeId: 'my-action-type',
-        actionTypeConfig: {
+        config: {
           a: true,
           b: true,
           c: true,
         },
+        secrets: {},
+      },
+      references: [],
+    });
+    const result = await actionsClient.create({
+      action: {
+        description: 'my description',
+        actionTypeId: 'my-action-type',
+        config: {
+          a: true,
+          b: true,
+          c: true,
+        },
+        secrets: {},
+      },
+    });
+    expect(result).toEqual({
+      id: '1',
+      description: 'my description',
+      actionTypeId: 'my-action-type',
+      config: {
+        a: true,
+        b: true,
+        c: true,
       },
     });
-    expect(result).toEqual(expectedResult);
     expect(savedObjectsClient.create).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.create.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         "action",
         Object {
-          "actionTypeConfig": Object {
+          "actionTypeId": "my-action-type",
+          "config": Object {
             "a": true,
-            "c": true,
-          },
-          "actionTypeConfigSecrets": Object {
             "b": true,
+            "c": true,
           },
-          "actionTypeId": "my-action-type",
           "description": "my description",
+          "secrets": Object {},
         },
-        undefined,
       ]
     `);
   });
@@ -194,20 +211,21 @@ describe('create()', () => {
 
 describe('get()', () => {
   test('calls savedObjectsClient with id', async () => {
-    const expectedResult = {
-      id: '1',
-      type: 'type',
-      attributes: {},
-      references: [],
-    };
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     const actionsClient = new ActionsClient({
       actionTypeRegistry,
       savedObjectsClient,
     });
-    savedObjectsClient.get.mockResolvedValueOnce(expectedResult);
+    savedObjectsClient.get.mockResolvedValueOnce({
+      id: '1',
+      type: 'type',
+      attributes: {},
+      references: [],
+    });
     const result = await actionsClient.get({ id: '1' });
-    expect(result).toEqual(expectedResult);
+    expect(result).toEqual({
+      id: '1',
+    });
     expect(savedObjectsClient.get).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.get.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
@@ -228,7 +246,11 @@ describe('find()', () => {
         {
           id: '1',
           type: 'type',
-          attributes: {},
+          attributes: {
+            config: {
+              foo: 'bar',
+            },
+          },
           references: [],
         },
       ],
@@ -240,7 +262,19 @@ describe('find()', () => {
     });
     savedObjectsClient.find.mockResolvedValueOnce(expectedResult);
     const result = await actionsClient.find({});
-    expect(result).toEqual(expectedResult);
+    expect(result).toEqual({
+      total: 1,
+      perPage: 10,
+      page: 1,
+      data: [
+        {
+          id: '1',
+          config: {
+            foo: 'bar',
+          },
+        },
+      ],
+    });
     expect(savedObjectsClient.find).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.find.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
@@ -275,17 +309,10 @@ describe('delete()', () => {
 
 describe('update()', () => {
   test('updates an action with all given properties', async () => {
-    const expectedResult = {
-      id: '1',
-      type: 'action',
-      attributes: {},
-      references: [],
-    };
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       executor,
     });
     const actionsClient = new ActionsClient({
@@ -300,28 +327,42 @@ describe('update()', () => {
       },
       references: [],
     });
-    savedObjectsClient.update.mockResolvedValueOnce(expectedResult);
-    const result = await actionsClient.update({
+    savedObjectsClient.update.mockResolvedValueOnce({
       id: 'my-action',
+      type: 'action',
       attributes: {
+        actionTypeId: 'my-action-type',
         description: 'my description',
-        actionTypeConfig: {},
+        config: {},
+        secrets: {},
       },
-      options: {},
+      references: [],
+    });
+    const result = await actionsClient.update({
+      id: 'my-action',
+      action: {
+        description: 'my description',
+        config: {},
+        secrets: {},
+      },
+    });
+    expect(result).toEqual({
+      id: 'my-action',
+      actionTypeId: 'my-action-type',
+      description: 'my description',
+      config: {},
     });
-    expect(result).toEqual(expectedResult);
     expect(savedObjectsClient.update).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.update.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         "action",
         "my-action",
         Object {
-          "actionTypeConfig": Object {},
-          "actionTypeConfigSecrets": Object {},
           "actionTypeId": "my-action-type",
+          "config": Object {},
           "description": "my description",
+          "secrets": Object {},
         },
-        Object {},
       ]
     `);
     expect(savedObjectsClient.get).toHaveBeenCalledTimes(1);
@@ -333,7 +374,7 @@ describe('update()', () => {
     `);
   });
 
-  test('validates actionTypeConfig', async () => {
+  test('validates config', async () => {
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     const actionsClient = new ActionsClient({
       actionTypeRegistry,
@@ -342,7 +383,6 @@ describe('update()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: [],
       validate: {
         config: schema.object({
           param1: schema.string(),
@@ -361,29 +401,22 @@ describe('update()', () => {
     await expect(
       actionsClient.update({
         id: 'my-action',
-        attributes: {
+        action: {
           description: 'my description',
-          actionTypeConfig: {},
+          config: {},
+          secrets: {},
         },
-        options: {},
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [param1]: expected value of type [string] but got [undefined]"`
+      `"error validating action type config: [param1]: expected value of type [string] but got [undefined]"`
     );
   });
 
   test('encrypts action type options unless specified not to', async () => {
-    const expectedResult = {
-      id: '1',
-      type: 'type',
-      attributes: {},
-      references: [],
-    };
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
-      unencryptedAttributes: ['a', 'c'],
       executor,
     });
     const actionsClient = new ActionsClient({
@@ -398,37 +431,58 @@ describe('update()', () => {
       },
       references: [],
     });
-    savedObjectsClient.update.mockResolvedValueOnce(expectedResult);
-    const result = await actionsClient.update({
+    savedObjectsClient.update.mockResolvedValueOnce({
       id: 'my-action',
+      type: 'action',
       attributes: {
+        actionTypeId: 'my-action-type',
         description: 'my description',
-        actionTypeConfig: {
+        config: {
           a: true,
           b: true,
           c: true,
         },
+        secrets: {},
+      },
+      references: [],
+    });
+    const result = await actionsClient.update({
+      id: 'my-action',
+      action: {
+        description: 'my description',
+        config: {
+          a: true,
+          b: true,
+          c: true,
+        },
+        secrets: {},
+      },
+    });
+    expect(result).toEqual({
+      id: 'my-action',
+      actionTypeId: 'my-action-type',
+      description: 'my description',
+      config: {
+        a: true,
+        b: true,
+        c: true,
       },
-      options: {},
     });
-    expect(result).toEqual(expectedResult);
     expect(savedObjectsClient.update).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.update.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         "action",
         "my-action",
         Object {
-          "actionTypeConfig": Object {
+          "actionTypeId": "my-action-type",
+          "config": Object {
             "a": true,
-            "c": true,
-          },
-          "actionTypeConfigSecrets": Object {
             "b": true,
+            "c": true,
           },
-          "actionTypeId": "my-action-type",
           "description": "my description",
+          "secrets": Object {},
         },
-        Object {},
       ]
     `);
   });
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.ts b/x-pack/legacy/plugins/actions/server/actions_client.ts
index 4ab62a6e434ad..2c5e84d0d5bee 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.ts
@@ -4,23 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsClientContract, SavedObjectAttributes } from 'src/core/server';
+import { SavedObjectsClientContract, SavedObjectAttributes, SavedObject } from 'src/core/server';
 import { ActionTypeRegistry } from './action_type_registry';
-import { SavedObjectReference } from './types';
-import { validateActionTypeConfig } from './lib';
+import { validateConfig, validateSecrets } from './lib';
+import { ActionResult } from './types';
 
-interface Action extends SavedObjectAttributes {
+interface ActionUpdate extends SavedObjectAttributes {
   description: string;
+  config: SavedObjectAttributes;
+  secrets: SavedObjectAttributes;
+}
+
+interface Action extends ActionUpdate {
   actionTypeId: string;
-  actionTypeConfig: SavedObjectAttributes;
 }
 
 interface CreateOptions {
-  attributes: Action;
-  options?: {
-    migrationVersion?: Record<string, string>;
-    references?: SavedObjectReference[];
-  };
+  action: Action;
 }
 
 interface FindOptions {
@@ -39,6 +39,13 @@ interface FindOptions {
   };
 }
 
+interface FindResult {
+  page: number;
+  perPage: number;
+  total: number;
+  data: ActionResult[];
+}
+
 interface ConstructorOptions {
   actionTypeRegistry: ActionTypeRegistry;
   savedObjectsClient: SavedObjectsClientContract;
@@ -46,11 +53,7 @@ interface ConstructorOptions {
 
 interface UpdateOptions {
   id: string;
-  attributes: {
-    description: string;
-    actionTypeConfig: SavedObjectAttributes;
-  };
-  options: { version?: string; references?: SavedObjectReference[] };
+  action: ActionUpdate;
 }
 
 export class ActionsClient {
@@ -65,38 +68,82 @@ export class ActionsClient {
   /**
    * Create an action
    */
-  public async create({ attributes, options }: CreateOptions) {
-    const { actionTypeId } = attributes;
+  public async create({ action }: CreateOptions): Promise<ActionResult> {
+    const { actionTypeId, description, config, secrets } = action;
     const actionType = this.actionTypeRegistry.get(actionTypeId);
-    const validatedActionTypeConfig = validateActionTypeConfig(
-      actionType,
-      attributes.actionTypeConfig
-    );
-    const actionWithSplitActionTypeConfig = this.moveEncryptedAttributesToSecrets(
-      actionType.unencryptedAttributes,
-      {
-        ...attributes,
-        actionTypeConfig: validatedActionTypeConfig,
-      }
-    );
-    return await this.savedObjectsClient.create('action', actionWithSplitActionTypeConfig, options);
+    const validatedActionTypeConfig = validateConfig(actionType, config);
+    const validatedActionTypeSecrets = validateSecrets(actionType, secrets);
+
+    const result = await this.savedObjectsClient.create('action', {
+      actionTypeId,
+      description,
+      config: validatedActionTypeConfig as SavedObjectAttributes,
+      secrets: validatedActionTypeSecrets as SavedObjectAttributes,
+    });
+
+    return {
+      id: result.id,
+      actionTypeId: result.attributes.actionTypeId,
+      description: result.attributes.description,
+      config: result.attributes.config,
+    };
+  }
+
+  /**
+   * Update action
+   */
+  public async update({ id, action }: UpdateOptions): Promise<ActionResult> {
+    const existingObject = await this.savedObjectsClient.get('action', id);
+    const { actionTypeId } = existingObject.attributes;
+    const { description, config, secrets } = action;
+    const actionType = this.actionTypeRegistry.get(actionTypeId);
+    const validatedActionTypeConfig = validateConfig(actionType, config);
+    const validatedActionTypeSecrets = validateSecrets(actionType, secrets);
+
+    const result = await this.savedObjectsClient.update('action', id, {
+      actionTypeId,
+      description,
+      config: validatedActionTypeConfig as SavedObjectAttributes,
+      secrets: validatedActionTypeSecrets as SavedObjectAttributes,
+    });
+
+    return {
+      id,
+      actionTypeId: result.attributes.actionTypeId as string,
+      description: result.attributes.description as string,
+      config: result.attributes.config as Record<string, any>,
+    };
   }
 
   /**
    * Get an action
    */
-  public async get({ id }: { id: string }) {
-    return await this.savedObjectsClient.get('action', id);
+  public async get({ id }: { id: string }): Promise<ActionResult> {
+    const result = await this.savedObjectsClient.get('action', id);
+
+    return {
+      id,
+      actionTypeId: result.attributes.actionTypeId as string,
+      description: result.attributes.description as string,
+      config: result.attributes.config as Record<string, any>,
+    };
   }
 
   /**
    * Find actions
    */
-  public async find({ options = {} }: FindOptions) {
-    return await this.savedObjectsClient.find({
+  public async find({ options = {} }: FindOptions): Promise<FindResult> {
+    const findResult = await this.savedObjectsClient.find({
       ...options,
       type: 'action',
     });
+
+    return {
+      page: findResult.page,
+      perPage: findResult.per_page,
+      total: findResult.total,
+      data: findResult.saved_objects.map(actionFromSavedObject),
+    };
   }
 
   /**
@@ -105,53 +152,11 @@ export class ActionsClient {
   public async delete({ id }: { id: string }) {
     return await this.savedObjectsClient.delete('action', id);
   }
+}
 
-  /**
-   * Update action
-   */
-  public async update({ id, attributes, options = {} }: UpdateOptions) {
-    const existingObject = await this.savedObjectsClient.get('action', id);
-    const { actionTypeId } = existingObject.attributes;
-    const actionType = this.actionTypeRegistry.get(actionTypeId);
-
-    const validatedActionTypeConfig = validateActionTypeConfig(
-      actionType,
-      attributes.actionTypeConfig
-    );
-    attributes = this.moveEncryptedAttributesToSecrets(actionType.unencryptedAttributes, {
-      ...attributes,
-      actionTypeConfig: validatedActionTypeConfig,
-    });
-    return await this.savedObjectsClient.update(
-      'action',
-      id,
-      {
-        ...attributes,
-        actionTypeId,
-      },
-      options
-    );
-  }
-
-  /**
-   * Set actionTypeConfigSecrets values on a given action
-   */
-  private moveEncryptedAttributesToSecrets(
-    unencryptedAttributes: string[] = [],
-    action: Action | UpdateOptions['attributes']
-  ) {
-    const actionTypeConfig: Record<string, any> = {};
-    const actionTypeConfigSecrets = { ...action.actionTypeConfig };
-    for (const attributeKey of unencryptedAttributes) {
-      actionTypeConfig[attributeKey] = actionTypeConfigSecrets[attributeKey];
-      delete actionTypeConfigSecrets[attributeKey];
-    }
-
-    return {
-      ...action,
-      // Important these overwrite attributes for encryption purposes
-      actionTypeConfig,
-      actionTypeConfigSecrets,
-    };
-  }
+function actionFromSavedObject(savedObject: SavedObject) {
+  return {
+    id: savedObject.id,
+    ...savedObject.attributes,
+  };
 }
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
index 8f50f21f590b7..7ebb1ff943750 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
@@ -12,11 +12,11 @@ import { ActionType, ActionTypeExecutorOptions } from '../types';
 import { ActionTypeRegistry } from '../action_type_registry';
 import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
 import { taskManagerMock } from '../../../task_manager/task_manager.mock';
-import { validateActionTypeConfig, validateActionTypeParams } from '../lib';
+import { validateParams, validateConfig, validateSecrets } from '../lib';
 import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { registerBuiltInActionTypes } from './index';
 import { sendEmail } from './lib/send_email';
-import { ActionParamsType, ActionTypeConfigType } from './email';
+import { ActionParamsType, ActionTypeConfigType, ActionTypeSecretsType } from './email';
 
 const sendEmailMock = sendEmail as jest.Mock;
 
@@ -43,6 +43,8 @@ beforeAll(() => {
     getServices,
     taskManager: taskManagerMock.create(),
     encryptedSavedObjectsPlugin: mockEncryptedSavedObjectsPlugin,
+    spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+    getBasePath: jest.fn().mockReturnValue(undefined),
   });
 
   registerBuiltInActionTypes(actionTypeRegistry);
@@ -71,11 +73,9 @@ describe('config validation', () => {
   test('config validation succeeds when config is valid', () => {
     const config: Record<string, any> = {
       service: 'gmail',
-      user: 'bob',
-      password: 'supersecret',
       from: 'bob@example.com',
     };
-    expect(validateActionTypeConfig(actionType, config)).toEqual({
+    expect(validateConfig(actionType, config)).toEqual({
       ...config,
       host: null,
       port: null,
@@ -85,7 +85,7 @@ describe('config validation', () => {
     delete config.service;
     config.host = 'elastic.co';
     config.port = 8080;
-    expect(validateActionTypeConfig(actionType, config)).toEqual({
+    expect(validateConfig(actionType, config)).toEqual({
       ...config,
       service: null,
       secure: null,
@@ -101,37 +101,58 @@ describe('config validation', () => {
 
     // empty object
     expect(() => {
-      validateActionTypeConfig(actionType, {});
+      validateConfig(actionType, {});
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [user]: expected value of type [string] but got [undefined]"`
+      `"error validating action type config: [from]: expected value of type [string] but got [undefined]"`
     );
 
     // no service or host/port
     expect(() => {
-      validateActionTypeConfig(actionType, baseConfig);
+      validateConfig(actionType, baseConfig);
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: either [service] or [host]/[port] is required"`
+      `"error validating action type config: [user]: definition for this key is missing"`
     );
 
     // host but no port
     expect(() => {
-      validateActionTypeConfig(actionType, { ...baseConfig, host: 'elastic.co' });
+      validateConfig(actionType, { ...baseConfig, host: 'elastic.co' });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [port] is required if [service] is not provided"`
+      `"error validating action type config: [user]: definition for this key is missing"`
     );
 
     // port but no host
     expect(() => {
-      validateActionTypeConfig(actionType, { ...baseConfig, port: 8080 });
+      validateConfig(actionType, { ...baseConfig, port: 8080 });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [host] is required if [service] is not provided"`
+      `"error validating action type config: [user]: definition for this key is missing"`
     );
 
     // invalid service
     expect(() => {
-      validateActionTypeConfig(actionType, { ...baseConfig, service: 'bad-nodemailer-service' });
+      validateConfig(actionType, {
+        ...baseConfig,
+        service: 'bad-nodemailer-service',
+      });
+    }).toThrowErrorMatchingInlineSnapshot(
+      `"error validating action type config: [user]: definition for this key is missing"`
+    );
+  });
+});
+
+describe('secrets validation', () => {
+  test('secrets validation succeeds when secrets is valid', () => {
+    const secrets: Record<string, any> = {
+      user: 'bob',
+      password: 'supersecret',
+    };
+    expect(validateSecrets(actionType, secrets)).toEqual(secrets);
+  });
+
+  test('secrets validation fails when secrets is not valid', () => {
+    expect(() => {
+      validateSecrets(actionType, {});
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [service] value \\"bad-nodemailer-service\\" is not valid"`
+      `"error validating action type secrets: [user]: expected value of type [string] but got [undefined]"`
     );
   });
 });
@@ -143,7 +164,7 @@ describe('params validation', () => {
       subject: 'this is a test',
       message: 'this is the message',
     };
-    expect(validateActionTypeParams(actionType, params)).toMatchInlineSnapshot(`
+    expect(validateParams(actionType, params)).toMatchInlineSnapshot(`
 Object {
   "bcc": Array [],
   "cc": Array [],
@@ -159,9 +180,9 @@ Object {
   test('params validation fails when params is not valid', () => {
     // empty object
     expect(() => {
-      validateActionTypeParams(actionType, {});
+      validateParams(actionType, {});
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [subject]: expected value of type [string] but got [undefined]"`
+      `"error validating action params: [subject]: expected value of type [string] but got [undefined]"`
     );
   });
 });
@@ -173,9 +194,11 @@ describe('execute()', () => {
       host: 'a host',
       port: 42,
       secure: true,
+      from: 'bob@example.com',
+    };
+    const secrets: ActionTypeSecretsType = {
       user: 'bob',
       password: 'supersecret',
-      from: 'bob@example.com',
     };
     const params: ActionParamsType = {
       to: ['jim@example.com'],
@@ -186,7 +209,7 @@ describe('execute()', () => {
     };
 
     const id = 'some-id';
-    const executorOptions: ActionTypeExecutorOptions = { id, config, params, services };
+    const executorOptions: ActionTypeExecutorOptions = { id, config, params, secrets, services };
     sendEmailMock.mockReset();
     await actionType.executor(executorOptions);
     expect(sendEmailMock.mock.calls[0][1]).toMatchInlineSnapshot(`
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
index 8cc4e8215fde2..a2d3aa58656aa 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
@@ -15,14 +15,10 @@ const PORT_MAX = 256 * 256 - 1;
 
 // config definition
 
-const unencryptedConfigProperties = ['service', 'host', 'port', 'secure', 'from'];
-
 export type ActionTypeConfigType = TypeOf<typeof ConfigSchema>;
 
 const ConfigSchema = schema.object(
   {
-    user: schema.string(),
-    password: schema.string(),
     service: nullableType(schema.string()),
     host: nullableType(schema.string()),
     port: nullableType(schema.number({ min: 1, max: PORT_MAX })),
@@ -60,6 +56,15 @@ function validateConfig(configObject: any): string | void {
   }
 }
 
+// secrets definition
+
+export type ActionTypeSecretsType = TypeOf<typeof SecretsSchema>;
+
+const SecretsSchema = schema.object({
+  user: schema.string(),
+  password: schema.string(),
+});
+
 // params definition
 
 export type ActionParamsType = TypeOf<typeof ParamsSchema>;
@@ -94,9 +99,9 @@ function validateParams(paramsObject: any): string | void {
 export const actionType: ActionType = {
   id: '.email',
   name: 'email',
-  unencryptedAttributes: unencryptedConfigProperties,
   validate: {
     config: ConfigSchema,
+    secrets: SecretsSchema,
     params: ParamsSchema,
   },
   executor,
@@ -107,12 +112,13 @@ export const actionType: ActionType = {
 async function executor(execOptions: ActionTypeExecutorOptions): Promise<ActionTypeExecutorResult> {
   const id = execOptions.id;
   const config = execOptions.config as ActionTypeConfigType;
+  const secrets = execOptions.secrets as ActionTypeSecretsType;
   const params = execOptions.params as ActionParamsType;
   const services = execOptions.services;
 
   const transport: any = {
-    user: config.user,
-    password: config.password,
+    user: secrets.user,
+    password: secrets.password,
   };
 
   if (config.service !== null) {
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
index bff315a7741fd..301f6613bcfa6 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
@@ -12,7 +12,7 @@ import { ActionType, ActionTypeExecutorOptions } from '../types';
 import { ActionTypeRegistry } from '../action_type_registry';
 import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
 import { taskManagerMock } from '../../../task_manager/task_manager.mock';
-import { validateActionTypeConfig, validateActionTypeParams } from '../lib';
+import { validateConfig, validateParams } from '../lib';
 import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { registerBuiltInActionTypes } from './index';
 import { ActionParamsType, ActionTypeConfigType } from './es_index';
@@ -40,6 +40,8 @@ beforeAll(() => {
     getServices,
     taskManager: taskManagerMock.create(),
     encryptedSavedObjectsPlugin: mockEncryptedSavedObjectsPlugin,
+    spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+    getBasePath: jest.fn().mockReturnValue(undefined),
   });
 
   registerBuiltInActionTypes(actionTypeRegistry);
@@ -68,13 +70,13 @@ describe('config validation', () => {
   test('config validation succeeds when config is valid', () => {
     const config: Record<string, any> = {};
 
-    expect(validateActionTypeConfig(actionType, config)).toEqual({
+    expect(validateConfig(actionType, config)).toEqual({
       ...config,
       index: null,
     });
 
     config.index = 'testing-123';
-    expect(validateActionTypeConfig(actionType, config)).toEqual({
+    expect(validateConfig(actionType, config)).toEqual({
       ...config,
       index: 'testing-123',
     });
@@ -86,18 +88,18 @@ describe('config validation', () => {
     };
 
     expect(() => {
-      validateActionTypeConfig(actionType, baseConfig);
+      validateConfig(actionType, baseConfig);
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [indeX]: definition for this key is missing"`
+      `"error validating action type config: [indeX]: definition for this key is missing"`
     );
 
     delete baseConfig.user;
     baseConfig.index = 666;
 
     expect(() => {
-      validateActionTypeConfig(actionType, baseConfig);
+      validateConfig(actionType, baseConfig);
     }).toThrowErrorMatchingInlineSnapshot(`
-"The actionTypeConfig is invalid: [index]: types that failed validation:
+"error validating action type config: [index]: types that failed validation:
 - [index.0]: expected value of type [string] but got [number]
 - [index.1]: expected value to equal [null] but got [666]"
 `);
@@ -112,7 +114,7 @@ describe('params validation', () => {
       refresh: true,
       documents: [{ rando: 'thing' }],
     };
-    expect(validateActionTypeParams(actionType, params)).toMatchInlineSnapshot(`
+    expect(validateParams(actionType, params)).toMatchInlineSnapshot(`
         Object {
           "documents": Array [
             Object {
@@ -128,7 +130,7 @@ describe('params validation', () => {
     delete params.index;
     delete params.refresh;
     delete params.executionTimeField;
-    expect(validateActionTypeParams(actionType, params)).toMatchInlineSnapshot(`
+    expect(validateParams(actionType, params)).toMatchInlineSnapshot(`
         Object {
           "documents": Array [
             Object {
@@ -141,45 +143,46 @@ describe('params validation', () => {
 
   test('params validation fails when params is not valid', () => {
     expect(() => {
-      validateActionTypeParams(actionType, { documents: [{}], jim: 'bob' });
+      validateParams(actionType, { documents: [{}], jim: 'bob' });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [jim]: definition for this key is missing"`
+      `"error validating action params: [jim]: definition for this key is missing"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, {});
+      validateParams(actionType, {});
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [documents]: expected value of type [array] but got [undefined]"`
+      `"error validating action params: [documents]: expected value of type [array] but got [undefined]"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, { index: 666 });
+      validateParams(actionType, { index: 666 });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [index]: expected value of type [string] but got [number]"`
+      `"error validating action params: [index]: expected value of type [string] but got [number]"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, { executionTimeField: true });
+      validateParams(actionType, { executionTimeField: true });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [executionTimeField]: expected value of type [string] but got [boolean]"`
+      `"error validating action params: [executionTimeField]: expected value of type [string] but got [boolean]"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, { refresh: 'true' });
+      validateParams(actionType, { refresh: 'true' });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [refresh]: expected value of type [boolean] but got [string]"`
+      `"error validating action params: [refresh]: expected value of type [boolean] but got [string]"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, { documents: ['should be an object'] });
+      validateParams(actionType, { documents: ['should be an object'] });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [documents.0]: expected value of type [object] but got [string]"`
+      `"error validating action params: [documents.0]: expected value of type [object] but got [string]"`
     );
   });
 });
 
 describe('execute()', () => {
   test('ensure parameters are as expected', async () => {
+    const secrets = {};
     let config: ActionTypeConfigType;
     let params: ActionParamsType;
     let executorOptions: ActionTypeExecutorOptions;
@@ -195,7 +198,7 @@ describe('execute()', () => {
 
     const id = 'some-id';
 
-    executorOptions = { id, config, params, services };
+    executorOptions = { id, config, secrets, params, services };
     services.callCluster.mockClear();
     await actionType.executor(executorOptions);
 
@@ -227,7 +230,7 @@ describe('execute()', () => {
       refresh: true,
     };
 
-    executorOptions = { id, config, params, services };
+    executorOptions = { id, config, secrets, params, services };
     services.callCluster.mockClear();
     await actionType.executor(executorOptions);
 
@@ -264,7 +267,7 @@ describe('execute()', () => {
       refresh: undefined,
     };
 
-    executorOptions = { id, config, params, services };
+    executorOptions = { id, config, secrets, params, services };
     services.callCluster.mockClear();
     await actionType.executor(executorOptions);
 
@@ -296,7 +299,7 @@ describe('execute()', () => {
       refresh: undefined,
     };
 
-    executorOptions = { id, config, params, services };
+    executorOptions = { id, config, secrets, params, services };
     services.callCluster.mockClear();
     await actionType.executor(executorOptions);
 
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
index 5e456121cbfd3..4d32633f541b3 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
@@ -11,8 +11,6 @@ import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from
 
 // config definition
 
-const unencryptedConfigProperties: string[] = ['index'];
-
 export type ActionTypeConfigType = TypeOf<typeof ConfigSchema>;
 
 const ConfigSchema = schema.object({
@@ -38,7 +36,6 @@ const ParamsSchema = schema.object({
 export const actionType: ActionType = {
   id: '.index',
   name: 'index',
-  unencryptedAttributes: unencryptedConfigProperties,
   validate: {
     config: ConfigSchema,
     params: ParamsSchema,
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
index 18a9460e68fb5..ef38c5b910627 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
@@ -8,7 +8,7 @@ import { ActionType, Services } from '../types';
 import { ActionTypeRegistry } from '../action_type_registry';
 import { taskManagerMock } from '../../../task_manager/task_manager.mock';
 import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
-import { validateActionTypeParams } from '../lib';
+import { validateParams } from '../lib';
 import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 
 import { registerBuiltInActionTypes } from './index';
@@ -35,6 +35,8 @@ beforeAll(() => {
     getServices,
     taskManager: taskManagerMock.create(),
     encryptedSavedObjectsPlugin: mockEncryptedSavedObjectsPlugin,
+    spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+    getBasePath: jest.fn().mockReturnValue(undefined),
   });
   registerBuiltInActionTypes(actionTypeRegistry);
 });
@@ -57,7 +59,7 @@ describe('get()', () => {
   });
 });
 
-describe('validateActionTypeParams()', () => {
+describe('validateParams()', () => {
   let actionType: ActionType;
 
   beforeAll(() => {
@@ -66,12 +68,12 @@ describe('validateActionTypeParams()', () => {
   });
 
   test('should validate and pass when params is valid', () => {
-    expect(validateActionTypeParams(actionType, { message: 'a message' })).toEqual({
+    expect(validateParams(actionType, { message: 'a message' })).toEqual({
       message: 'a message',
       tags: ['info', 'alerting'],
     });
     expect(
-      validateActionTypeParams(actionType, {
+      validateParams(actionType, {
         message: 'a message',
         tags: ['info', 'blorg'],
       })
@@ -83,27 +85,27 @@ describe('validateActionTypeParams()', () => {
 
   test('should validate and throw error when params is invalid', () => {
     expect(() => {
-      validateActionTypeParams(actionType, {});
+      validateParams(actionType, {});
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [message]: expected value of type [string] but got [undefined]"`
+      `"error validating action params: [message]: expected value of type [string] but got [undefined]"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, { message: 1 });
+      validateParams(actionType, { message: 1 });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [message]: expected value of type [string] but got [number]"`
+      `"error validating action params: [message]: expected value of type [string] but got [number]"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, { message: 'x', tags: 2 });
+      validateParams(actionType, { message: 'x', tags: 2 });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [tags]: expected value of type [array] but got [number]"`
+      `"error validating action params: [tags]: expected value of type [array] but got [number]"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, { message: 'x', tags: [2] });
+      validateParams(actionType, { message: 'x', tags: [2] });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [tags.0]: expected value of type [string] but got [number]"`
+      `"error validating action params: [tags.0]: expected value of type [string] but got [number]"`
     );
   });
 });
@@ -122,8 +124,9 @@ describe('execute()', () => {
         callCluster: async (path: string, opts: any) => {},
         savedObjectsClient: SavedObjectsClientMock.create(),
       },
-      config: {},
       params: { message: 'message text here', tags: ['tag1', 'tag2'] },
+      config: {},
+      secrets: {},
     });
     expect(mockLog).toMatchInlineSnapshot(`
 [MockFunction] {
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
index 6a41e5404aa15..a11362ff63716 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
@@ -10,12 +10,6 @@ import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from
 
 const DEFAULT_TAGS = ['info', 'alerting'];
 
-// config definition
-
-const unencryptedConfigProperties: string[] = [];
-
-const ConfigSchema = schema.object({});
-
 // params definition
 
 export type ActionParamsType = TypeOf<typeof ParamsSchema>;
@@ -30,9 +24,7 @@ const ParamsSchema = schema.object({
 export const actionType: ActionType = {
   id: '.server-log',
   name: 'server-log',
-  unencryptedAttributes: unencryptedConfigProperties,
   validate: {
-    config: ConfigSchema,
     params: ParamsSchema,
   },
   executor,
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
index c0613091e8aef..c2cc2d04d4f37 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -8,8 +8,7 @@ import { ActionType, Services, ActionTypeExecutorOptions } from '../types';
 import { ActionTypeRegistry } from '../action_type_registry';
 import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
 import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
-import { validateActionTypeParams } from '../lib';
-import { validateActionTypeConfig } from '../lib';
+import { validateParams, validateSecrets } from '../lib';
 import { getActionType } from './slack';
 import { taskManagerMock } from '../../../task_manager/task_manager.mock';
 
@@ -53,6 +52,8 @@ beforeAll(() => {
     getServices,
     taskManager: taskManagerMock.create(),
     encryptedSavedObjectsPlugin: mockEncryptedSavedObjectsPlugin,
+    spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+    getBasePath: jest.fn().mockReturnValue(undefined),
   });
   actionTypeRegistry.register(getActionType({ executor: mockSlackExecutor }));
   actionType = actionTypeRegistry.get(ACTION_TYPE_ID);
@@ -76,44 +77,44 @@ describe('action is registered', () => {
 
 describe('validateParams()', () => {
   test('should validate and pass when params is valid', () => {
-    expect(validateActionTypeParams(actionType, { message: 'a message' })).toEqual({
+    expect(validateParams(actionType, { message: 'a message' })).toEqual({
       message: 'a message',
     });
   });
 
   test('should validate and throw error when params is invalid', () => {
     expect(() => {
-      validateActionTypeParams(actionType, {});
+      validateParams(actionType, {});
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [message]: expected value of type [string] but got [undefined]"`
+      `"error validating action params: [message]: expected value of type [string] but got [undefined]"`
     );
 
     expect(() => {
-      validateActionTypeParams(actionType, { message: 1 });
+      validateParams(actionType, { message: 1 });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionParams is invalid: [message]: expected value of type [string] but got [number]"`
+      `"error validating action params: [message]: expected value of type [string] but got [number]"`
     );
   });
 });
 
-describe('validateActionTypeConfig()', () => {
+describe('validateActionTypeSecrets()', () => {
   test('should validate and pass when config is valid', () => {
-    validateActionTypeConfig(actionType, {
+    validateSecrets(actionType, {
       webhookUrl: 'https://example.com',
     });
   });
 
   test('should validate and throw error when config is invalid', () => {
     expect(() => {
-      validateActionTypeConfig(actionType, {});
+      validateSecrets(actionType, {});
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [webhookUrl]: expected value of type [string] but got [undefined]"`
+      `"error validating action type secrets: [webhookUrl]: expected value of type [string] but got [undefined]"`
     );
 
     expect(() => {
-      validateActionTypeConfig(actionType, { webhookUrl: 1 });
+      validateSecrets(actionType, { webhookUrl: 1 });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"The actionTypeConfig is invalid: [webhookUrl]: expected value of type [string] but got [number]"`
+      `"error validating action type secrets: [webhookUrl]: expected value of type [string] but got [number]"`
     );
   });
 });
@@ -123,7 +124,8 @@ describe('execute()', () => {
     const response = await actionType.executor({
       id: 'some-id',
       services,
-      config: { webhookUrl: 'http://example.com' },
+      config: {},
+      secrets: { webhookUrl: 'http://example.com' },
       params: { message: 'this invocation should succeed' },
     });
     expect(response).toMatchInlineSnapshot(`
@@ -138,7 +140,8 @@ Object {
       actionType.executor({
         id: 'some-id',
         services,
-        config: { webhookUrl: 'http://example.com' },
+        config: {},
+        secrets: { webhookUrl: 'http://example.com' },
         params: { message: 'failure: this invocation should fail' },
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
index 8b3b0144f57bc..a5bd254a20837 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
@@ -14,13 +14,11 @@ import {
   ExecutorType,
 } from '../types';
 
-// config definition
+// secrets definition
 
-const unencryptedConfigProperties: string[] = [];
+export type ActionTypeSecretsType = TypeOf<typeof SecretsSchema>;
 
-export type ActionTypeConfigType = TypeOf<typeof ConfigSchema>;
-
-const ConfigSchema = schema.object({
+const SecretsSchema = schema.object({
   webhookUrl: schema.string(),
 });
 
@@ -41,9 +39,8 @@ export function getActionType({ executor }: { executor?: ExecutorType } = {}): A
   return {
     id: '.slack',
     name: 'slack',
-    unencryptedAttributes: unencryptedConfigProperties,
     validate: {
-      config: ConfigSchema,
+      secrets: SecretsSchema,
       params: ParamsSchema,
     },
     executor,
@@ -59,11 +56,11 @@ async function slackExecutor(
   execOptions: ActionTypeExecutorOptions
 ): Promise<ActionTypeExecutorResult> {
   const id = execOptions.id;
-  const config = execOptions.config as ActionTypeConfigType;
+  const secrets = execOptions.secrets as ActionTypeSecretsType;
   const params = execOptions.params as ActionParamsType;
 
   let result: IncomingWebhookResult;
-  const { webhookUrl } = config;
+  const { webhookUrl } = secrets;
   const { message } = params;
 
   try {
diff --git a/x-pack/legacy/plugins/actions/server/create_fire_function.test.ts b/x-pack/legacy/plugins/actions/server/create_fire_function.test.ts
index 8def316c12df5..1f286d371e633 100644
--- a/x-pack/legacy/plugins/actions/server/create_fire_function.test.ts
+++ b/x-pack/legacy/plugins/actions/server/create_fire_function.test.ts
@@ -10,6 +10,7 @@ import { SavedObjectsClientMock } from '../../../../../src/core/server/mocks';
 
 const mockTaskManager = taskManagerMock.create();
 const savedObjectsClient = SavedObjectsClientMock.create();
+const spaceIdToNamespace = jest.fn();
 
 beforeEach(() => jest.resetAllMocks());
 
@@ -18,6 +19,7 @@ describe('fire()', () => {
     const fireFn = createFireFunction({
       taskManager: mockTaskManager,
       internalSavedObjectsRepository: savedObjectsClient,
+      spaceIdToNamespace,
     });
     savedObjectsClient.get.mockResolvedValueOnce({
       id: '123',
@@ -27,41 +29,41 @@ describe('fire()', () => {
       },
       references: [],
     });
+    spaceIdToNamespace.mockReturnValueOnce('namespace1');
     await fireFn({
       id: '123',
       params: { baz: false },
-      namespace: 'abc',
-      basePath: '/s/default',
+      spaceId: 'default',
     });
     expect(mockTaskManager.schedule).toHaveBeenCalledTimes(1);
     expect(mockTaskManager.schedule.mock.calls[0]).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "params": Object {
-      "actionTypeParams": Object {
-        "baz": false,
-      },
-      "basePath": "/s/default",
-      "id": "123",
-      "namespace": "abc",
-    },
-    "scope": Array [
-      "actions",
-    ],
-    "state": Object {},
-    "taskType": "actions:mock-action",
-  },
-]
-`);
+      Array [
+        Object {
+          "params": Object {
+            "id": "123",
+            "params": Object {
+              "baz": false,
+            },
+            "spaceId": "default",
+          },
+          "scope": Array [
+            "actions",
+          ],
+          "state": Object {},
+          "taskType": "actions:mock-action",
+        },
+      ]
+    `);
     expect(savedObjectsClient.get).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.get.mock.calls[0]).toMatchInlineSnapshot(`
-Array [
-  "action",
-  "123",
-  Object {
-    "namespace": "abc",
-  },
-]
-`);
+            Array [
+              "action",
+              "123",
+              Object {
+                "namespace": "namespace1",
+              },
+            ]
+        `);
+    expect(spaceIdToNamespace).toHaveBeenCalledWith('default');
   });
 });
diff --git a/x-pack/legacy/plugins/actions/server/create_fire_function.ts b/x-pack/legacy/plugins/actions/server/create_fire_function.ts
index 7ff31f4d455f9..0bf11cbf5dd40 100644
--- a/x-pack/legacy/plugins/actions/server/create_fire_function.ts
+++ b/x-pack/legacy/plugins/actions/server/create_fire_function.ts
@@ -6,32 +6,34 @@
 
 import { SavedObjectsClientContract } from 'src/core/server';
 import { TaskManager } from '../../task_manager';
+import { SpacesPlugin } from '../../spaces';
 
 interface CreateFireFunctionOptions {
   taskManager: TaskManager;
   internalSavedObjectsRepository: SavedObjectsClientContract;
+  spaceIdToNamespace: SpacesPlugin['spaceIdToNamespace'];
 }
 
-interface FireOptions {
+export interface FireOptions {
   id: string;
   params: Record<string, any>;
-  namespace?: string;
-  basePath: string;
+  spaceId: string;
 }
 
 export function createFireFunction({
   taskManager,
   internalSavedObjectsRepository,
+  spaceIdToNamespace,
 }: CreateFireFunctionOptions) {
-  return async function fire({ id, params, namespace, basePath }: FireOptions) {
+  return async function fire({ id, params, spaceId }: FireOptions) {
+    const namespace = spaceIdToNamespace(spaceId);
     const actionSavedObject = await internalSavedObjectsRepository.get('action', id, { namespace });
     await taskManager.schedule({
       taskType: `actions:${actionSavedObject.attributes.actionTypeId}`,
       params: {
         id,
-        basePath,
-        namespace,
-        actionTypeParams: params,
+        spaceId,
+        params,
       },
       state: {},
       scope: ['actions'],
diff --git a/x-pack/legacy/plugins/actions/server/init.ts b/x-pack/legacy/plugins/actions/server/init.ts
index 765653f0fec8c..27cff53bb97d1 100644
--- a/x-pack/legacy/plugins/actions/server/init.ts
+++ b/x-pack/legacy/plugins/actions/server/init.ts
@@ -18,19 +18,31 @@ import {
   listActionTypesRoute,
   fireRoute,
 } from './routes';
-
 import { registerBuiltInActionTypes } from './builtin_action_types';
+import { SpacesPlugin } from '../../spaces';
+import { createOptionalPlugin } from '../../../server/lib/optional_plugin';
 
 export function init(server: Legacy.Server) {
+  const config = server.config();
+  const spaces = createOptionalPlugin<SpacesPlugin>(
+    config,
+    'xpack.spaces',
+    server.plugins,
+    'spaces'
+  );
+
   const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
   const savedObjectsRepositoryWithInternalUser = server.savedObjects.getSavedObjectsRepository(
     callWithInternalUser
   );
 
   // Encrypted attributes
+  // - `secrets` properties will be encrypted
+  // - `config` will be included in AAD
+  // - everything else excluded from AAD
   server.plugins.encrypted_saved_objects!.registerType({
     type: 'action',
-    attributesToEncrypt: new Set(['actionTypeConfigSecrets']),
+    attributesToEncrypt: new Set(['secrets']),
     attributesToExcludeFromAAD: new Set(['description']),
   });
 
@@ -55,6 +67,14 @@ export function init(server: Legacy.Server) {
     getServices,
     taskManager: taskManager!,
     encryptedSavedObjectsPlugin: server.plugins.encrypted_saved_objects!,
+    getBasePath(...args) {
+      return spaces.isEnabled
+        ? spaces.getBasePath(...args)
+        : server.config().get('server.basePath');
+    },
+    spaceIdToNamespace(...args) {
+      return spaces.isEnabled ? spaces.spaceIdToNamespace(...args) : undefined;
+    },
   });
 
   registerBuiltInActionTypes(actionTypeRegistry);
@@ -75,6 +95,9 @@ export function init(server: Legacy.Server) {
   const fireFn = createFireFunction({
     taskManager: taskManager!,
     internalSavedObjectsRepository: savedObjectsRepositoryWithInternalUser,
+    spaceIdToNamespace(...args) {
+      return spaces.isEnabled ? spaces.spaceIdToNamespace(...args) : undefined;
+    },
   });
 
   // Expose functions to server
diff --git a/x-pack/legacy/plugins/actions/server/lib/execute.test.ts b/x-pack/legacy/plugins/actions/server/lib/execute.test.ts
index ec9ebb2450c7b..0f14df6e8c678 100644
--- a/x-pack/legacy/plugins/actions/server/lib/execute.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/execute.test.ts
@@ -39,7 +39,6 @@ test('successfully executes', async () => {
   const actionType = {
     id: 'test',
     name: 'Test',
-    unencryptedAttributes: [],
     executor: jest.fn(),
   };
   const actionSavedObject = {
@@ -47,10 +46,10 @@ test('successfully executes', async () => {
     type: 'action',
     attributes: {
       actionTypeId: 'test',
-      actionTypeConfig: {
+      config: {
         bar: true,
       },
-      actionTypeConfigSecrets: {
+      secrets: {
         baz: true,
       },
     },
@@ -74,17 +73,18 @@ test('successfully executes', async () => {
     services: expect.anything(),
     config: {
       bar: true,
+    },
+    secrets: {
       baz: true,
     },
     params: { foo: true },
   });
 });
 
-test('provides empty config when actionTypeConfig and / or actionTypeConfigSecrets is empty', async () => {
+test('provides empty config when config and / or secrets is empty', async () => {
   const actionType = {
     id: 'test',
     name: 'Test',
-    unencryptedAttributes: [],
     executor: jest.fn(),
   };
   const actionSavedObject = {
@@ -102,14 +102,13 @@ test('provides empty config when actionTypeConfig and / or actionTypeConfigSecre
 
   expect(actionType.executor).toHaveBeenCalledTimes(1);
   const executorCall = actionType.executor.mock.calls[0][0];
-  expect(executorCall.config).toMatchInlineSnapshot(`Object {}`);
+  expect(executorCall.config).toMatchInlineSnapshot(`undefined`);
 });
 
 test('throws an error when config is invalid', async () => {
   const actionType = {
     id: 'test',
     name: 'Test',
-    unencryptedAttributes: [],
     validate: {
       config: schema.object({
         param1: schema.string(),
@@ -133,7 +132,7 @@ test('throws an error when config is invalid', async () => {
   expect(result).toEqual({
     status: 'error',
     retry: false,
-    message: `The actionTypeConfig is invalid: [param1]: expected value of type [string] but got [undefined]`,
+    message: `error validating action type config: [param1]: expected value of type [string] but got [undefined]`,
   });
 });
 
@@ -141,7 +140,6 @@ test('throws an error when params is invalid', async () => {
   const actionType = {
     id: 'test',
     name: 'Test',
-    unencryptedAttributes: [],
     validate: {
       params: schema.object({
         param1: schema.string(),
@@ -165,6 +163,6 @@ test('throws an error when params is invalid', async () => {
   expect(result).toEqual({
     status: 'error',
     retry: false,
-    message: `The actionParams is invalid: [param1]: expected value of type [string] but got [undefined]`,
+    message: `error validating action params: [param1]: expected value of type [string] but got [undefined]`,
   });
 });
diff --git a/x-pack/legacy/plugins/actions/server/lib/execute.ts b/x-pack/legacy/plugins/actions/server/lib/execute.ts
index 19e683c3386b3..95c4f17dd922e 100644
--- a/x-pack/legacy/plugins/actions/server/lib/execute.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/execute.ts
@@ -5,13 +5,12 @@
  */
 
 import { Services, ActionTypeRegistryContract, ActionTypeExecutorResult } from '../types';
-import { validateActionTypeConfig } from './validate_action_type_config';
-import { validateActionTypeParams } from './validate_action_type_params';
+import { validateParams, validateConfig, validateSecrets } from './validate_with_schema';
 import { EncryptedSavedObjectsPlugin } from '../../../encrypted_saved_objects';
 
 interface ExecuteOptions {
   actionId: string;
-  namespace: string;
+  namespace?: string;
   services: Services;
   params: Record<string, any>;
   encryptedSavedObjectsPlugin: EncryptedSavedObjectsPlugin;
@@ -31,17 +30,15 @@ export async function execute({
     namespace,
   });
   const actionType = actionTypeRegistry.get(action.attributes.actionTypeId);
-  const mergedActionTypeConfig = {
-    ...(action.attributes.actionTypeConfig || {}),
-    ...(action.attributes.actionTypeConfigSecrets || {}),
-  };
 
-  let validatedConfig;
   let validatedParams;
+  let validatedConfig;
+  let validatedSecrets;
 
   try {
-    validatedConfig = validateActionTypeConfig(actionType, mergedActionTypeConfig);
-    validatedParams = validateActionTypeParams(actionType, params);
+    validatedParams = validateParams(actionType, params);
+    validatedConfig = validateConfig(actionType, action.attributes.config);
+    validatedSecrets = validateSecrets(actionType, action.attributes.secrets);
   } catch (err) {
     return { status: 'error', message: err.message, retry: false };
   }
@@ -55,8 +52,9 @@ export async function execute({
     result = await actionType.executor({
       id: actionId,
       services,
-      config: validatedConfig,
       params: validatedParams,
+      config: validatedConfig,
+      secrets: validatedSecrets,
     });
   } catch (err) {
     services.log(
diff --git a/x-pack/legacy/plugins/actions/server/lib/get_create_task_runner_function.test.ts b/x-pack/legacy/plugins/actions/server/lib/get_create_task_runner_function.test.ts
index d2cc4cb618568..4f732afc3ec7f 100644
--- a/x-pack/legacy/plugins/actions/server/lib/get_create_task_runner_function.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/get_create_task_runner_function.test.ts
@@ -14,13 +14,13 @@ import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks'
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { ExecutorError } from './executor_error';
 
+const spaceIdToNamespace = jest.fn();
 const actionTypeRegistry = actionTypeRegistryMock.create();
 const mockedEncryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create();
 
 const actionType = {
   id: '1',
   name: '1',
-  unencryptedAttributes: [],
   executor: jest.fn(),
 };
 
@@ -35,7 +35,9 @@ const getCreateTaskRunnerFunctionParams = {
     };
   },
   actionTypeRegistry,
+  spaceIdToNamespace,
   encryptedSavedObjectsPlugin: mockedEncryptedSavedObjectsPlugin,
+  getBasePath: jest.fn().mockReturnValue(undefined),
 };
 
 const taskInstanceMock = {
@@ -43,8 +45,8 @@ const taskInstanceMock = {
   state: {},
   params: {
     id: '2',
-    actionTypeParams: { baz: true },
-    namespace: 'test',
+    params: { baz: true },
+    spaceId: 'test',
   },
   taskType: 'actions:1',
 };
@@ -57,12 +59,14 @@ test('executes the task by calling the executor with proper parameters', async (
   const runner = createTaskRunner({ taskInstance: taskInstanceMock });
 
   mockExecute.mockResolvedValueOnce({ status: 'ok' });
+  spaceIdToNamespace.mockReturnValueOnce('namespace-test');
 
   const runnerResult = await runner.run();
 
   expect(runnerResult).toBeUndefined();
+  expect(spaceIdToNamespace).toHaveBeenCalledWith('test');
   expect(mockExecute).toHaveBeenCalledWith({
-    namespace: 'test',
+    namespace: 'namespace-test',
     actionId: '2',
     actionTypeRegistry,
     encryptedSavedObjectsPlugin: mockedEncryptedSavedObjectsPlugin,
diff --git a/x-pack/legacy/plugins/actions/server/lib/get_create_task_runner_function.ts b/x-pack/legacy/plugins/actions/server/lib/get_create_task_runner_function.ts
index eb1c0e8ac8a40..f9398f25ff7ff 100644
--- a/x-pack/legacy/plugins/actions/server/lib/get_create_task_runner_function.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/get_create_task_runner_function.ts
@@ -9,11 +9,14 @@ import { ExecutorError } from './executor_error';
 import { ActionTypeRegistryContract, GetServicesFunction } from '../types';
 import { TaskInstance } from '../../../task_manager';
 import { EncryptedSavedObjectsPlugin } from '../../../encrypted_saved_objects';
+import { SpacesPlugin } from '../../../spaces';
 
 interface CreateTaskRunnerFunctionOptions {
   getServices: GetServicesFunction;
   actionTypeRegistry: ActionTypeRegistryContract;
   encryptedSavedObjectsPlugin: EncryptedSavedObjectsPlugin;
+  spaceIdToNamespace: SpacesPlugin['spaceIdToNamespace'];
+  getBasePath: SpacesPlugin['getBasePath'];
 }
 
 interface TaskRunnerOptions {
@@ -24,18 +27,22 @@ export function getCreateTaskRunnerFunction({
   getServices,
   actionTypeRegistry,
   encryptedSavedObjectsPlugin,
+  spaceIdToNamespace,
+  getBasePath,
 }: CreateTaskRunnerFunctionOptions) {
   return ({ taskInstance }: TaskRunnerOptions) => {
     return {
       run: async () => {
-        const { namespace, id, actionTypeParams } = taskInstance.params;
+        const { spaceId, id, params } = taskInstance.params;
+        const namespace = spaceIdToNamespace(spaceId);
+        const basePath = getBasePath(spaceId);
         const executorResult = await execute({
           namespace,
           actionTypeRegistry,
           encryptedSavedObjectsPlugin,
           actionId: id,
-          services: getServices(taskInstance.params.basePath),
-          params: actionTypeParams,
+          services: getServices(basePath),
+          params,
         });
         if (executorResult.status === 'error') {
           // Task manager error handler only kicks in when an error thrown (at this time)
diff --git a/x-pack/legacy/plugins/actions/server/lib/index.ts b/x-pack/legacy/plugins/actions/server/lib/index.ts
index 75e4a5595a769..c1cca1f68addb 100644
--- a/x-pack/legacy/plugins/actions/server/lib/index.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/index.ts
@@ -6,6 +6,5 @@
 
 export { execute } from './execute';
 export { getCreateTaskRunnerFunction } from './get_create_task_runner_function';
-export { validateActionTypeConfig } from './validate_action_type_config';
-export { validateActionTypeParams } from './validate_action_type_params';
 export { ExecutorError } from './executor_error';
+export { validateParams, validateConfig, validateSecrets } from './validate_with_schema';
diff --git a/x-pack/legacy/plugins/actions/server/lib/validate_action_type_config.test.ts b/x-pack/legacy/plugins/actions/server/lib/validate_action_type_config.test.ts
deleted file mode 100644
index b348384d6e529..0000000000000
--- a/x-pack/legacy/plugins/actions/server/lib/validate_action_type_config.test.ts
+++ /dev/null
@@ -1,75 +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 { schema } from '@kbn/config-schema';
-import { validateActionTypeConfig } from './validate_action_type_config';
-import { ExecutorType } from '../types';
-
-const executor: ExecutorType = async options => {
-  return { status: 'ok' };
-};
-
-test('should return passed in config when validation not defined', () => {
-  const result = validateActionTypeConfig(
-    {
-      id: 'my-action-type',
-      name: 'My action type',
-      unencryptedAttributes: [],
-      executor,
-    },
-    {
-      foo: true,
-    }
-  );
-  expect(result).toEqual({ foo: true });
-});
-
-test('should validate and apply defaults when actionTypeConfig is valid', () => {
-  const result = validateActionTypeConfig(
-    {
-      id: 'my-action-type',
-      name: 'My action type',
-      unencryptedAttributes: [],
-      validate: {
-        config: schema.object({
-          param1: schema.string(),
-          param2: schema.string({ defaultValue: 'default-value' }),
-        }),
-      },
-      executor,
-    },
-    { param1: 'value' }
-  );
-  expect(result).toEqual({
-    param1: 'value',
-    param2: 'default-value',
-  });
-});
-
-test('should validate and throw error when actionTypeConfig is invalid', () => {
-  expect(() =>
-    validateActionTypeConfig(
-      {
-        id: 'my-action-type',
-        name: 'My action type',
-        unencryptedAttributes: [],
-        validate: {
-          config: schema.object({
-            obj: schema.object({
-              param1: schema.string(),
-            }),
-          }),
-        },
-        executor,
-      },
-      {
-        obj: {},
-      }
-    )
-  ).toThrowErrorMatchingInlineSnapshot(
-    `"The actionTypeConfig is invalid: [obj.param1]: expected value of type [string] but got [undefined]"`
-  );
-});
diff --git a/x-pack/legacy/plugins/actions/server/lib/validate_action_type_config.ts b/x-pack/legacy/plugins/actions/server/lib/validate_action_type_config.ts
deleted file mode 100644
index ce8bc7dba2a9a..0000000000000
--- a/x-pack/legacy/plugins/actions/server/lib/validate_action_type_config.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import Boom from 'boom';
-import { ActionType } from '../types';
-
-export function validateActionTypeConfig<T extends Record<string, any>>(
-  actionType: ActionType,
-  config: T
-): T {
-  const validator = actionType.validate && actionType.validate.config;
-  if (!validator) {
-    return config;
-  }
-
-  try {
-    return validator.validate(config);
-  } catch (err) {
-    throw Boom.badRequest(`The actionTypeConfig is invalid: ${err.message}`);
-  }
-}
diff --git a/x-pack/legacy/plugins/actions/server/lib/validate_action_type_params.test.ts b/x-pack/legacy/plugins/actions/server/lib/validate_action_type_params.test.ts
deleted file mode 100644
index 58de8c01d89b0..0000000000000
--- a/x-pack/legacy/plugins/actions/server/lib/validate_action_type_params.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { schema } from '@kbn/config-schema';
-import { validateActionTypeParams } from './validate_action_type_params';
-import { ExecutorType } from '../types';
-
-const executor: ExecutorType = async options => {
-  return { status: 'ok' };
-};
-
-test('should return passed in params when validation not defined', () => {
-  const result = validateActionTypeParams(
-    {
-      id: 'my-action-type',
-      name: 'My action type',
-      unencryptedAttributes: [],
-      executor,
-    },
-    {
-      foo: true,
-    }
-  );
-  expect(result).toEqual({
-    foo: true,
-  });
-});
-
-test('should validate and apply defaults when params is valid', () => {
-  const result = validateActionTypeParams(
-    {
-      id: 'my-action-type',
-      name: 'My action type',
-      unencryptedAttributes: [],
-      validate: {
-        params: schema.object({
-          param1: schema.string(),
-          param2: schema.string({ defaultValue: 'default-value' }),
-        }),
-      },
-      executor,
-    },
-    { param1: 'value' }
-  );
-  expect(result).toEqual({
-    param1: 'value',
-    param2: 'default-value',
-  });
-});
-
-test('should validate and throw error when params is invalid', () => {
-  expect(() =>
-    validateActionTypeParams(
-      {
-        id: 'my-action-type',
-        name: 'My action type',
-        unencryptedAttributes: [],
-        validate: {
-          params: schema.object({
-            param1: schema.string(),
-          }),
-        },
-        executor,
-      },
-      {}
-    )
-  ).toThrowErrorMatchingInlineSnapshot(
-    `"The actionParams is invalid: [param1]: expected value of type [string] but got [undefined]"`
-  );
-});
diff --git a/x-pack/legacy/plugins/actions/server/lib/validate_action_type_params.ts b/x-pack/legacy/plugins/actions/server/lib/validate_action_type_params.ts
deleted file mode 100644
index 4d18c27d79faf..0000000000000
--- a/x-pack/legacy/plugins/actions/server/lib/validate_action_type_params.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import Boom from 'boom';
-import { ActionType } from '../types';
-
-export function validateActionTypeParams<T extends Record<string, any>>(
-  actionType: ActionType,
-  params: T
-): T {
-  const validator = actionType.validate && actionType.validate.params;
-  if (!validator) {
-    return params;
-  }
-  try {
-    return validator.validate(params);
-  } catch (err) {
-    throw Boom.badRequest(`The actionParams is invalid: ${err.message}`);
-  }
-}
diff --git a/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.test.ts b/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.test.ts
new file mode 100644
index 0000000000000..4cb28728fb421
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.test.ts
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+import { validateParams, validateConfig, validateSecrets } from './validate_with_schema';
+import { ActionType, ExecutorType } from '../types';
+
+const executor: ExecutorType = async options => {
+  return { status: 'ok' };
+};
+
+test('should validate when there are no validators', () => {
+  const actionType: ActionType = { id: 'foo', name: 'bar', executor };
+  const testValue = { any: ['old', 'thing'] };
+
+  const result = validateConfig(actionType, testValue);
+  expect(result).toEqual(testValue);
+});
+
+test('should validate when there are no individual validators', () => {
+  const actionType: ActionType = { id: 'foo', name: 'bar', executor, validate: {} };
+
+  let result;
+  const testValue = { any: ['old', 'thing'] };
+
+  result = validateParams(actionType, testValue);
+  expect(result).toEqual(testValue);
+
+  result = validateConfig(actionType, testValue);
+  expect(result).toEqual(testValue);
+
+  result = validateSecrets(actionType, testValue);
+  expect(result).toEqual(testValue);
+});
+
+test('should validate when validators return incoming value', () => {
+  const selfValidator = { validate: (value: any) => value };
+  const actionType: ActionType = {
+    id: 'foo',
+    name: 'bar',
+    executor,
+    validate: {
+      params: selfValidator,
+      config: selfValidator,
+      secrets: selfValidator,
+    },
+  };
+
+  let result;
+  const testValue = { any: ['old', 'thing'] };
+
+  result = validateParams(actionType, testValue);
+  expect(result).toEqual(testValue);
+
+  result = validateConfig(actionType, testValue);
+  expect(result).toEqual(testValue);
+
+  result = validateSecrets(actionType, testValue);
+  expect(result).toEqual(testValue);
+});
+
+test('should validate when validators return different values', () => {
+  const returnedValue: any = { something: { shaped: 'differently' } };
+  const selfValidator = { validate: (value: any) => returnedValue };
+  const actionType: ActionType = {
+    id: 'foo',
+    name: 'bar',
+    executor,
+    validate: {
+      params: selfValidator,
+      config: selfValidator,
+      secrets: selfValidator,
+    },
+  };
+
+  let result;
+  const testValue = { any: ['old', 'thing'] };
+
+  result = validateParams(actionType, testValue);
+  expect(result).toEqual(returnedValue);
+
+  result = validateConfig(actionType, testValue);
+  expect(result).toEqual(returnedValue);
+
+  result = validateSecrets(actionType, testValue);
+  expect(result).toEqual(returnedValue);
+});
+
+test('should throw with expected error when validators fail', () => {
+  const erroringValidator = {
+    validate: (value: any) => {
+      throw new Error('test error');
+    },
+  };
+  const actionType: ActionType = {
+    id: 'foo',
+    name: 'bar',
+    executor,
+    validate: {
+      params: erroringValidator,
+      config: erroringValidator,
+      secrets: erroringValidator,
+    },
+  };
+
+  const testValue = { any: ['old', 'thing'] };
+
+  expect(() => validateParams(actionType, testValue)).toThrowErrorMatchingInlineSnapshot(
+    `"error validating action params: test error"`
+  );
+
+  expect(() => validateConfig(actionType, testValue)).toThrowErrorMatchingInlineSnapshot(
+    `"error validating action type config: test error"`
+  );
+
+  expect(() => validateSecrets(actionType, testValue)).toThrowErrorMatchingInlineSnapshot(
+    `"error validating action type secrets: test error"`
+  );
+});
+
+test('should work with @kbn/config-schema', () => {
+  const testSchema = schema.object({ foo: schema.string() });
+  const actionType: ActionType = {
+    id: 'foo',
+    name: 'bar',
+    executor,
+    validate: {
+      params: testSchema,
+      config: testSchema,
+      secrets: testSchema,
+    },
+  };
+
+  const result = validateParams(actionType, { foo: 'bar' });
+  expect(result).toEqual({ foo: 'bar' });
+
+  expect(() => validateParams(actionType, { bar: 2 })).toThrowErrorMatchingInlineSnapshot(
+    `"error validating action params: [foo]: expected value of type [string] but got [undefined]"`
+  );
+});
diff --git a/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.ts b/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.ts
new file mode 100644
index 0000000000000..45ef867834ea8
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Boom from 'boom';
+import { ActionType } from '../types';
+
+export function validateParams(actionType: ActionType, value: any) {
+  return validateWithSchema(actionType, 'params', value);
+}
+
+export function validateConfig(actionType: ActionType, value: any) {
+  return validateWithSchema(actionType, 'config', value);
+}
+
+export function validateSecrets(actionType: ActionType, value: any) {
+  return validateWithSchema(actionType, 'secrets', value);
+}
+
+type ValidKeys = 'params' | 'config' | 'secrets';
+
+function validateWithSchema(
+  actionType: ActionType,
+  key: ValidKeys,
+  value: any
+): Record<string, any> {
+  if (actionType.validate == null) return value;
+
+  let name;
+  try {
+    switch (key) {
+      case 'params':
+        name = 'action params';
+        if (actionType.validate.params == null) return value;
+        return actionType.validate.params.validate(value);
+
+      case 'config':
+        name = 'action type config';
+        if (actionType.validate.config == null) return value;
+        return actionType.validate.config.validate(value);
+
+      case 'secrets':
+        name = 'action type secrets';
+        if (actionType.validate.secrets == null) return value;
+        return actionType.validate.secrets.validate(value);
+    }
+  } catch (err) {
+    throw Boom.badRequest(`error validating ${name}: ${err.message}`);
+  }
+
+  // should never happen, but left here for future-proofing
+  throw new Error(`invalid actionType validate key: ${key}`);
+}
diff --git a/x-pack/legacy/plugins/actions/server/routes/create.test.ts b/x-pack/legacy/plugins/actions/server/routes/create.test.ts
index f1e93c46b80ef..ec57149256501 100644
--- a/x-pack/legacy/plugins/actions/server/routes/create.test.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/create.test.ts
@@ -19,42 +19,19 @@ it('creates an action with proper parameters', async () => {
     method: 'POST',
     url: '/api/action',
     payload: {
-      attributes: {
-        description: 'My description',
-        actionTypeId: 'abc',
-        actionTypeConfig: { foo: true },
-      },
-      migrationVersion: {
-        abc: '1.2.3',
-      },
-      references: [
-        {
-          name: 'ref_0',
-          type: 'bcd',
-          id: '234',
-        },
-      ],
+      description: 'My description',
+      actionTypeId: 'abc',
+      config: { foo: true },
+      secrets: {},
     },
   };
   const createResult = {
     id: '1',
     type: 'action',
-    attributes: {
-      description: 'My description',
-      actionTypeId: 'abc',
-      actionTypeConfig: { foo: true },
-      actionTypeConfigSecrets: {},
-    },
-    migrationVersion: {
-      abc: '1.2.3',
-    },
-    references: [
-      {
-        name: 'ref_0',
-        type: 'bcd',
-        id: '234',
-      },
-    ],
+    description: 'My description',
+    actionTypeId: 'abc',
+    config: { foo: true },
+    secrets: {},
   };
 
   actionsClient.create.mockResolvedValueOnce(createResult);
@@ -64,28 +41,17 @@ it('creates an action with proper parameters', async () => {
   expect(response).toEqual({ id: '1' });
   expect(actionsClient.create).toHaveBeenCalledTimes(1);
   expect(actionsClient.create.mock.calls[0]).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {
-      "actionTypeConfig": Object {
-        "foo": true,
-      },
-      "actionTypeId": "abc",
-      "description": "My description",
-    },
-    "options": Object {
-      "migrationVersion": Object {
-        "abc": "1.2.3",
-      },
-      "references": Array [
-        Object {
-          "id": "234",
-          "name": "ref_0",
-          "type": "bcd",
+    Array [
+      Object {
+        "action": Object {
+          "actionTypeId": "abc",
+          "config": Object {
+            "foo": true,
+          },
+          "description": "My description",
+          "secrets": Object {},
         },
-      ],
-    },
-  },
-]
-`);
+      },
+    ]
+  `);
 });
diff --git a/x-pack/legacy/plugins/actions/server/routes/create.ts b/x-pack/legacy/plugins/actions/server/routes/create.ts
index 0cba5816879f9..6e4034d3258a7 100644
--- a/x-pack/legacy/plugins/actions/server/routes/create.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/create.ts
@@ -6,7 +6,7 @@
 
 import Joi from 'joi';
 import Hapi from 'hapi';
-import { WithoutQueryAndParams, SavedObjectReference } from '../types';
+import { WithoutQueryAndParams } from '../types';
 
 interface CreateRequest extends WithoutQueryAndParams<Hapi.Request> {
   query: {
@@ -16,13 +16,10 @@ interface CreateRequest extends WithoutQueryAndParams<Hapi.Request> {
     id?: string;
   };
   payload: {
-    attributes: {
-      description: string;
-      actionTypeId: string;
-      actionTypeConfig: Record<string, any>;
-    };
-    migrationVersion?: Record<string, any>;
-    references: SavedObjectReference[];
+    description: string;
+    actionTypeId: string;
+    config: Record<string, any>;
+    secrets: Record<string, any>;
   };
 }
 
@@ -35,37 +32,21 @@ export function createRoute(server: Hapi.Server) {
         options: {
           abortEarly: false,
         },
-        payload: Joi.object().keys({
-          attributes: Joi.object()
-            .keys({
-              description: Joi.string().required(),
-              actionTypeId: Joi.string().required(),
-              actionTypeConfig: Joi.object().required(),
-            })
-            .required(),
-          migrationVersion: Joi.object().optional(),
-          references: Joi.array()
-            .items(
-              Joi.object().keys({
-                name: Joi.string().required(),
-                type: Joi.string().required(),
-                id: Joi.string().required(),
-              })
-            )
-            .default([]),
-        }),
+        payload: Joi.object()
+          .keys({
+            description: Joi.string().required(),
+            actionTypeId: Joi.string().required(),
+            config: Joi.object().default({}),
+            secrets: Joi.object().default({}),
+          })
+          .required(),
       },
     },
     async handler(request: CreateRequest) {
       const actionsClient = request.getActionsClient!();
 
-      const createdAction = await actionsClient.create({
-        attributes: request.payload.attributes,
-        options: {
-          migrationVersion: request.payload.migrationVersion,
-          references: request.payload.references,
-        },
-      });
+      const action = request.payload;
+      const createdAction = await actionsClient.create({ action });
 
       return { id: createdAction.id };
     },
diff --git a/x-pack/legacy/plugins/actions/server/routes/find.test.ts b/x-pack/legacy/plugins/actions/server/routes/find.test.ts
index afb8f583e541a..f2073a906e7e4 100644
--- a/x-pack/legacy/plugins/actions/server/routes/find.test.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/find.test.ts
@@ -29,9 +29,9 @@ it('sends proper arguments to action find function', async () => {
   };
   const expectedResult = {
     total: 0,
-    per_page: 10,
+    perPage: 10,
     page: 1,
-    saved_objects: [],
+    data: [],
   };
 
   actionsClient.find.mockResolvedValueOnce(expectedResult);
diff --git a/x-pack/legacy/plugins/actions/server/routes/get.test.ts b/x-pack/legacy/plugins/actions/server/routes/get.test.ts
index bec51eff1e803..8d1949774445d 100644
--- a/x-pack/legacy/plugins/actions/server/routes/get.test.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/get.test.ts
@@ -6,6 +6,7 @@
 
 import { createMockServer } from './_mock_server';
 import { getRoute } from './get';
+import { ActionResult } from '../types';
 
 const { server, actionsClient } = createMockServer();
 getRoute(server);
@@ -19,11 +20,11 @@ it('calls get with proper parameters', async () => {
     method: 'GET',
     url: '/api/action/1',
   };
-  const expectedResult = {
+  const expectedResult: ActionResult = {
     id: '1',
-    type: 'action',
-    attributes: {},
-    references: [],
+    actionTypeId: 'my-action-type-id',
+    config: {},
+    description: 'my action type description',
   };
 
   actionsClient.get.mockResolvedValueOnce(expectedResult);
diff --git a/x-pack/legacy/plugins/actions/server/routes/update.test.ts b/x-pack/legacy/plugins/actions/server/routes/update.test.ts
index 492542d0190b3..1d7699b8a163e 100644
--- a/x-pack/legacy/plugins/actions/server/routes/update.test.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/update.test.ts
@@ -6,6 +6,7 @@
 
 import { createMockServer } from './_mock_server';
 import { updateRoute } from './update';
+import { ActionResult } from '../types';
 
 const { server, actionsClient } = createMockServer();
 updateRoute(server);
@@ -19,35 +20,15 @@ it('calls the update function with proper parameters', async () => {
     method: 'PUT',
     url: '/api/action/1',
     payload: {
-      attributes: {
-        description: 'My description',
-        actionTypeConfig: { foo: true },
-      },
-      version: '2',
-      references: [
-        {
-          name: 'ref_0',
-          type: 'bcd',
-          id: '234',
-        },
-      ],
+      description: 'My description',
+      config: { foo: true },
     },
   };
-  const updateResult = {
+  const updateResult: ActionResult = {
     id: '1',
-    type: 'action',
-    attributes: {
-      description: 'My description',
-      actionTypeConfig: { foo: true },
-    },
-    version: '2',
-    references: [
-      {
-        name: 'ref_0',
-        type: 'bcd',
-        id: '234',
-      },
-    ],
+    actionTypeId: 'my-action-type-id',
+    description: 'My description',
+    config: { foo: true },
   };
 
   actionsClient.update.mockResolvedValueOnce(updateResult);
@@ -57,26 +38,17 @@ it('calls the update function with proper parameters', async () => {
   expect(response).toEqual({ id: '1' });
   expect(actionsClient.update).toHaveBeenCalledTimes(1);
   expect(actionsClient.update.mock.calls[0]).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "attributes": Object {
-      "actionTypeConfig": Object {
-        "foo": true,
-      },
-      "description": "My description",
-    },
-    "id": "1",
-    "options": Object {
-      "references": Array [
-        Object {
-          "id": "234",
-          "name": "ref_0",
-          "type": "bcd",
+    Array [
+      Object {
+        "action": Object {
+          "config": Object {
+            "foo": true,
+          },
+          "description": "My description",
+          "secrets": Object {},
         },
-      ],
-      "version": "2",
-    },
-  },
-]
-`);
+        "id": "1",
+      },
+    ]
+  `);
 });
diff --git a/x-pack/legacy/plugins/actions/server/routes/update.ts b/x-pack/legacy/plugins/actions/server/routes/update.ts
index 68931c21225aa..45933109a8bdb 100644
--- a/x-pack/legacy/plugins/actions/server/routes/update.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/update.ts
@@ -7,17 +7,11 @@
 import Joi from 'joi';
 import Hapi from 'hapi';
 
-import { SavedObjectReference } from '../types';
-
 interface UpdateRequest extends Hapi.Request {
   payload: {
-    attributes: {
-      description: string;
-      actionTypeId: string;
-      actionTypeConfig: Record<string, any>;
-    };
-    version?: string;
-    references: SavedObjectReference[];
+    description: string;
+    config: Record<string, any>;
+    secrets: Record<string, any>;
   };
 }
 
@@ -37,36 +31,18 @@ export function updateRoute(server: Hapi.Server) {
           .required(),
         payload: Joi.object()
           .keys({
-            attributes: Joi.object()
-              .keys({
-                description: Joi.string().required(),
-                actionTypeConfig: Joi.object().required(),
-              })
-              .required(),
-            version: Joi.string(),
-            references: Joi.array()
-              .items(
-                Joi.object().keys({
-                  name: Joi.string().required(),
-                  type: Joi.string().required(),
-                  id: Joi.string().required(),
-                })
-              )
-              .default([]),
+            description: Joi.string().required(),
+            config: Joi.object().default({}),
+            secrets: Joi.object().default({}),
           })
           .required(),
       },
     },
     async handler(request: UpdateRequest) {
       const { id } = request.params;
-      const { attributes, version, references } = request.payload;
-      const options = { version, references };
+      const { description, config, secrets } = request.payload;
       const actionsClient = request.getActionsClient!();
-      await actionsClient.update({
-        id,
-        attributes,
-        options,
-      });
+      await actionsClient.update({ id, action: { description, config, secrets } });
       return { id };
     },
   });
diff --git a/x-pack/legacy/plugins/actions/server/types.ts b/x-pack/legacy/plugins/actions/server/types.ts
index 886c7429e99ca..a3134b4cd4d1f 100644
--- a/x-pack/legacy/plugins/actions/server/types.ts
+++ b/x-pack/legacy/plugins/actions/server/types.ts
@@ -6,17 +6,12 @@
 
 import { SavedObjectsClientContract } from 'src/core/server';
 import { ActionTypeRegistry } from './action_type_registry';
+import { FireOptions } from './create_fire_function';
 
 export type WithoutQueryAndParams<T> = Pick<T, Exclude<keyof T, 'query' | 'params'>>;
 export type GetServicesFunction = (basePath: string, overwrites?: Partial<Services>) => Services;
 export type ActionTypeRegistryContract = PublicMethodsOf<ActionTypeRegistry>;
 
-export interface SavedObjectReference {
-  name: string;
-  type: string;
-  id: string;
-}
-
 export interface Services {
   callCluster(path: string, opts: any): Promise<any>;
   savedObjectsClient: SavedObjectsClientContract;
@@ -26,7 +21,7 @@ export interface Services {
 export interface ActionsPlugin {
   registerType: ActionTypeRegistry['register'];
   listTypes: ActionTypeRegistry['list'];
-  fire(options: { id: string; params: Record<string, any>; basePath: string }): Promise<void>;
+  fire(options: FireOptions): Promise<void>;
 }
 
 // the parameters passed to an action type executor function
@@ -34,9 +29,17 @@ export interface ActionTypeExecutorOptions {
   id: string;
   services: Services;
   config: Record<string, any>;
+  secrets: Record<string, any>;
   params: Record<string, any>;
 }
 
+export interface ActionResult {
+  id: string;
+  actionTypeId: string;
+  description: string;
+  config: Record<string, any>;
+}
+
 // the result returned from an action type executor function
 export interface ActionTypeExecutorResult {
   status: 'ok' | 'error';
@@ -50,14 +53,18 @@ export type ExecutorType = (
   options: ActionTypeExecutorOptions
 ) => Promise<ActionTypeExecutorResult>;
 
+interface ValidatorType {
+  validate<T>(value: any): any;
+}
+
 export interface ActionType {
   id: string;
   name: string;
-  unencryptedAttributes: string[];
   maxAttempts?: number;
   validate?: {
-    params?: { validate: (object: any) => any };
-    config?: { validate: (object: any) => any };
+    params?: ValidatorType;
+    config?: ValidatorType;
+    secrets?: ValidatorType;
   };
   executor: ExecutorType;
 }
diff --git a/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts b/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
index 442023951714e..f14da9e9ed83d 100644
--- a/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
@@ -25,6 +25,8 @@ const alertTypeRegistryParams = {
   taskManager,
   fireAction: jest.fn(),
   internalSavedObjectsRepository: SavedObjectsClientMock.create(),
+  spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+  getBasePath: jest.fn().mockReturnValue(undefined),
 };
 
 beforeEach(() => jest.resetAllMocks());
@@ -46,7 +48,7 @@ describe('has()', () => {
   });
 });
 
-describe('registry()', () => {
+describe('register()', () => {
   test('registers the executor with the task manager', () => {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const { getCreateTaskRunnerFunction } = require('./lib/get_create_task_runner_function');
@@ -79,6 +81,8 @@ Object {
 }
 `);
     expect(firstCall.internalSavedObjectsRepository).toBeTruthy();
+    expect(firstCall.getBasePath).toBeTruthy();
+    expect(firstCall.spaceIdToNamespace).toBeTruthy();
     expect(firstCall.fireAction).toMatchInlineSnapshot(`[MockFunction]`);
   });
 
diff --git a/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts b/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
index 61a358473ef46..7e763858fd20e 100644
--- a/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
@@ -11,12 +11,15 @@ import { AlertType, Services } from './types';
 import { TaskManager } from '../../task_manager';
 import { getCreateTaskRunnerFunction } from './lib';
 import { ActionsPlugin } from '../../actions';
+import { SpacesPlugin } from '../../spaces';
 
 interface ConstructorOptions {
   getServices: (basePath: string) => Services;
   taskManager: TaskManager;
   fireAction: ActionsPlugin['fire'];
   internalSavedObjectsRepository: SavedObjectsClientContract;
+  spaceIdToNamespace: SpacesPlugin['spaceIdToNamespace'];
+  getBasePath: SpacesPlugin['getBasePath'];
 }
 
 export class AlertTypeRegistry {
@@ -25,17 +28,23 @@ export class AlertTypeRegistry {
   private readonly fireAction: ActionsPlugin['fire'];
   private readonly alertTypes: Map<string, AlertType> = new Map();
   private readonly internalSavedObjectsRepository: SavedObjectsClientContract;
+  private readonly spaceIdToNamespace: SpacesPlugin['spaceIdToNamespace'];
+  private readonly getBasePath: SpacesPlugin['getBasePath'];
 
   constructor({
     internalSavedObjectsRepository,
     fireAction,
     taskManager,
     getServices,
+    spaceIdToNamespace,
+    getBasePath,
   }: ConstructorOptions) {
     this.taskManager = taskManager;
     this.fireAction = fireAction;
     this.internalSavedObjectsRepository = internalSavedObjectsRepository;
     this.getServices = getServices;
+    this.getBasePath = getBasePath;
+    this.spaceIdToNamespace = spaceIdToNamespace;
   }
 
   public has(id: string) {
@@ -63,6 +72,8 @@ export class AlertTypeRegistry {
           getServices: this.getServices,
           fireAction: this.fireAction,
           internalSavedObjectsRepository: this.internalSavedObjectsRepository,
+          getBasePath: this.getBasePath,
+          spaceIdToNamespace: this.spaceIdToNamespace,
         }),
       },
     });
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
index 8a6ffe7ed4506..c6eae114e725a 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
@@ -19,7 +19,7 @@ const alertsClientParams = {
   taskManager,
   alertTypeRegistry,
   savedObjectsClient,
-  basePath: '/s/default',
+  spaceId: 'default',
 };
 
 beforeEach(() => jest.resetAllMocks());
@@ -119,65 +119,65 @@ describe('create()', () => {
     });
     const result = await alertsClient.create({ data });
     expect(result).toMatchInlineSnapshot(`
-                        Object {
-                          "actions": Array [
-                            Object {
-                              "group": "default",
-                              "id": "1",
-                              "params": Object {
-                                "foo": true,
-                              },
-                            },
-                          ],
-                          "alertTypeId": "123",
-                          "alertTypeParams": Object {
-                            "bar": true,
-                          },
-                          "id": "1",
-                          "interval": "10s",
-                          "scheduledTaskId": "task-123",
-                        }
-                `);
+                                    Object {
+                                      "actions": Array [
+                                        Object {
+                                          "group": "default",
+                                          "id": "1",
+                                          "params": Object {
+                                            "foo": true,
+                                          },
+                                        },
+                                      ],
+                                      "alertTypeId": "123",
+                                      "alertTypeParams": Object {
+                                        "bar": true,
+                                      },
+                                      "id": "1",
+                                      "interval": "10s",
+                                      "scheduledTaskId": "task-123",
+                                    }
+                        `);
     expect(savedObjectsClient.create).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.create.mock.calls[0]).toHaveLength(3);
     expect(savedObjectsClient.create.mock.calls[0][0]).toEqual('alert');
     expect(savedObjectsClient.create.mock.calls[0][1]).toMatchInlineSnapshot(`
-                        Object {
-                          "actions": Array [
-                            Object {
-                              "actionRef": "action_0",
-                              "group": "default",
-                              "params": Object {
-                                "foo": true,
-                              },
-                            },
-                          ],
-                          "alertTypeId": "123",
-                          "alertTypeParams": Object {
-                            "bar": true,
-                          },
-                          "enabled": true,
-                          "interval": "10s",
-                        }
-                `);
-    expect(savedObjectsClient.create.mock.calls[0][2]).toMatchInlineSnapshot(`
                                     Object {
-                                      "references": Array [
+                                      "actions": Array [
                                         Object {
-                                          "id": "1",
-                                          "name": "action_0",
-                                          "type": "action",
+                                          "actionRef": "action_0",
+                                          "group": "default",
+                                          "params": Object {
+                                            "foo": true,
+                                          },
                                         },
                                       ],
+                                      "alertTypeId": "123",
+                                      "alertTypeParams": Object {
+                                        "bar": true,
+                                      },
+                                      "enabled": true,
+                                      "interval": "10s",
                                     }
                         `);
+    expect(savedObjectsClient.create.mock.calls[0][2]).toMatchInlineSnapshot(`
+                                                Object {
+                                                  "references": Array [
+                                                    Object {
+                                                      "id": "1",
+                                                      "name": "action_0",
+                                                      "type": "action",
+                                                    },
+                                                  ],
+                                                }
+                                `);
     expect(taskManager.schedule).toHaveBeenCalledTimes(1);
     expect(taskManager.schedule.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         Object {
           "params": Object {
             "alertId": "1",
-            "basePath": "/s/default",
+            "spaceId": "default",
           },
           "scope": Array [
             "alerting",
@@ -196,21 +196,21 @@ describe('create()', () => {
     expect(savedObjectsClient.update.mock.calls[0][0]).toEqual('alert');
     expect(savedObjectsClient.update.mock.calls[0][1]).toEqual('1');
     expect(savedObjectsClient.update.mock.calls[0][2]).toMatchInlineSnapshot(`
-                                    Object {
-                                      "scheduledTaskId": "task-123",
-                                    }
-                        `);
+                                                Object {
+                                                  "scheduledTaskId": "task-123",
+                                                }
+                                `);
     expect(savedObjectsClient.update.mock.calls[0][3]).toMatchInlineSnapshot(`
-                                    Object {
-                                      "references": Array [
-                                        Object {
-                                          "id": "1",
-                                          "name": "action_0",
-                                          "type": "action",
-                                        },
-                                      ],
-                                    }
-                        `);
+                                                Object {
+                                                  "references": Array [
+                                                    Object {
+                                                      "id": "1",
+                                                      "name": "action_0",
+                                                      "type": "action",
+                                                    },
+                                                  ],
+                                                }
+                                `);
   });
 
   test('creates a disabled alert', async () => {
@@ -251,25 +251,25 @@ describe('create()', () => {
     });
     const result = await alertsClient.create({ data });
     expect(result).toMatchInlineSnapshot(`
-                                    Object {
-                                      "actions": Array [
-                                        Object {
-                                          "group": "default",
-                                          "id": "1",
-                                          "params": Object {
-                                            "foo": true,
-                                          },
-                                        },
-                                      ],
-                                      "alertTypeId": "123",
-                                      "alertTypeParams": Object {
-                                        "bar": true,
-                                      },
-                                      "enabled": false,
-                                      "id": "1",
-                                      "interval": 10000,
-                                    }
-                        `);
+                                                Object {
+                                                  "actions": Array [
+                                                    Object {
+                                                      "group": "default",
+                                                      "id": "1",
+                                                      "params": Object {
+                                                        "foo": true,
+                                                      },
+                                                    },
+                                                  ],
+                                                  "alertTypeId": "123",
+                                                  "alertTypeParams": Object {
+                                                    "bar": true,
+                                                  },
+                                                  "enabled": false,
+                                                  "id": "1",
+                                                  "interval": 10000,
+                                                }
+                                `);
     expect(savedObjectsClient.create).toHaveBeenCalledTimes(1);
     expect(taskManager.schedule).toHaveBeenCalledTimes(0);
   });
@@ -350,11 +350,11 @@ describe('create()', () => {
     );
     expect(savedObjectsClient.delete).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.delete.mock.calls[0]).toMatchInlineSnapshot(`
-                                    Array [
-                                      "alert",
-                                      "1",
-                                    ]
-                        `);
+                                                Array [
+                                                  "alert",
+                                                  "1",
+                                                ]
+                                `);
   });
 
   test('returns task manager error if cleanup fails, logs to console', async () => {
@@ -399,14 +399,14 @@ describe('create()', () => {
     );
     expect(alertsClientParams.log).toHaveBeenCalledTimes(1);
     expect(alertsClientParams.log.mock.calls[0]).toMatchInlineSnapshot(`
-                                    Array [
-                                      Array [
-                                        "alerting",
-                                        "error",
-                                      ],
-                                      "Failed to cleanup alert \\"1\\" after scheduling task failed. Error: Saved object delete error",
-                                    ]
-                        `);
+                                                Array [
+                                                  Array [
+                                                    "alerting",
+                                                    "error",
+                                                  ],
+                                                  "Failed to cleanup alert \\"1\\" after scheduling task failed. Error: Saved object delete error",
+                                                ]
+                                `);
   });
 
   test('throws an error if alert type not registerd', async () => {
@@ -463,7 +463,7 @@ describe('enable()', () => {
       taskType: `alerting:2`,
       params: {
         alertId: '1',
-        basePath: '/s/default',
+        spaceId: 'default',
       },
       state: {
         alertInstances: {},
@@ -575,31 +575,31 @@ describe('get()', () => {
     });
     const result = await alertsClient.get({ id: '1' });
     expect(result).toMatchInlineSnapshot(`
-                        Object {
-                          "actions": Array [
-                            Object {
-                              "group": "default",
-                              "id": "1",
-                              "params": Object {
-                                "foo": true,
-                              },
-                            },
-                          ],
-                          "alertTypeId": "123",
-                          "alertTypeParams": Object {
-                            "bar": true,
-                          },
-                          "id": "1",
-                          "interval": "10s",
-                        }
-                `);
+                                    Object {
+                                      "actions": Array [
+                                        Object {
+                                          "group": "default",
+                                          "id": "1",
+                                          "params": Object {
+                                            "foo": true,
+                                          },
+                                        },
+                                      ],
+                                      "alertTypeId": "123",
+                                      "alertTypeParams": Object {
+                                        "bar": true,
+                                      },
+                                      "id": "1",
+                                      "interval": "10s",
+                                    }
+                        `);
     expect(savedObjectsClient.get).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.get.mock.calls[0]).toMatchInlineSnapshot(`
-                                    Array [
-                                      "alert",
-                                      "1",
-                                    ]
-                        `);
+                                                Array [
+                                                  "alert",
+                                                  "1",
+                                                ]
+                                `);
   });
 
   test(`throws an error when references aren't found`, async () => {
@@ -670,34 +670,39 @@ describe('find()', () => {
     });
     const result = await alertsClient.find();
     expect(result).toMatchInlineSnapshot(`
-                        Array [
-                          Object {
-                            "actions": Array [
-                              Object {
-                                "group": "default",
-                                "id": "1",
-                                "params": Object {
-                                  "foo": true,
-                                },
-                              },
-                            ],
-                            "alertTypeId": "123",
-                            "alertTypeParams": Object {
-                              "bar": true,
-                            },
-                            "id": "1",
-                            "interval": "10s",
-                          },
-                        ]
-                `);
+            Object {
+              "data": Array [
+                Object {
+                  "actions": Array [
+                    Object {
+                      "group": "default",
+                      "id": "1",
+                      "params": Object {
+                        "foo": true,
+                      },
+                    },
+                  ],
+                  "alertTypeId": "123",
+                  "alertTypeParams": Object {
+                    "bar": true,
+                  },
+                  "id": "1",
+                  "interval": "10s",
+                },
+              ],
+              "page": 1,
+              "perPage": 10,
+              "total": 1,
+            }
+        `);
     expect(savedObjectsClient.find).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.find.mock.calls[0]).toMatchInlineSnapshot(`
-                                    Array [
-                                      Object {
-                                        "type": "alert",
-                                      },
-                                    ]
-                        `);
+                                                Array [
+                                                  Object {
+                                                    "type": "alert",
+                                                  },
+                                                ]
+                                `);
   });
 });
 
@@ -739,17 +744,17 @@ describe('delete()', () => {
     expect(result).toEqual({ success: true });
     expect(savedObjectsClient.delete).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.delete.mock.calls[0]).toMatchInlineSnapshot(`
-                                    Array [
-                                      "alert",
-                                      "1",
-                                    ]
-                        `);
+                                                Array [
+                                                  "alert",
+                                                  "1",
+                                                ]
+                                `);
     expect(taskManager.remove).toHaveBeenCalledTimes(1);
     expect(taskManager.remove.mock.calls[0]).toMatchInlineSnapshot(`
-                                    Array [
-                                      "task-123",
-                                    ]
-                        `);
+                                                Array [
+                                                  "task-123",
+                                                ]
+                                `);
   });
 });
 
@@ -821,11 +826,35 @@ describe('update()', () => {
       },
     });
     expect(result).toMatchInlineSnapshot(`
+                                    Object {
+                                      "actions": Array [
+                                        Object {
+                                          "group": "default",
+                                          "id": "1",
+                                          "params": Object {
+                                            "foo": true,
+                                          },
+                                        },
+                                      ],
+                                      "alertTypeParams": Object {
+                                        "bar": true,
+                                      },
+                                      "enabled": true,
+                                      "id": "1",
+                                      "interval": "10s",
+                                      "scheduledTaskId": "task-123",
+                                    }
+                        `);
+    expect(savedObjectsClient.update).toHaveBeenCalledTimes(1);
+    expect(savedObjectsClient.update.mock.calls[0]).toHaveLength(4);
+    expect(savedObjectsClient.update.mock.calls[0][0]).toEqual('alert');
+    expect(savedObjectsClient.update.mock.calls[0][1]).toEqual('1');
+    expect(savedObjectsClient.update.mock.calls[0][2]).toMatchInlineSnapshot(`
                         Object {
                           "actions": Array [
                             Object {
+                              "actionRef": "action_0",
                               "group": "default",
-                              "id": "1",
                               "params": Object {
                                 "foo": true,
                               },
@@ -834,45 +863,21 @@ describe('update()', () => {
                           "alertTypeParams": Object {
                             "bar": true,
                           },
-                          "enabled": true,
-                          "id": "1",
                           "interval": "10s",
-                          "scheduledTaskId": "task-123",
                         }
                 `);
-    expect(savedObjectsClient.update).toHaveBeenCalledTimes(1);
-    expect(savedObjectsClient.update.mock.calls[0]).toHaveLength(4);
-    expect(savedObjectsClient.update.mock.calls[0][0]).toEqual('alert');
-    expect(savedObjectsClient.update.mock.calls[0][1]).toEqual('1');
-    expect(savedObjectsClient.update.mock.calls[0][2]).toMatchInlineSnapshot(`
-            Object {
-              "actions": Array [
-                Object {
-                  "actionRef": "action_0",
-                  "group": "default",
-                  "params": Object {
-                    "foo": true,
-                  },
-                },
-              ],
-              "alertTypeParams": Object {
-                "bar": true,
-              },
-              "interval": "10s",
-            }
-        `);
     expect(savedObjectsClient.update.mock.calls[0][3]).toMatchInlineSnapshot(`
-                                    Object {
-                                      "references": Array [
-                                        Object {
-                                          "id": "1",
-                                          "name": "action_0",
-                                          "type": "action",
-                                        },
-                                      ],
-                                      "version": "123",
-                                    }
-                        `);
+                                                Object {
+                                                  "references": Array [
+                                                    Object {
+                                                      "id": "1",
+                                                      "name": "action_0",
+                                                      "type": "action",
+                                                    },
+                                                  ],
+                                                  "version": "123",
+                                                }
+                                `);
   });
 
   it('should validate alertTypeParams', async () => {
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
index 4cfee6f4ab1f5..cbd1ba3eab53e 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
@@ -15,7 +15,7 @@ interface ConstructorOptions {
   taskManager: TaskManager;
   savedObjectsClient: SavedObjectsClientContract;
   alertTypeRegistry: AlertTypeRegistry;
-  basePath: string;
+  spaceId?: string;
 }
 
 interface FindOptions {
@@ -34,6 +34,13 @@ interface FindOptions {
   };
 }
 
+interface FindResult {
+  page: number;
+  perPage: number;
+  total: number;
+  data: object[];
+}
+
 interface CreateOptions {
   data: Alert;
   options?: {
@@ -53,7 +60,7 @@ interface UpdateOptions {
 
 export class AlertsClient {
   private readonly log: Log;
-  private readonly basePath: string;
+  private readonly spaceId?: string;
   private readonly taskManager: TaskManager;
   private readonly savedObjectsClient: SavedObjectsClientContract;
   private readonly alertTypeRegistry: AlertTypeRegistry;
@@ -63,10 +70,10 @@ export class AlertsClient {
     savedObjectsClient,
     taskManager,
     log,
-    basePath,
+    spaceId,
   }: ConstructorOptions) {
     this.log = log;
-    this.basePath = basePath;
+    this.spaceId = spaceId;
     this.taskManager = taskManager;
     this.alertTypeRegistry = alertTypeRegistry;
     this.savedObjectsClient = savedObjectsClient;
@@ -90,8 +97,7 @@ export class AlertsClient {
         scheduledTask = await this.scheduleAlert(
           createdAlert.id,
           rawAlert.alertTypeId,
-          rawAlert.interval,
-          this.basePath
+          rawAlert.interval
         );
       } catch (e) {
         // Cleanup data, something went wrong scheduling the task
@@ -124,14 +130,22 @@ export class AlertsClient {
     return this.getAlertFromRaw(result.id, result.attributes, result.references);
   }
 
-  public async find({ options = {} }: FindOptions = {}) {
+  public async find({ options = {} }: FindOptions = {}): Promise<FindResult> {
     const results = await this.savedObjectsClient.find({
       ...options,
       type: 'alert',
     });
-    return results.saved_objects.map(result =>
+
+    const data = results.saved_objects.map(result =>
       this.getAlertFromRaw(result.id, result.attributes, result.references)
     );
+
+    return {
+      page: results.page,
+      perPage: results.per_page,
+      total: results.total,
+      data,
+    };
   }
 
   public async delete({ id }: { id: string }) {
@@ -174,8 +188,7 @@ export class AlertsClient {
       const scheduledTask = await this.scheduleAlert(
         id,
         existingObject.attributes.alertTypeId,
-        existingObject.attributes.interval,
-        this.basePath
+        existingObject.attributes.interval
       );
       await this.savedObjectsClient.update(
         'alert',
@@ -205,12 +218,12 @@ export class AlertsClient {
     }
   }
 
-  private async scheduleAlert(id: string, alertTypeId: string, interval: string, basePath: string) {
+  private async scheduleAlert(id: string, alertTypeId: string, interval: string) {
     return await this.taskManager.schedule({
       taskType: `alerting:${alertTypeId}`,
       params: {
         alertId: id,
-        basePath,
+        spaceId: this.spaceId,
       },
       state: {
         previousStartedAt: null,
diff --git a/x-pack/legacy/plugins/alerting/server/init.ts b/x-pack/legacy/plugins/alerting/server/init.ts
index ec1255cc5ac20..bf7b4b8009b97 100644
--- a/x-pack/legacy/plugins/alerting/server/init.ts
+++ b/x-pack/legacy/plugins/alerting/server/init.ts
@@ -18,8 +18,18 @@ import {
 import { AlertingPlugin, Services } from './types';
 import { AlertTypeRegistry } from './alert_type_registry';
 import { AlertsClient } from './alerts_client';
+import { SpacesPlugin } from '../../spaces';
+import { createOptionalPlugin } from '../../../server/lib/optional_plugin';
 
 export function init(server: Legacy.Server) {
+  const config = server.config();
+  const spaces = createOptionalPlugin<SpacesPlugin>(
+    config,
+    'xpack.spaces',
+    server.plugins,
+    'spaces'
+  );
+
   const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
   const savedObjectsRepositoryWithInternalUser = server.savedObjects.getSavedObjectsRepository(
     callWithInternalUser
@@ -43,6 +53,14 @@ export function init(server: Legacy.Server) {
     taskManager: taskManager!,
     fireAction: server.plugins.actions!.fire,
     internalSavedObjectsRepository: savedObjectsRepositoryWithInternalUser,
+    getBasePath(...args) {
+      return spaces.isEnabled
+        ? spaces.getBasePath(...args)
+        : server.config().get('server.basePath');
+    },
+    spaceIdToNamespace(...args) {
+      return spaces.isEnabled ? spaces.spaceIdToNamespace(...args) : undefined;
+    },
   });
 
   // Register routes
@@ -64,7 +82,7 @@ export function init(server: Legacy.Server) {
       savedObjectsClient,
       alertTypeRegistry,
       taskManager: taskManager!,
-      basePath: request.getBasePath(),
+      spaceId: spaces.isEnabled ? spaces.getSpaceId(request) : undefined,
     });
     return alertsClient;
   });
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_fire_handler.test.ts b/x-pack/legacy/plugins/alerting/server/lib/create_fire_handler.test.ts
index ba8e35dbd7ba9..bbafd60cdbc64 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/create_fire_handler.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/create_fire_handler.test.ts
@@ -7,8 +7,10 @@
 import { createFireHandler } from './create_fire_handler';
 
 const createFireHandlerParams = {
-  basePath: '/s/default',
   fireAction: jest.fn(),
+  spaceId: 'default',
+  spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+  getBasePath: jest.fn().mockReturnValue(undefined),
   alertSavedObject: {
     id: '1',
     type: 'alert',
@@ -47,18 +49,18 @@ test('calls fireAction per selected action', async () => {
   await fireHandler('default', {}, {});
   expect(createFireHandlerParams.fireAction).toHaveBeenCalledTimes(1);
   expect(createFireHandlerParams.fireAction.mock.calls[0]).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "basePath": "/s/default",
-    "id": "1",
-    "params": Object {
-      "contextVal": "My  goes here",
-      "foo": true,
-      "stateVal": "My  goes here",
-    },
-  },
-]
-`);
+    Array [
+      Object {
+        "id": "1",
+        "params": Object {
+          "contextVal": "My  goes here",
+          "foo": true,
+          "stateVal": "My  goes here",
+        },
+        "spaceId": "default",
+      },
+    ]
+  `);
 });
 
 test('limits fireAction per action group', async () => {
@@ -72,18 +74,18 @@ test('context attribute gets parameterized', async () => {
   await fireHandler('default', { value: 'context-val' }, {});
   expect(createFireHandlerParams.fireAction).toHaveBeenCalledTimes(1);
   expect(createFireHandlerParams.fireAction.mock.calls[0]).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "basePath": "/s/default",
-    "id": "1",
-    "params": Object {
-      "contextVal": "My context-val goes here",
-      "foo": true,
-      "stateVal": "My  goes here",
-    },
-  },
-]
-`);
+    Array [
+      Object {
+        "id": "1",
+        "params": Object {
+          "contextVal": "My context-val goes here",
+          "foo": true,
+          "stateVal": "My  goes here",
+        },
+        "spaceId": "default",
+      },
+    ]
+  `);
 });
 
 test('state attribute gets parameterized', async () => {
@@ -91,23 +93,23 @@ test('state attribute gets parameterized', async () => {
   await fireHandler('default', {}, { value: 'state-val' });
   expect(createFireHandlerParams.fireAction).toHaveBeenCalledTimes(1);
   expect(createFireHandlerParams.fireAction.mock.calls[0]).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "basePath": "/s/default",
-    "id": "1",
-    "params": Object {
-      "contextVal": "My  goes here",
-      "foo": true,
-      "stateVal": "My state-val goes here",
-    },
-  },
-]
-`);
+    Array [
+      Object {
+        "id": "1",
+        "params": Object {
+          "contextVal": "My  goes here",
+          "foo": true,
+          "stateVal": "My state-val goes here",
+        },
+        "spaceId": "default",
+      },
+    ]
+  `);
 });
 
 test('throws error if reference not found', async () => {
   const params = {
-    basePath: '/s/default',
+    spaceId: 'default',
     fireAction: jest.fn(),
     alertSavedObject: {
       id: '1',
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_fire_handler.ts b/x-pack/legacy/plugins/alerting/server/lib/create_fire_handler.ts
index 3a271365105c7..f51b374298a07 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/create_fire_handler.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/create_fire_handler.ts
@@ -12,13 +12,13 @@ import { transformActionParams } from './transform_action_params';
 interface CreateFireHandlerOptions {
   fireAction: ActionsPlugin['fire'];
   alertSavedObject: SavedObject;
-  basePath: string;
+  spaceId: string;
 }
 
 export function createFireHandler({
   fireAction,
   alertSavedObject,
-  basePath,
+  spaceId,
 }: CreateFireHandlerOptions) {
   return async (actionGroup: string, context: Context, state: State) => {
     const alertActions: RawAlertAction[] = alertSavedObject.attributes.actions;
@@ -43,7 +43,7 @@ export function createFireHandler({
       await fireAction({
         id: action.id,
         params: action.params,
-        basePath,
+        spaceId,
       });
     }
   };
diff --git a/x-pack/legacy/plugins/alerting/server/lib/get_create_task_runner_function.test.ts b/x-pack/legacy/plugins/alerting/server/lib/get_create_task_runner_function.test.ts
index f12751e2288dd..95969d3d9a17c 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/get_create_task_runner_function.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/get_create_task_runner_function.test.ts
@@ -54,6 +54,8 @@ const getCreateTaskRunnerFunctionParams = {
   },
   fireAction: jest.fn(),
   internalSavedObjectsRepository: savedObjectsClient,
+  spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+  getBasePath: jest.fn().mockReturnValue(undefined),
 };
 
 const mockedAlertTypeSavedObject = {
@@ -93,22 +95,22 @@ test('successfully executes the task', async () => {
   const runner = createTaskRunner({ taskInstance: mockedTaskInstance });
   const runnerResult = await runner.run();
   expect(runnerResult).toMatchInlineSnapshot(`
-    Object {
-      "runAt": 1970-01-01T00:00:10.000Z,
-      "state": Object {
-        "alertInstances": Object {},
-        "alertTypeState": undefined,
-        "previousStartedAt": 1970-01-01T00:00:00.000Z,
-      },
-    }
-  `);
-  expect(getCreateTaskRunnerFunctionParams.alertType.executor).toHaveBeenCalledTimes(1);
-  const call = getCreateTaskRunnerFunctionParams.alertType.executor.mock.calls[0][0];
-  expect(call.params).toMatchInlineSnapshot(`
         Object {
-          "bar": true,
+          "runAt": 1970-01-01T00:00:10.000Z,
+          "state": Object {
+            "alertInstances": Object {},
+            "alertTypeState": undefined,
+            "previousStartedAt": 1970-01-01T00:00:00.000Z,
+          },
         }
     `);
+  expect(getCreateTaskRunnerFunctionParams.alertType.executor).toHaveBeenCalledTimes(1);
+  const call = getCreateTaskRunnerFunctionParams.alertType.executor.mock.calls[0][0];
+  expect(call.params).toMatchInlineSnapshot(`
+            Object {
+              "bar": true,
+            }
+      `);
   expect(call.startedAt).toMatchInlineSnapshot(`1970-01-01T00:00:00.000Z`);
   expect(call.state).toMatchInlineSnapshot(`Object {}`);
   expect(call.services.alertInstanceFactory).toBeTruthy();
@@ -128,16 +130,16 @@ test('fireAction is called per alert instance that fired', async () => {
   await runner.run();
   expect(getCreateTaskRunnerFunctionParams.fireAction).toHaveBeenCalledTimes(1);
   expect(getCreateTaskRunnerFunctionParams.fireAction.mock.calls[0]).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "basePath": undefined,
-            "id": "1",
-            "params": Object {
-              "foo": true,
-            },
-          },
-        ]
-    `);
+    Array [
+      Object {
+        "id": "1",
+        "params": Object {
+          "foo": true,
+        },
+        "spaceId": undefined,
+      },
+    ]
+  `);
 });
 
 test('persists alertInstances passed in from state, only if they fire', async () => {
@@ -162,17 +164,17 @@ test('persists alertInstances passed in from state, only if they fire', async ()
   });
   const runnerResult = await runner.run();
   expect(runnerResult.state.alertInstances).toMatchInlineSnapshot(`
-    Object {
-      "1": Object {
-        "meta": Object {
-          "lastFired": 0,
-        },
-        "state": Object {
-          "bar": false,
-        },
-      },
-    }
-  `);
+        Object {
+          "1": Object {
+            "meta": Object {
+              "lastFired": 0,
+            },
+            "state": Object {
+              "bar": false,
+            },
+          },
+        }
+    `);
 });
 
 test('validates params before executing the alert type', async () => {
diff --git a/x-pack/legacy/plugins/alerting/server/lib/get_create_task_runner_function.ts b/x-pack/legacy/plugins/alerting/server/lib/get_create_task_runner_function.ts
index 5591b63188b35..2ac3023a2079c 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/get_create_task_runner_function.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/get_create_task_runner_function.ts
@@ -13,12 +13,15 @@ import { createAlertInstanceFactory } from './create_alert_instance_factory';
 import { AlertInstance } from './alert_instance';
 import { getNextRunAt } from './get_next_run_at';
 import { validateAlertTypeParams } from './validate_alert_type_params';
+import { SpacesPlugin } from '../../../spaces';
 
 interface CreateTaskRunnerFunctionOptions {
   getServices: (basePath: string) => Services;
   alertType: AlertType;
   fireAction: ActionsPlugin['fire'];
   internalSavedObjectsRepository: SavedObjectsClientContract;
+  spaceIdToNamespace: SpacesPlugin['spaceIdToNamespace'];
+  getBasePath: SpacesPlugin['getBasePath'];
 }
 
 interface TaskRunnerOptions {
@@ -30,13 +33,17 @@ export function getCreateTaskRunnerFunction({
   alertType,
   fireAction,
   internalSavedObjectsRepository,
+  spaceIdToNamespace,
+  getBasePath,
 }: CreateTaskRunnerFunctionOptions) {
   return ({ taskInstance }: TaskRunnerOptions) => {
     return {
       run: async () => {
+        const namespace = spaceIdToNamespace(taskInstance.params.spaceId);
         const alertSavedObject = await internalSavedObjectsRepository.get(
           'alert',
-          taskInstance.params.alertId
+          taskInstance.params.alertId,
+          { namespace }
         );
 
         // Validate
@@ -48,7 +55,7 @@ export function getCreateTaskRunnerFunction({
         const fireHandler = createFireHandler({
           alertSavedObject,
           fireAction,
-          basePath: taskInstance.params.basePath,
+          spaceId: taskInstance.params.spaceId,
         });
         const alertInstances: Record<string, AlertInstance> = {};
         const alertInstancesData = taskInstance.state.alertInstances || {};
diff --git a/x-pack/legacy/plugins/alerting/server/routes/find.test.ts b/x-pack/legacy/plugins/alerting/server/routes/find.test.ts
index 8bc41a51dc7a1..73ab2ddd594fa 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/find.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/find.test.ts
@@ -26,11 +26,18 @@ test('sends proper arguments to alert find function', async () => {
       'fields=description',
   };
 
-  alertsClient.find.mockResolvedValueOnce([]);
+  const expectedResult = {
+    page: 1,
+    perPage: 1,
+    total: 0,
+    data: [],
+  };
+
+  alertsClient.find.mockResolvedValueOnce(expectedResult);
   const { payload, statusCode } = await server.inject(request);
   expect(statusCode).toBe(200);
   const response = JSON.parse(payload);
-  expect(response).toEqual([]);
+  expect(response).toEqual(expectedResult);
   expect(alertsClient.find).toHaveBeenCalledTimes(1);
   expect(alertsClient.find.mock.calls[0]).toMatchInlineSnapshot(`
 Array [
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
index 36519c0c45a6e..4aaad0218269c 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
@@ -670,7 +670,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOver={[Function]}
                   >
                     <a
-                      aria-describedby="error-message-tooltip"
                       className="euiLink euiLink--primary c2"
                       href="#/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0"
                       onBlur={[Function]}
@@ -687,7 +686,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOver={[Function]}
                   >
                     <div
-                      aria-describedby="error-culprit-tooltip"
                       className="c3"
                       onBlur={[Function]}
                       onFocus={[Function]}
@@ -779,7 +777,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOver={[Function]}
                   >
                     <a
-                      aria-describedby="error-message-tooltip"
                       className="euiLink euiLink--primary c2"
                       href="#/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0"
                       onBlur={[Function]}
@@ -796,7 +793,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOver={[Function]}
                   >
                     <div
-                      aria-describedby="error-culprit-tooltip"
                       className="c3"
                       onBlur={[Function]}
                       onFocus={[Function]}
@@ -888,7 +884,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOver={[Function]}
                   >
                     <a
-                      aria-describedby="error-message-tooltip"
                       className="euiLink euiLink--primary c2"
                       href="#/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0"
                       onBlur={[Function]}
@@ -905,7 +900,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOver={[Function]}
                   >
                     <div
-                      aria-describedby="error-culprit-tooltip"
                       className="c3"
                       onBlur={[Function]}
                       onFocus={[Function]}
@@ -997,7 +991,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOver={[Function]}
                   >
                     <a
-                      aria-describedby="error-message-tooltip"
                       className="euiLink euiLink--primary c2"
                       href="#/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0"
                       onBlur={[Function]}
@@ -1014,7 +1007,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOver={[Function]}
                   >
                     <div
-                      aria-describedby="error-culprit-tooltip"
                       className="c3"
                       onBlur={[Function]}
                       onFocus={[Function]}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
index 0ee64d4d4d3b7..fca6e13c0862e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
@@ -115,15 +115,9 @@ NodeList [
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <defs>
-                      <path
-                        d="M13.6 12.186l-1.357-1.358c-.025-.025-.058-.034-.084-.056.53-.794.84-1.746.84-2.773a4.977 4.977 0 0 0-.84-2.772c.026-.02.059-.03.084-.056L13.6 3.813a6.96 6.96 0 0 1 0 8.373zM8 15A6.956 6.956 0 0 1 3.814 13.6l1.358-1.358c.025-.025.034-.057.055-.084C6.02 12.688 6.974 13 8 13a4.978 4.978 0 0 0 2.773-.84c.02.026.03.058.056.083l1.357 1.358A6.956 6.956 0 0 1 8 15zm-5.601-2.813a6.963 6.963 0 0 1 0-8.373l1.359 1.358c.024.025.057.035.084.056A4.97 4.97 0 0 0 3 8c0 1.027.31 1.98.842 2.773-.027.022-.06.031-.084.056l-1.36 1.358zm5.6-.187A4 4 0 1 1 8 4a4 4 0 0 1 0 8zM8 1c1.573 0 3.019.525 4.187 1.4l-1.357 1.358c-.025.025-.035.057-.056.084A4.979 4.979 0 0 0 8 3a4.979 4.979 0 0 0-2.773.842c-.021-.027-.03-.059-.055-.084L3.814 2.4A6.957 6.957 0 0 1 8 1zm0-1a8.001 8.001 0 1 0 .003 16.002A8.001 8.001 0 0 0 8 0z"
-                        id="help-a"
-                      />
-                    </defs>
-                    <use
+                    <path
+                      d="M13.6 12.186l-1.357-1.358c-.025-.025-.058-.034-.084-.056.53-.794.84-1.746.84-2.773a4.977 4.977 0 0 0-.84-2.772c.026-.02.059-.03.084-.056L13.6 3.813a6.96 6.96 0 0 1 0 8.373zM8 15A6.956 6.956 0 0 1 3.814 13.6l1.358-1.358c.025-.025.034-.057.055-.084C6.02 12.688 6.974 13 8 13a4.978 4.978 0 0 0 2.773-.84c.02.026.03.058.056.083l1.357 1.358A6.956 6.956 0 0 1 8 15zm-5.601-2.813a6.963 6.963 0 0 1 0-8.373l1.359 1.358c.024.025.057.035.084.056A4.97 4.97 0 0 0 3 8c0 1.027.31 1.98.842 2.773-.027.022-.06.031-.084.056l-1.36 1.358zm5.6-.187A4 4 0 1 1 8 4a4 4 0 0 1 0 8zM8 1c1.573 0 3.019.525 4.187 1.4l-1.357 1.358c-.025.025-.035.057-.056.084A4.979 4.979 0 0 0 8 3a4.979 4.979 0 0 0-2.773.842c-.021-.027-.03-.059-.055-.084L3.814 2.4A6.957 6.957 0 0 1 8 1zm0-1a8.001 8.001 0 1 0 .003 16.002A8.001 8.001 0 0 0 8 0z"
                       fill-rule="evenodd"
-                      xlink:href="#help-a"
                     />
                   </svg>
                   <span
@@ -163,7 +157,6 @@ NodeList [
           class="euiToolTipAnchor"
         >
           <a
-            aria-describedby="service-name-tooltip"
             class="euiLink euiLink--primary sc-bdVaJa eQDnXY"
             href="#/services/My Go Service/transactions?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0"
             rel="noreferrer"
@@ -262,7 +255,6 @@ NodeList [
           class="euiToolTipAnchor"
         >
           <a
-            aria-describedby="service-name-tooltip"
             class="euiLink euiLink--primary sc-bdVaJa eQDnXY"
             href="#/services/My Python Service/transactions?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0"
             rel="noreferrer"
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
index 10439a4a019c7..63f56b8db5c50 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
@@ -25,15 +25,9 @@ exports[`TransactionActionMenu component should match the snapshot 1`] = `
             width="16"
             xmlns="http://www.w3.org/2000/svg"
           >
-            <defs>
-              <path
-                d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                id="arrow_down-a"
-              />
-            </defs>
-            <use
-              fill-rule="nonzero"
-              xlink:href="#arrow_down-a"
+            <path
+              d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
+              fill-rule="non-zero"
             />
           </svg>
           <span
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap
index f87c799274e8f..c1bde70f93429 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap
@@ -541,7 +541,6 @@ exports[`Timeline should render with data 1`] = `
                 onMouseOver={[Function]}
               >
                 <div
-                  aria-describedby="timeToFirstByte"
                   className="c0"
                   disabled={false}
                   fontSize="12px"
@@ -571,7 +570,6 @@ exports[`Timeline should render with data 1`] = `
                 onMouseOver={[Function]}
               >
                 <div
-                  aria-describedby="domInteractive"
                   className="c0"
                   disabled={false}
                   fontSize="12px"
@@ -601,7 +599,6 @@ exports[`Timeline should render with data 1`] = `
                 onMouseOver={[Function]}
               >
                 <div
-                  aria-describedby="domComplete"
                   className="c0"
                   disabled={false}
                   fontSize="12px"
diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
index 6cdca7109222b..fb63022f341d6 100644
--- a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
@@ -75,7 +75,6 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Create image element"
               className="euiButtonIcon euiButtonIcon--primary"
               onBlur={[Function]}
@@ -173,7 +172,6 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Delete"
               className="euiButtonIcon euiButtonIcon--danger"
               onBlur={[Function]}
@@ -275,7 +273,6 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Create image element"
               className="euiButtonIcon euiButtonIcon--primary"
               onBlur={[Function]}
@@ -373,7 +370,6 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Delete"
               className="euiButtonIcon euiButtonIcon--danger"
               onBlur={[Function]}
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_controls.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_controls.examples.storyshot
index 80e09f8f40bd9..c88869ea22f1a 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_controls.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_controls.examples.storyshot
@@ -20,7 +20,6 @@ exports[`Storyshots components/Elements/ElementControls has two buttons 1`] = `
         onMouseOver={[Function]}
       >
         <button
-          aria-describedby="generated-id"
           aria-label="Edit element"
           className="euiButtonIcon euiButtonIcon--primary"
           onBlur={[Function]}
@@ -50,7 +49,6 @@ exports[`Storyshots components/Elements/ElementControls has two buttons 1`] = `
         onMouseOver={[Function]}
       >
         <button
-          aria-describedby="generated-id"
           aria-label="Delete element"
           className="euiButtonIcon euiButtonIcon--danger"
           onBlur={[Function]}
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
index 29a9b539d3444..c192e082523cb 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
@@ -61,7 +61,6 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Edit element"
               className="euiButtonIcon euiButtonIcon--primary"
               onBlur={[Function]}
@@ -91,7 +90,6 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Delete element"
               className="euiButtonIcon euiButtonIcon--danger"
               onBlur={[Function]}
@@ -164,7 +162,6 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Edit element"
               className="euiButtonIcon euiButtonIcon--primary"
               onBlur={[Function]}
@@ -194,7 +191,6 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Delete element"
               className="euiButtonIcon euiButtonIcon--danger"
               onBlur={[Function]}
@@ -267,7 +263,6 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Edit element"
               className="euiButtonIcon euiButtonIcon--primary"
               onBlur={[Function]}
@@ -297,7 +292,6 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Delete element"
               className="euiButtonIcon euiButtonIcon--danger"
               onBlur={[Function]}
@@ -385,7 +379,6 @@ exports[`Storyshots components/Elements/ElementGrid with controls and filter 1`]
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Edit element"
               className="euiButtonIcon euiButtonIcon--primary"
               onBlur={[Function]}
@@ -415,7 +408,6 @@ exports[`Storyshots components/Elements/ElementGrid with controls and filter 1`]
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Delete element"
               className="euiButtonIcon euiButtonIcon--danger"
               onBlur={[Function]}
diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.examples.storyshot
index b97e6d0ba48b6..5a5472e422963 100644
--- a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.examples.storyshot
@@ -35,7 +35,6 @@ exports[`Storyshots components/Sidebar/SidebarHeader default 1`] = `
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Save as new element"
               className="euiButtonIcon euiButtonIcon--text"
               onBlur={[Function]}
@@ -78,7 +77,6 @@ exports[`Storyshots components/Sidebar/SidebarHeader default 1`] = `
                 onMouseOver={[Function]}
               >
                 <button
-                  aria-describedby="generated-id"
                   aria-label="Element options"
                   className="euiButtonIcon euiButtonIcon--text"
                   onBlur={[Function]}
@@ -142,7 +140,6 @@ exports[`Storyshots components/Sidebar/SidebarHeader without layer controls 1`]
             onMouseOver={[Function]}
           >
             <button
-              aria-describedby="generated-id"
               aria-label="Save as new element"
               className="euiButtonIcon euiButtonIcon--text"
               onBlur={[Function]}
@@ -185,7 +182,6 @@ exports[`Storyshots components/Sidebar/SidebarHeader without layer controls 1`]
                 onMouseOver={[Function]}
               >
                 <button
-                  aria-describedby="generated-id"
                   aria-label="Element options"
                   className="euiButtonIcon euiButtonIcon--text"
                   onBlur={[Function]}
diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot
index d37e0ff60b66d..ed6161b8ff6da 100644
--- a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot
@@ -185,7 +185,6 @@ exports[`Storyshots arguments/SeriesStyle/components simple: no series 1`] = `
         onMouseOver={[Function]}
       >
         <svg
-          aria-describedby="generated-id"
           aria-label="Info"
           className="euiIcon euiIcon--medium euiIcon--warning euiIcon-isLoading"
           focusable="true"
diff --git a/x-pack/legacy/plugins/infra/common/graphql/types.ts b/x-pack/legacy/plugins/infra/common/graphql/types.ts
index 2da829dbf2936..7843a54b93bed 100644
--- a/x-pack/legacy/plugins/infra/common/graphql/types.ts
+++ b/x-pack/legacy/plugins/infra/common/graphql/types.ts
@@ -28,8 +28,6 @@ export interface InfraSource {
   configuration: InfraSourceConfiguration;
   /** The status of the source */
   status: InfraSourceStatus;
-  /** A hierarchy of metadata entries by node */
-  metadataByNode: InfraNodeMetadata;
   /** A consecutive span of log entries surrounding a point in time */
   logEntriesAround: InfraLogEntryInterval;
   /** A consecutive span of log entries within an interval */
@@ -132,20 +130,6 @@ export interface InfraIndexField {
   /** Whether the field's values can be aggregated */
   aggregatable: boolean;
 }
-/** One metadata entry for a node. */
-export interface InfraNodeMetadata {
-  id: string;
-
-  name: string;
-
-  features: InfraNodeFeature[];
-}
-
-export interface InfraNodeFeature {
-  name: string;
-
-  source: string;
-}
 /** A consecutive sequence of log entries */
 export interface InfraLogEntryInterval {
   /** The key corresponding to the start of the interval covered by the entries */
@@ -424,11 +408,6 @@ export interface SourceQueryArgs {
   /** The id of the source */
   id: string;
 }
-export interface MetadataByNodeInfraSourceArgs {
-  nodeId: string;
-
-  nodeType: InfraNodeType;
-}
 export interface LogEntriesAroundInfraSourceArgs {
   /** The sort key that corresponds to the point in time */
   key: InfraTimeKeyInput;
@@ -722,44 +701,6 @@ export namespace LogSummary {
   };
 }
 
-export namespace MetadataQuery {
-  export type Variables = {
-    sourceId: string;
-    nodeId: string;
-    nodeType: InfraNodeType;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    metadataByNode: MetadataByNode;
-  };
-
-  export type MetadataByNode = {
-    __typename?: 'InfraNodeMetadata';
-
-    name: string;
-
-    features: Features[];
-  };
-
-  export type Features = {
-    __typename?: 'InfraNodeFeature';
-
-    name: string;
-
-    source: string;
-  };
-}
-
 export namespace MetricsQuery {
   export type Variables = {
     sourceId: string;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/index.ts b/x-pack/legacy/plugins/infra/common/http_api/index.ts
index 90afdcb43ffb1..19a3dcea3bd0d 100644
--- a/x-pack/legacy/plugins/infra/common/http_api/index.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/index.ts
@@ -6,3 +6,5 @@
 
 export * from './search_results_api';
 export * from './search_summary_api';
+export * from './metadata_api';
+export * from './timed_api';
diff --git a/x-pack/legacy/plugins/infra/common/http_api/metadata_api.ts b/x-pack/legacy/plugins/infra/common/http_api/metadata_api.ts
new file mode 100644
index 0000000000000..796960651122f
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/metadata_api.ts
@@ -0,0 +1,100 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { InfraWrappableRequest } from '../../server/lib/adapters/framework';
+
+export const InfraMetadataNodeTypeRT = rt.keyof({
+  host: null,
+  pod: null,
+  container: null,
+});
+
+export const InfraMetadataRequestRT = rt.type({
+  nodeId: rt.string,
+  nodeType: InfraMetadataNodeTypeRT,
+  sourceId: rt.string,
+});
+
+export const InfraMetadataFeatureRT = rt.type({
+  name: rt.string,
+  source: rt.string,
+});
+
+export const InfraMetadataOSRT = rt.partial({
+  codename: rt.string,
+  family: rt.string,
+  kernel: rt.string,
+  name: rt.string,
+  platform: rt.string,
+  version: rt.string,
+});
+
+export const InfraMetadataHostRT = rt.partial({
+  name: rt.string,
+  os: InfraMetadataOSRT,
+  architecture: rt.string,
+  containerized: rt.boolean,
+});
+
+export const InfraMetadataInstanceRT = rt.partial({
+  id: rt.string,
+  name: rt.string,
+});
+
+export const InfraMetadataProjectRT = rt.partial({
+  id: rt.string,
+});
+
+export const InfraMetadataMachineRT = rt.partial({
+  interface: rt.string,
+});
+
+export const InfraMetadataCloudRT = rt.partial({
+  instance: InfraMetadataInstanceRT,
+  provider: rt.string,
+  availability_zone: rt.string,
+  project: InfraMetadataProjectRT,
+  machine: InfraMetadataMachineRT,
+});
+
+export const InfraMetadataInfoRT = rt.partial({
+  cloud: InfraMetadataCloudRT,
+  host: InfraMetadataHostRT,
+});
+
+const InfraMetadataRequiredRT = rt.type({
+  name: rt.string,
+  features: rt.array(InfraMetadataFeatureRT),
+});
+
+const InfraMetadataOptionalRT = rt.partial({
+  info: InfraMetadataInfoRT,
+});
+
+export const InfraMetadataRT = rt.intersection([InfraMetadataRequiredRT, InfraMetadataOptionalRT]);
+
+export type InfraMetadata = rt.TypeOf<typeof InfraMetadataRT>;
+
+export type InfraMetadataRequest = rt.TypeOf<typeof InfraMetadataRequestRT>;
+
+export type InfraMetadataWrappedRequest = InfraWrappableRequest<InfraMetadataRequest>;
+
+export type InfraMetadataFeature = rt.TypeOf<typeof InfraMetadataFeatureRT>;
+
+export type InfraMetadataInfo = rt.TypeOf<typeof InfraMetadataInfoRT>;
+
+export type InfraMetadataCloud = rt.TypeOf<typeof InfraMetadataCloudRT>;
+
+export type InfraMetadataInstance = rt.TypeOf<typeof InfraMetadataInstanceRT>;
+
+export type InfraMetadataProject = rt.TypeOf<typeof InfraMetadataProjectRT>;
+
+export type InfraMetadataMachine = rt.TypeOf<typeof InfraMetadataMachineRT>;
+
+export type InfraMetadataHost = rt.TypeOf<typeof InfraMetadataHostRT>;
+
+export type InfraMEtadataOS = rt.TypeOf<typeof InfraMetadataOSRT>;
diff --git a/x-pack/legacy/plugins/infra/common/runtime_types.ts b/x-pack/legacy/plugins/infra/common/runtime_types.ts
new file mode 100644
index 0000000000000..297743f9b3456
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/runtime_types.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Errors } from 'io-ts';
+import { failure } from 'io-ts/lib/PathReporter';
+
+export const createPlainError = (message: string) => new Error(message);
+
+export const throwErrors = (createError: (message: string) => Error) => (errors: Errors) => {
+  throw createError(failure(errors).join('\n'));
+};
diff --git a/x-pack/legacy/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx b/x-pack/legacy/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
index 2e8d99bdf5419..940d187f2f3a0 100644
--- a/x-pack/legacy/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
@@ -28,6 +28,7 @@ interface AutocompleteFieldProps {
   suggestions: AutocompleteSuggestion[];
   value: string;
   autoFocus?: boolean;
+  'aria-label'?: string;
 }
 
 interface AutocompleteFieldState {
@@ -49,7 +50,14 @@ export class AutocompleteField extends React.Component<
   private inputElement: HTMLInputElement | null = null;
 
   public render() {
-    const { suggestions, isLoadingSuggestions, isValid, placeholder, value } = this.props;
+    const {
+      suggestions,
+      isLoadingSuggestions,
+      isValid,
+      placeholder,
+      value,
+      'aria-label': ariaLabel,
+    } = this.props;
     const { areSuggestionsVisible, selectedIndex } = this.state;
 
     return (
@@ -67,6 +75,7 @@ export class AutocompleteField extends React.Component<
             onSearch={this.submit}
             placeholder={placeholder}
             value={value}
+            aria-label={ariaLabel}
           />
           {areSuggestionsVisible && !isLoadingSuggestions && suggestions.length > 0 ? (
             <SuggestionsPanel>
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
index c49178a92f8dc..398ef42048d70 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
@@ -31,7 +31,7 @@ export const LogColumnHeaders = injectI18n<{
 }>(({ columnConfigurations, columnWidths, intl, showColumnConfiguration }) => {
   const showColumnConfigurationLabel = intl.formatMessage({
     id: 'xpack.infra.logColumnHeaders.configureColumnsLabel',
-    defaultMessage: 'Configure columns',
+    defaultMessage: 'Configure source',
   });
 
   return (
diff --git a/x-pack/legacy/plugins/infra/public/components/source_configuration/log_columns_configuration_panel.tsx b/x-pack/legacy/plugins/infra/public/components/source_configuration/log_columns_configuration_panel.tsx
index bbc3cde41794c..53d426eba0449 100644
--- a/x-pack/legacy/plugins/infra/public/components/source_configuration/log_columns_configuration_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/source_configuration/log_columns_configuration_panel.tsx
@@ -19,7 +19,8 @@ import {
   EuiDroppable,
   EuiIcon,
 } from '@elastic/eui';
-import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useCallback } from 'react';
 import { DragHandleProps, DropResult } from '../../../../../common/eui_draggable';
 
@@ -167,29 +168,35 @@ const FieldLogColumnConfigurationPanel: React.FunctionComponent<{
     remove,
   },
   dragHandleProps,
-}) => (
-  <EuiPanel data-test-subj={`logColumnPanel fieldLogColumnPanel fieldLogColumnPanel:${field}`}>
-    <EuiFlexGroup>
-      <EuiFlexItem grow={false}>
-        <div data-test-subj="moveLogColumnHandle" {...dragHandleProps}>
-          <EuiIcon type="grab" />
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem grow={1}>
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.fieldLogColumnTitle"
-          defaultMessage="Field"
-        />
-      </EuiFlexItem>
-      <EuiFlexItem grow={3}>
-        <code>{field}</code>
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <RemoveLogColumnButton onClick={remove} />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPanel>
-);
+}) => {
+  const fieldLogColumnTitle = i18n.translate(
+    'xpack.infra.sourceConfiguration.fieldLogColumnTitle',
+    {
+      defaultMessage: 'Field',
+    }
+  );
+  return (
+    <EuiPanel data-test-subj={`logColumnPanel fieldLogColumnPanel fieldLogColumnPanel:${field}`}>
+      <EuiFlexGroup>
+        <EuiFlexItem grow={false}>
+          <div data-test-subj="moveLogColumnHandle" {...dragHandleProps}>
+            <EuiIcon type="grab" />
+          </div>
+        </EuiFlexItem>
+        <EuiFlexItem grow={1}>{fieldLogColumnTitle}</EuiFlexItem>
+        <EuiFlexItem grow={3}>
+          <code>{field}</code>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <RemoveLogColumnButton
+            onClick={remove}
+            columnDescription={`${fieldLogColumnTitle} - ${field}`}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+};
 
 const ExplainedLogColumnConfigurationPanel: React.FunctionComponent<{
   fieldName: React.ReactNode;
@@ -213,23 +220,26 @@ const ExplainedLogColumnConfigurationPanel: React.FunctionComponent<{
         </EuiText>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <RemoveLogColumnButton onClick={removeColumn} />
+        <RemoveLogColumnButton onClick={removeColumn} columnDescription={String(fieldName)} />
       </EuiFlexItem>
     </EuiFlexGroup>
   </EuiPanel>
 );
 
-const RemoveLogColumnButton = injectI18n<{
+const RemoveLogColumnButton: React.FunctionComponent<{
   onClick?: () => void;
-}>(({ intl, onClick }) => {
-  const removeColumnLabel = intl.formatMessage({
-    id: 'xpack.infra.sourceConfiguration.removeLogColumnButtonLabel',
-    defaultMessage: 'Remove this column',
-  });
+  columnDescription: string;
+}> = ({ onClick, columnDescription }) => {
+  const removeColumnLabel = i18n.translate(
+    'xpack.infra.sourceConfiguration.removeLogColumnButtonLabel',
+    {
+      defaultMessage: 'Remove {columnDescription} column',
+      values: { columnDescription },
+    }
+  );
 
   return (
     <EuiButtonIcon
-      aria-label={removeColumnLabel}
       color="danger"
       data-test-subj="removeLogColumnButton"
       iconType="trash"
@@ -237,7 +247,7 @@ const RemoveLogColumnButton = injectI18n<{
       title={removeColumnLabel}
     />
   );
-});
+};
 
 const LogColumnConfigurationEmptyPrompt: React.FunctionComponent = () => (
   <EuiEmptyPrompt
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx
index 58444ab5e7d29..04748095b7b9f 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx
@@ -7,10 +7,10 @@
 import { EuiButton, EuiComboBox, EuiForm, EuiFormRow } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React from 'react';
-import { InfraIndexField } from '../../../server/graphql/types';
+import { FieldType } from 'ui/index_patterns';
 interface Props {
   onSubmit: (field: string) => void;
-  fields: InfraIndexField[];
+  fields: FieldType[];
   intl: InjectedIntl;
 }
 
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
index 24eacf840fd69..e39099899c416 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
@@ -15,7 +15,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React from 'react';
-import { InfraIndexField, InfraNodeType, InfraSnapshotGroupbyInput } from '../../graphql/types';
+import { FieldType } from 'ui/index_patterns';
+import { InfraNodeType, InfraSnapshotGroupbyInput } from '../../graphql/types';
 import { InfraGroupByOptions } from '../../lib/lib';
 import { CustomFieldPanel } from './custom_field_panel';
 import { fieldToName } from './lib/field_to_display_name';
@@ -26,7 +27,7 @@ interface Props {
   groupBy: InfraSnapshotGroupbyInput[];
   onChange: (groupBy: InfraSnapshotGroupbyInput[]) => void;
   onChangeCustomOptions: (options: InfraGroupByOptions[]) => void;
-  fields: InfraIndexField[];
+  fields: FieldType[];
   intl: InjectedIntl;
   customOptions: InfraGroupByOptions[];
 }
diff --git a/x-pack/legacy/plugins/infra/public/containers/metadata/lib/get_filtered_layouts.ts b/x-pack/legacy/plugins/infra/public/containers/metadata/lib/get_filtered_layouts.ts
new file mode 100644
index 0000000000000..a543365aa68d5
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/metadata/lib/get_filtered_layouts.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 { InfraMetadataFeature } from '../../../../common/http_api/metadata_api';
+import { InfraMetricLayout } from '../../../pages/metrics/layouts/types';
+
+export const getFilteredLayouts = (
+  layouts: InfraMetricLayout[],
+  metadata: Array<InfraMetadataFeature | null> | undefined
+): InfraMetricLayout[] => {
+  if (!metadata) {
+    return layouts;
+  }
+
+  const metricMetadata: Array<string | null> = metadata
+    .filter(data => data && data.source === 'metrics')
+    .map(data => data && data.name);
+
+  // After filtering out sections that can't be displayed, a layout may end up empty and can be removed.
+  const filteredLayouts = layouts
+    .map(layout => getFilteredLayout(layout, metricMetadata))
+    .filter(layout => layout.sections.length > 0);
+  return filteredLayouts;
+};
+
+export const getFilteredLayout = (
+  layout: InfraMetricLayout,
+  metricMetadata: Array<string | null>
+): InfraMetricLayout => {
+  // A section is only displayed if at least one of its requirements is met
+  // All others are filtered out.
+  const filteredSections = layout.sections.filter(
+    section => _.intersection(section.requires, metricMetadata).length > 0
+  );
+  return { ...layout, sections: filteredSections };
+};
diff --git a/x-pack/legacy/plugins/infra/public/containers/metadata/metadata.gql_query.ts b/x-pack/legacy/plugins/infra/public/containers/metadata/metadata.gql_query.ts
deleted file mode 100644
index 9a59cfcbee9ec..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/metadata/metadata.gql_query.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const metadataQuery = gql`
-  query MetadataQuery($sourceId: ID!, $nodeId: String!, $nodeType: InfraNodeType!) {
-    source(id: $sourceId) {
-      id
-      metadataByNode(nodeId: $nodeId, nodeType: $nodeType) {
-        name
-        features {
-          name
-          source
-        }
-      }
-    }
-  }
-`;
diff --git a/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts b/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts
new file mode 100644
index 0000000000000..941c7532d5b29
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.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 { useEffect } from 'react';
+import { InfraNodeType } from '../../graphql/types';
+import { InfraMetricLayout } from '../../pages/metrics/layouts/types';
+import { InfraMetadata, InfraMetadataRT } from '../../../common/http_api/metadata_api';
+import { getFilteredLayouts } from './lib/get_filtered_layouts';
+import { useHTTPRequest } from '../../hooks/use_http_request';
+import { throwErrors, createPlainError } from '../../../common/runtime_types';
+
+export function useMetadata(
+  nodeId: string,
+  nodeType: InfraNodeType,
+  layouts: InfraMetricLayout[],
+  sourceId: string
+) {
+  const decodeResponse = (response: any) => {
+    return InfraMetadataRT.decode(response).getOrElseL(throwErrors(createPlainError));
+  };
+
+  const { error, loading, response, makeRequest } = useHTTPRequest<InfraMetadata>(
+    '/api/infra/metadata',
+    'POST',
+    JSON.stringify({
+      nodeId,
+      nodeType,
+      sourceId,
+      decodeResponse,
+    })
+  );
+
+  useEffect(() => {
+    (async () => {
+      await makeRequest();
+    })();
+  }, [makeRequest]);
+
+  return {
+    name: (response && response.name) || '',
+    filteredLayouts: (response && getFilteredLayouts(layouts, response.features)) || [],
+    error: (error && error.message) || null,
+    loading,
+  };
+}
diff --git a/x-pack/legacy/plugins/infra/public/containers/metadata/with_metadata.tsx b/x-pack/legacy/plugins/infra/public/containers/metadata/with_metadata.tsx
deleted file mode 100644
index 1950ecf436539..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/metadata/with_metadata.tsx
+++ /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 _ from 'lodash';
-import React from 'react';
-import { Query } from 'react-apollo';
-
-import { InfraNodeType, MetadataQuery } from '../../graphql/types';
-import { InfraMetricLayout } from '../../pages/metrics/layouts/types';
-import { metadataQuery } from './metadata.gql_query';
-
-interface WithMetadataProps {
-  children: (args: WithMetadataArgs) => React.ReactNode;
-  layouts: InfraMetricLayout[];
-  nodeType: InfraNodeType;
-  nodeId: string;
-  sourceId: string;
-}
-
-interface WithMetadataArgs {
-  name: string;
-  filteredLayouts: InfraMetricLayout[];
-  error?: string | undefined;
-  loading: boolean;
-}
-
-export const WithMetadata = ({
-  children,
-  layouts,
-  nodeType,
-  nodeId,
-  sourceId,
-}: WithMetadataProps) => {
-  return (
-    <Query<MetadataQuery.Query, MetadataQuery.Variables>
-      query={metadataQuery}
-      fetchPolicy="no-cache"
-      variables={{
-        sourceId,
-        nodeType,
-        nodeId,
-      }}
-    >
-      {({ data, error, loading }) => {
-        const metadata = data && data.source && data.source.metadataByNode;
-        const filteredLayouts = (metadata && getFilteredLayouts(layouts, metadata.features)) || [];
-        return children({
-          name: (metadata && metadata.name) || '',
-          filteredLayouts,
-          error: error && error.message,
-          loading,
-        });
-      }}
-    </Query>
-  );
-};
-
-const getFilteredLayouts = (
-  layouts: InfraMetricLayout[],
-  metadata: Array<MetadataQuery.Features | null> | undefined
-): InfraMetricLayout[] => {
-  if (!metadata) {
-    return layouts;
-  }
-
-  const metricMetadata: Array<string | null> = metadata
-    .filter(data => data && data.source === 'metrics')
-    .map(data => data && data.name);
-
-  // After filtering out sections that can't be displayed, a layout may end up empty and can be removed.
-  const filteredLayouts = layouts
-    .map(layout => getFilteredLayout(layout, metricMetadata))
-    .filter(layout => layout.sections.length > 0);
-  return filteredLayouts;
-};
-
-const getFilteredLayout = (
-  layout: InfraMetricLayout,
-  metricMetadata: Array<string | null>
-): InfraMetricLayout => {
-  // A section is only displayed if at least one of its requirements is met
-  // All others are filtered out.
-  const filteredSections = layout.sections.filter(
-    section => _.intersection(section.requires, metricMetadata).length > 0
-  );
-  return { ...layout, sections: filteredSections };
-};
diff --git a/x-pack/legacy/plugins/infra/public/containers/source/source.tsx b/x-pack/legacy/plugins/infra/public/containers/source/source.tsx
index 9632a5bda0792..8b931545a5c6c 100644
--- a/x-pack/legacy/plugins/infra/public/containers/source/source.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/source/source.tsx
@@ -21,6 +21,19 @@ import { updateSourceMutation } from './update_source.gql_query';
 
 type Source = SourceQuery.Query['source'];
 
+const pickIndexPattern = (source: Source | undefined, type: 'logs' | 'metrics' | 'both') => {
+  if (!source) {
+    return 'unknown-index';
+  }
+  if (type === 'logs') {
+    return source.configuration.logAlias;
+  }
+  if (type === 'metrics') {
+    return source.configuration.metricAlias;
+  }
+  return `${source.configuration.logAlias},${source.configuration.metricAlias}`;
+};
+
 export const useSource = ({ sourceId }: { sourceId: string }) => {
   const apolloClient = useApolloClient();
   const [source, setSource] = useState<Source | undefined>(undefined);
@@ -108,13 +121,12 @@ export const useSource = ({ sourceId }: { sourceId: string }) => {
     [apolloClient, sourceId]
   );
 
-  const derivedIndexPattern = useMemo(
-    () => ({
+  const createDerivedIndexPattern = (type: 'logs' | 'metrics' | 'both') => {
+    return {
       fields: source ? source.status.indexFields : [],
-      title: source ? `${source.configuration.logAlias}` : 'unknown-index',
-    }),
-    [source]
-  );
+      title: pickIndexPattern(source, type),
+    };
+  };
 
   const isLoading = useMemo(
     () =>
@@ -146,7 +158,7 @@ export const useSource = ({ sourceId }: { sourceId: string }) => {
 
   return {
     createSourceConfiguration,
-    derivedIndexPattern,
+    createDerivedIndexPattern,
     logIndicesExist,
     isLoading,
     isLoadingSource: loadSourceRequest.state === 'pending',
diff --git a/x-pack/legacy/plugins/infra/public/containers/with_source/with_source.tsx b/x-pack/legacy/plugins/infra/public/containers/with_source/with_source.tsx
index 3ed3852484e71..0512888ecd4ea 100644
--- a/x-pack/legacy/plugins/infra/public/containers/with_source/with_source.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/with_source/with_source.tsx
@@ -15,7 +15,7 @@ interface WithSourceProps {
   children: RendererFunction<{
     configuration?: SourceQuery.Query['source']['configuration'];
     create: (sourceProperties: UpdateSourceInput) => Promise<any> | undefined;
-    derivedIndexPattern: StaticIndexPattern;
+    createDerivedIndexPattern: (type: 'logs' | 'metrics' | 'both') => StaticIndexPattern;
     exists?: boolean;
     hasFailed: boolean;
     isLoading: boolean;
@@ -33,7 +33,7 @@ interface WithSourceProps {
 export const WithSource: React.FunctionComponent<WithSourceProps> = ({ children }) => {
   const {
     createSourceConfiguration,
-    derivedIndexPattern,
+    createDerivedIndexPattern,
     source,
     sourceExists,
     sourceId,
@@ -50,7 +50,7 @@ export const WithSource: React.FunctionComponent<WithSourceProps> = ({ children
   return children({
     create: createSourceConfiguration,
     configuration: source && source.configuration,
-    derivedIndexPattern,
+    createDerivedIndexPattern,
     exists: sourceExists,
     hasFailed: hasFailedLoadingSource,
     isLoading,
diff --git a/x-pack/legacy/plugins/infra/public/graphql/introspection.json b/x-pack/legacy/plugins/infra/public/graphql/introspection.json
index c937d4f365e62..055fac61cb93d 100644
--- a/x-pack/legacy/plugins/infra/public/graphql/introspection.json
+++ b/x-pack/legacy/plugins/infra/public/graphql/introspection.json
@@ -137,39 +137,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "metadataByNode",
-            "description": "A hierarchy of metadata entries by node",
-            "args": [
-              {
-                "name": "nodeId",
-                "description": "",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-                },
-                "defaultValue": null
-              },
-              {
-                "name": "nodeType",
-                "description": "",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "ENUM", "name": "InfraNodeType", "ofType": null }
-                },
-                "defaultValue": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "OBJECT", "name": "InfraNodeMetadata", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "logEntriesAround",
             "description": "A consecutive span of log entries surrounding a point in time",
@@ -1086,115 +1053,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "ENUM",
-        "name": "InfraNodeType",
-        "description": "",
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          { "name": "pod", "description": "", "isDeprecated": false, "deprecationReason": null },
-          {
-            "name": "container",
-            "description": "",
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          { "name": "host", "description": "", "isDeprecated": false, "deprecationReason": null }
-        ],
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "InfraNodeMetadata",
-        "description": "One metadata entry for a node.",
-        "fields": [
-          {
-            "name": "id",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "name",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "features",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "OBJECT", "name": "InfraNodeFeature", "ofType": null }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "InfraNodeFeature",
-        "description": "",
-        "fields": [
-          {
-            "name": "name",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "source",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
       {
         "kind": "INPUT_OBJECT",
         "name": "InfraTimeKeyInput",
@@ -2039,6 +1897,25 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "ENUM",
+        "name": "InfraNodeType",
+        "description": "",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          { "name": "pod", "description": "", "isDeprecated": false, "deprecationReason": null },
+          {
+            "name": "container",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          { "name": "host", "description": "", "isDeprecated": false, "deprecationReason": null }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "INPUT_OBJECT",
         "name": "InfraSnapshotGroupbyInput",
diff --git a/x-pack/legacy/plugins/infra/public/graphql/types.ts b/x-pack/legacy/plugins/infra/public/graphql/types.ts
index d28f5bda6ac47..7843a54b93bed 100644
--- a/x-pack/legacy/plugins/infra/public/graphql/types.ts
+++ b/x-pack/legacy/plugins/infra/public/graphql/types.ts
@@ -8,8 +8,6 @@
 // Types
 // ====================================================
 
-import { FieldType } from 'ui/index_patterns';
-
 export interface Query {
   /** Get an infrastructure data source by id.The resolution order for the source configuration attributes is as followswith the first defined value winning:1. The attributes of the saved object with the given 'id'.2. The attributes defined in the static Kibana configuration key'xpack.infra.sources.default'.3. The hard-coded default values.As a consequence, querying a source that doesn't exist doesn't error out,but returns the configured or hardcoded defaults. */
   source: InfraSource;
@@ -30,8 +28,6 @@ export interface InfraSource {
   configuration: InfraSourceConfiguration;
   /** The status of the source */
   status: InfraSourceStatus;
-  /** A hierarchy of metadata entries by node */
-  metadataByNode: InfraNodeMetadata;
   /** A consecutive span of log entries surrounding a point in time */
   logEntriesAround: InfraLogEntryInterval;
   /** A consecutive span of log entries within an interval */
@@ -124,21 +120,15 @@ export interface InfraSourceStatus {
   indexFields: InfraIndexField[];
 }
 /** A descriptor of a field in an index */
-export interface InfraIndexField extends FieldType {}
-
-/** One metadata entry for a node. */
-export interface InfraNodeMetadata {
-  id: string;
-
+export interface InfraIndexField {
+  /** The name of the field */
   name: string;
-
-  features: InfraNodeFeature[];
-}
-
-export interface InfraNodeFeature {
-  name: string;
-
-  source: string;
+  /** The type of the field's values as recognized by Kibana */
+  type: string;
+  /** Whether the field's values can be efficiently searched for */
+  searchable: boolean;
+  /** Whether the field's values can be aggregated */
+  aggregatable: boolean;
 }
 /** A consecutive sequence of log entries */
 export interface InfraLogEntryInterval {
@@ -418,11 +408,6 @@ export interface SourceQueryArgs {
   /** The id of the source */
   id: string;
 }
-export interface MetadataByNodeInfraSourceArgs {
-  nodeId: string;
-
-  nodeType: InfraNodeType;
-}
 export interface LogEntriesAroundInfraSourceArgs {
   /** The sort key that corresponds to the point in time */
   key: InfraTimeKeyInput;
@@ -716,44 +701,6 @@ export namespace LogSummary {
   };
 }
 
-export namespace MetadataQuery {
-  export type Variables = {
-    sourceId: string;
-    nodeId: string;
-    nodeType: InfraNodeType;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    metadataByNode: MetadataByNode;
-  };
-
-  export type MetadataByNode = {
-    __typename?: 'InfraNodeMetadata';
-
-    name: string;
-
-    features: Features[];
-  };
-
-  export type Features = {
-    __typename?: 'InfraNodeFeature';
-
-    name: string;
-
-    source: string;
-  };
-}
-
 export namespace MetricsQuery {
   export type Variables = {
     sourceId: string;
diff --git a/x-pack/legacy/plugins/infra/public/hooks/use_http_request.tsx b/x-pack/legacy/plugins/infra/public/hooks/use_http_request.tsx
new file mode 100644
index 0000000000000..606f7d0aecdc0
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/hooks/use_http_request.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useMemo, useState } from 'react';
+import { kfetch } from 'ui/kfetch';
+import { toastNotifications } from 'ui/notify';
+import { i18n } from '@kbn/i18n';
+import { idx } from '@kbn/elastic-idx/target';
+import { KFetchError } from 'ui/kfetch/kfetch_error';
+import { useTrackedPromise } from '../utils/use_tracked_promise';
+export function useHTTPRequest<Response>(
+  pathname: string,
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD',
+  body?: string,
+  decode: (response: any) => Response = response => response
+) {
+  const [response, setResponse] = useState<Response | null>(null);
+  const [error, setError] = useState<KFetchError | null>(null);
+  const [request, makeRequest] = useTrackedPromise(
+    {
+      cancelPreviousOn: 'resolution',
+      createPromise: () =>
+        kfetch({
+          method,
+          pathname,
+          body,
+        }),
+      onResolve: resp => setResponse(decode(resp)),
+      onReject: (e: unknown) => {
+        const err = e as KFetchError;
+        setError(err);
+        toastNotifications.addWarning({
+          title: i18n.translate('xpack.infra.useHTTPRequest.error.title', {
+            defaultMessage: `Error while fetching resource`,
+          }),
+          text: (
+            <div>
+              <h5>
+                {i18n.translate('xpack.infra.useHTTPRequest.error.status', {
+                  defaultMessage: `Error`,
+                })}
+              </h5>
+              {idx(err.res, r => r.statusText)} ({idx(err.res, r => r.status)})
+              <h5>
+                {i18n.translate('xpack.infra.useHTTPRequest.error.url', {
+                  defaultMessage: `URL`,
+                })}
+              </h5>
+              {idx(err.res, r => r.url)}
+            </div>
+          ),
+        });
+      },
+    },
+    [pathname, body, method]
+  );
+
+  const loading = useMemo(() => request.state === 'pending', [request.state]);
+
+  return {
+    response,
+    error,
+    loading,
+    makeRequest,
+  };
+}
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
index 11b5799fe7286..3cc40be7e5fe0 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
@@ -68,11 +68,11 @@ export const InfrastructurePage = injectI18n(({ match, intl }: InfrastructurePag
             path={`${match.path}/metrics-explorer`}
             render={props => (
               <WithSource>
-                {({ configuration, derivedIndexPattern }) => (
+                {({ configuration, createDerivedIndexPattern }) => (
                   <MetricsExplorerOptionsContainer.Provider>
                     <WithMetricsExplorerOptionsUrlState />
                     <MetricsExplorerPage
-                      derivedIndexPattern={derivedIndexPattern}
+                      derivedIndexPattern={createDerivedIndexPattern('metrics')}
                       source={configuration}
                       {...props}
                     />
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/index.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/index.tsx
index 5c28715e4e538..9b4efa44d483a 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/index.tsx
@@ -38,7 +38,7 @@ export const SnapshotPage = injectUICapabilities(
     const { intl, uiCapabilities } = props;
     const { showIndicesConfiguration } = useContext(SourceConfigurationFlyoutState.Context);
     const {
-      derivedIndexPattern,
+      createDerivedIndexPattern,
       hasFailedLoadingSource,
       isLoading,
       loadSourceFailureMessage,
@@ -84,7 +84,7 @@ export const SnapshotPage = injectUICapabilities(
         ) : metricIndicesExist ? (
           <>
             <WithWaffleTimeUrlState />
-            <WithWaffleFilterUrlState indexPattern={derivedIndexPattern} />
+            <WithWaffleFilterUrlState indexPattern={createDerivedIndexPattern('metrics')} />
             <WithWaffleOptionsUrlState />
             <SnapshotToolbar />
             <SnapshotPageContent />
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/page_content.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/page_content.tsx
index a47b82d17d77e..f6c9bb27e36c0 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/page_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/page_content.tsx
@@ -19,10 +19,10 @@ import { WithSource } from '../../../containers/with_source';
 export const SnapshotPageContent: React.SFC = () => (
   <PageContent>
     <WithSource>
-      {({ configuration, derivedIndexPattern, sourceId }) => (
+      {({ configuration, createDerivedIndexPattern, sourceId }) => (
         <WithOptions>
           {({ wafflemap }) => (
-            <WithWaffleFilter indexPattern={derivedIndexPattern}>
+            <WithWaffleFilter indexPattern={createDerivedIndexPattern('metrics')}>
               {({ filterQueryAsJson, applyFilterQuery }) => (
                 <WithWaffleTime>
                   {({ currentTimeRange, isAutoReloading }) => (
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
index e70e79a18a66a..0d3fda093b223 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
@@ -26,10 +26,10 @@ export const SnapshotToolbar = injectI18n(({ intl }) => (
     <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="m">
       <EuiFlexItem>
         <WithSource>
-          {({ derivedIndexPattern }) => (
-            <WithKueryAutocompletion indexPattern={derivedIndexPattern}>
+          {({ createDerivedIndexPattern }) => (
+            <WithKueryAutocompletion indexPattern={createDerivedIndexPattern('metrics')}>
               {({ isLoadingSuggestions, loadSuggestions, suggestions }) => (
-                <WithWaffleFilter indexPattern={derivedIndexPattern}>
+                <WithWaffleFilter indexPattern={createDerivedIndexPattern('metrics')}>
                   {({
                     applyFilterQueryFromKueryExpression,
                     filterQueryDraft,
@@ -73,7 +73,7 @@ export const SnapshotToolbar = injectI18n(({ intl }) => (
     </EuiFlexGroup>
     <EuiFlexGroup alignItems="center" gutterSize="m">
       <WithSource>
-        {({ derivedIndexPattern }) => (
+        {({ createDerivedIndexPattern }) => (
           <WithWaffleOptions>
             {({
               changeMetric,
@@ -106,7 +106,7 @@ export const SnapshotToolbar = injectI18n(({ intl }) => (
                     groupBy={groupBy}
                     nodeType={nodeType}
                     onChange={changeGroupBy}
-                    fields={derivedIndexPattern.fields}
+                    fields={createDerivedIndexPattern('metrics').fields}
                     onChangeCustomOptions={changeCustomOptions}
                     customOptions={customOptions}
                   />
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/page_logs_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/page_logs_content.tsx
index 7f4b52604e469..007584d4cacc8 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/page_logs_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/page_logs_content.tsx
@@ -32,7 +32,7 @@ import { SourceConfigurationFlyoutState } from '../../components/source_configur
 import { LogHighlightsBridge } from '../../containers/logs/log_highlights';
 
 export const LogsPageLogsContent: React.FunctionComponent = () => {
-  const { derivedIndexPattern, source, sourceId, version } = useContext(Source.Context);
+  const { createDerivedIndexPattern, source, sourceId, version } = useContext(Source.Context);
   const { intervalSize, textScale, textWrap } = useContext(LogViewConfiguration.Context);
   const {
     setFlyoutVisibility,
@@ -45,6 +45,8 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
   } = useContext(LogFlyoutState.Context);
   const { showLogsConfiguration } = useContext(SourceConfigurationFlyoutState.Context);
 
+  const derivedIndexPattern = createDerivedIndexPattern('logs');
+
   return (
     <>
       <ReduxSourceIdBridge sourceId={sourceId} />
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/page_toolbar.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/page_toolbar.tsx
index 2255cbff3d0cd..8a132fd9e0c71 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/page_toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/page_toolbar.tsx
@@ -26,7 +26,8 @@ import { Source } from '../../containers/source';
 import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion';
 
 export const LogsToolbar = injectI18n(({ intl }) => {
-  const { derivedIndexPattern } = useContext(Source.Context);
+  const { createDerivedIndexPattern } = useContext(Source.Context);
+  const derivedIndexPattern = createDerivedIndexPattern('logs');
   const {
     availableIntervalSizes,
     availableTextScales,
@@ -80,6 +81,10 @@ export const LogsToolbar = injectI18n(({ intl }) => {
                     })}
                     suggestions={suggestions}
                     value={filterQueryDraft ? filterQueryDraft.expression : ''}
+                    aria-label={intl.formatMessage({
+                      id: 'xpack.infra.logsPage.toolbar.kqlSearchFieldAriaLabel',
+                      defaultMessage: 'Search for log entries',
+                    })}
                   />
                 )}
               </WithLogFilter>
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
index 1929b3351acb7..54cd1542bc7cc 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
@@ -15,7 +15,7 @@ import {
 } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { GraphQLFormattedError } from 'graphql';
-import React from 'react';
+import React, { useCallback, useContext } from 'react';
 import { UICapabilities } from 'ui/capabilities';
 import { injectUICapabilities } from 'ui/capabilities/react';
 import euiStyled, { EuiTheme, withTheme } from '../../../../../common/eui_styled_components';
@@ -29,18 +29,18 @@ import { MetricsSideNav } from '../../components/metrics/side_nav';
 import { MetricsTimeControls } from '../../components/metrics/time_controls';
 import { ColumnarPage, PageContent } from '../../components/page';
 import { SourceConfigurationFlyout } from '../../components/source_configuration';
-import { WithMetadata } from '../../containers/metadata/with_metadata';
 import { WithMetrics } from '../../containers/metrics/with_metrics';
 import {
   WithMetricsTime,
   WithMetricsTimeUrlState,
 } from '../../containers/metrics/with_metrics_time';
-import { WithSource } from '../../containers/with_source';
 import { InfraNodeType, InfraTimerangeInput } from '../../graphql/types';
 import { Error, ErrorPageBody } from '../error';
 import { layoutCreators } from './layouts';
 import { InfraMetricLayoutSection } from './layouts/types';
-import { MetricDetailPageProviders } from './page_providers';
+import { withMetricPageProviders } from './page_providers';
+import { useMetadata } from '../../containers/metadata/use_metadata';
+import { Source } from '../../containers/source';
 
 const DetailPageContent = euiStyled(PageContent)`
   overflow: auto;
@@ -63,206 +63,189 @@ interface Props {
   uiCapabilities: UICapabilities;
 }
 
-export const MetricDetail = injectUICapabilities(
-  withTheme(
-    injectI18n(
-      class extends React.PureComponent<Props> {
-        public static displayName = 'MetricDetailPage';
+export const MetricDetail = withMetricPageProviders(
+  injectUICapabilities(
+    withTheme(
+      injectI18n(({ intl, uiCapabilities, match, theme }: Props) => {
+        const nodeId = match.params.node;
+        const nodeType = match.params.type as InfraNodeType;
+        const layoutCreator = layoutCreators[nodeType];
+        if (!layoutCreator) {
+          return (
+            <Error
+              message={intl.formatMessage(
+                {
+                  id: 'xpack.infra.metricDetailPage.invalidNodeTypeErrorMessage',
+                  defaultMessage: '{nodeType} is not a valid node type',
+                },
+                {
+                  nodeType: `"${nodeType}"`,
+                }
+              )}
+            />
+          );
+        }
+        const { sourceId } = useContext(Source.Context);
+        const layouts = layoutCreator(theme);
+        const { name, filteredLayouts, loading: metadataLoading } = useMetadata(
+          nodeId,
+          nodeType,
+          layouts,
+          sourceId
+        );
+        const breadcrumbs = [
+          {
+            href: '#/',
+            text: intl.formatMessage({
+              id: 'xpack.infra.header.infrastructureTitle',
+              defaultMessage: 'Infrastructure',
+            }),
+          },
+          { text: name },
+        ];
 
-        public render() {
-          const { intl, uiCapabilities } = this.props;
-          const nodeId = this.props.match.params.node;
-          const nodeType = this.props.match.params.type as InfraNodeType;
-          const layoutCreator = layoutCreators[nodeType];
-          if (!layoutCreator) {
-            return (
-              <Error
-                message={intl.formatMessage(
-                  {
-                    id: 'xpack.infra.metricDetailPage.invalidNodeTypeErrorMessage',
-                    defaultMessage: '{nodeType} is not a valid node type',
-                  },
-                  {
-                    nodeType: `"${nodeType}"`,
-                  }
-                )}
-              />
-            );
-          }
-          const layouts = layoutCreator(this.props.theme);
+        const handleClick = useCallback(
+          (section: InfraMetricLayoutSection) => () => {
+            const id = section.linkToId || section.id;
+            const el = document.getElementById(id);
+            if (el) {
+              el.scrollIntoView();
+            }
+          },
+          []
+        );
 
-          return (
-            <MetricDetailPageProviders>
-              <WithSource>
-                {({ sourceId }) => (
-                  <WithMetricsTime>
-                    {({
-                      timeRange,
-                      setTimeRange,
-                      refreshInterval,
-                      setRefreshInterval,
-                      isAutoReloading,
-                      setAutoReload,
-                    }) => (
-                      <WithMetadata
-                        layouts={layouts}
-                        sourceId={sourceId}
-                        nodeType={nodeType}
-                        nodeId={nodeId}
-                      >
-                        {({ name, filteredLayouts, loading: metadataLoading }) => {
-                          const breadcrumbs = [
-                            {
-                              href: '#/',
-                              text: intl.formatMessage({
-                                id: 'xpack.infra.header.infrastructureTitle',
-                                defaultMessage: 'Infrastructure',
-                              }),
-                            },
-                            { text: name },
-                          ];
-                          return (
-                            <ColumnarPage>
-                              <Header
-                                breadcrumbs={breadcrumbs}
-                                readOnlyBadge={!uiCapabilities.infrastructure.save}
-                              />
-                              <SourceConfigurationFlyout
-                                shouldAllowEdit={
-                                  uiCapabilities.infrastructure.configureSource as boolean
-                                }
-                              />
-                              <WithMetricsTimeUrlState />
-                              <DocumentTitle
-                                title={intl.formatMessage(
+        return (
+          <WithMetricsTime>
+            {({
+              timeRange,
+              setTimeRange,
+              refreshInterval,
+              setRefreshInterval,
+              isAutoReloading,
+              setAutoReload,
+            }) => (
+              <ColumnarPage>
+                <Header
+                  breadcrumbs={breadcrumbs}
+                  readOnlyBadge={!uiCapabilities.infrastructure.save}
+                />
+                <SourceConfigurationFlyout
+                  shouldAllowEdit={uiCapabilities.infrastructure.configureSource as boolean}
+                />
+                <WithMetricsTimeUrlState />
+                <DocumentTitle
+                  title={intl.formatMessage(
+                    {
+                      id: 'xpack.infra.metricDetailPage.documentTitle',
+                      defaultMessage: 'Infrastructure | Metrics | {name}',
+                    },
+                    {
+                      name,
+                    }
+                  )}
+                />
+                <DetailPageContent data-test-subj="infraMetricsPage">
+                  <WithMetrics
+                    layouts={filteredLayouts}
+                    sourceId={sourceId}
+                    timerange={timeRange as InfraTimerangeInput}
+                    nodeType={nodeType}
+                    nodeId={nodeId}
+                  >
+                    {({ metrics, error, loading, refetch }) => {
+                      if (error) {
+                        const invalidNodeError = error.graphQLErrors.some(
+                          (err: GraphQLFormattedError) =>
+                            err.code === InfraMetricsErrorCodes.invalid_node
+                        );
+
+                        return (
+                          <>
+                            <DocumentTitle
+                              title={(previousTitle: string) =>
+                                intl.formatMessage(
                                   {
-                                    id: 'xpack.infra.metricDetailPage.documentTitle',
-                                    defaultMessage: 'Infrastructure | Metrics | {name}',
+                                    id: 'xpack.infra.metricDetailPage.documentTitleError',
+                                    defaultMessage: '{previousTitle} | Uh oh',
                                   },
                                   {
-                                    name,
+                                    previousTitle,
                                   }
-                                )}
-                              />
-                              <DetailPageContent data-test-subj="infraMetricsPage">
-                                <WithMetrics
-                                  layouts={filteredLayouts}
-                                  sourceId={sourceId}
-                                  timerange={timeRange as InfraTimerangeInput}
-                                  nodeType={nodeType}
-                                  nodeId={nodeId}
-                                >
-                                  {({ metrics, error, loading, refetch }) => {
-                                    if (error) {
-                                      const invalidNodeError = error.graphQLErrors.some(
-                                        (err: GraphQLFormattedError) =>
-                                          err.code === InfraMetricsErrorCodes.invalid_node
-                                      );
-
-                                      return (
-                                        <>
-                                          <DocumentTitle
-                                            title={(previousTitle: string) =>
-                                              intl.formatMessage(
-                                                {
-                                                  id:
-                                                    'xpack.infra.metricDetailPage.documentTitleError',
-                                                  defaultMessage: '{previousTitle} | Uh oh',
-                                                },
-                                                {
-                                                  previousTitle,
-                                                }
-                                              )
-                                            }
+                                )
+                              }
+                            />
+                            {invalidNodeError ? (
+                              <InvalidNodeError nodeName={name} />
+                            ) : (
+                              <ErrorPageBody message={error.message} />
+                            )}
+                          </>
+                        );
+                      }
+                      return (
+                        <EuiPage style={{ flex: '1 0 auto' }}>
+                          <MetricsSideNav
+                            layouts={filteredLayouts}
+                            loading={metadataLoading}
+                            nodeName={name}
+                            handleClick={handleClick}
+                          />
+                          <AutoSizer content={false} bounds detectAnyWindowResize>
+                            {({ measureRef, bounds: { width = 0 } }) => {
+                              return (
+                                <MetricsDetailsPageColumn innerRef={measureRef}>
+                                  <EuiPageBody style={{ width: `${width}px` }}>
+                                    <EuiPageHeader style={{ flex: '0 0 auto' }}>
+                                      <EuiPageHeaderSection style={{ width: '100%' }}>
+                                        <MetricsTitleTimeRangeContainer>
+                                          <EuiHideFor sizes={['xs', 's']}>
+                                            <EuiTitle size="m">
+                                              <h1>{name}</h1>
+                                            </EuiTitle>
+                                          </EuiHideFor>
+                                          <MetricsTimeControls
+                                            currentTimeRange={timeRange}
+                                            isLiveStreaming={isAutoReloading}
+                                            refreshInterval={refreshInterval}
+                                            setRefreshInterval={setRefreshInterval}
+                                            onChangeTimeRange={setTimeRange}
+                                            setAutoReload={setAutoReload}
                                           />
-                                          {invalidNodeError ? (
-                                            <InvalidNodeError nodeName={name} />
-                                          ) : (
-                                            <ErrorPageBody message={error.message} />
-                                          )}
-                                        </>
-                                      );
-                                    }
-                                    return (
-                                      <EuiPage style={{ flex: '1 0 auto' }}>
-                                        <MetricsSideNav
-                                          layouts={filteredLayouts}
-                                          loading={metadataLoading}
-                                          nodeName={name}
-                                          handleClick={this.handleClick}
-                                        />
-                                        <AutoSizer content={false} bounds detectAnyWindowResize>
-                                          {({ measureRef, bounds: { width = 0 } }) => {
-                                            return (
-                                              <MetricsDetailsPageColumn innerRef={measureRef}>
-                                                <EuiPageBody style={{ width: `${width}px` }}>
-                                                  <EuiPageHeader style={{ flex: '0 0 auto' }}>
-                                                    <EuiPageHeaderSection style={{ width: '100%' }}>
-                                                      <MetricsTitleTimeRangeContainer>
-                                                        <EuiHideFor sizes={['xs', 's']}>
-                                                          <EuiTitle size="m">
-                                                            <h1>{name}</h1>
-                                                          </EuiTitle>
-                                                        </EuiHideFor>
-                                                        <MetricsTimeControls
-                                                          currentTimeRange={timeRange}
-                                                          isLiveStreaming={isAutoReloading}
-                                                          refreshInterval={refreshInterval}
-                                                          setRefreshInterval={setRefreshInterval}
-                                                          onChangeTimeRange={setTimeRange}
-                                                          setAutoReload={setAutoReload}
-                                                        />
-                                                      </MetricsTitleTimeRangeContainer>
-                                                    </EuiPageHeaderSection>
-                                                  </EuiPageHeader>
-
-                                                  <EuiPageContentWithRelative>
-                                                    <Metrics
-                                                      label={name}
-                                                      nodeId={nodeId}
-                                                      layouts={filteredLayouts}
-                                                      metrics={metrics}
-                                                      loading={
-                                                        metrics.length > 0 && isAutoReloading
-                                                          ? false
-                                                          : loading
-                                                      }
-                                                      refetch={refetch}
-                                                      onChangeRangeTime={setTimeRange}
-                                                      isLiveStreaming={isAutoReloading}
-                                                      stopLiveStreaming={() => setAutoReload(false)}
-                                                    />
-                                                  </EuiPageContentWithRelative>
-                                                </EuiPageBody>
-                                              </MetricsDetailsPageColumn>
-                                            );
-                                          }}
-                                        </AutoSizer>
-                                      </EuiPage>
-                                    );
-                                  }}
-                                </WithMetrics>
-                              </DetailPageContent>
-                            </ColumnarPage>
-                          );
-                        }}
-                      </WithMetadata>
-                    )}
-                  </WithMetricsTime>
-                )}
-              </WithSource>
-            </MetricDetailPageProviders>
-          );
-        }
+                                        </MetricsTitleTimeRangeContainer>
+                                      </EuiPageHeaderSection>
+                                    </EuiPageHeader>
 
-        private handleClick = (section: InfraMetricLayoutSection) => () => {
-          const id = section.linkToId || section.id;
-          const el = document.getElementById(id);
-          if (el) {
-            el.scrollIntoView();
-          }
-        };
-      }
+                                    <EuiPageContentWithRelative>
+                                      <Metrics
+                                        label={name}
+                                        nodeId={nodeId}
+                                        layouts={filteredLayouts}
+                                        metrics={metrics}
+                                        loading={
+                                          metrics.length > 0 && isAutoReloading ? false : loading
+                                        }
+                                        refetch={refetch}
+                                        onChangeRangeTime={setTimeRange}
+                                        isLiveStreaming={isAutoReloading}
+                                        stopLiveStreaming={() => setAutoReload(false)}
+                                      />
+                                    </EuiPageContentWithRelative>
+                                  </EuiPageBody>
+                                </MetricsDetailsPageColumn>
+                              );
+                            }}
+                          </AutoSizer>
+                        </EuiPage>
+                      );
+                    }}
+                  </WithMetrics>
+                </DetailPageContent>
+              </ColumnarPage>
+            )}
+          </WithMetricsTime>
+        );
+      })
     )
   )
 );
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/page_providers.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/page_providers.tsx
index 49f07837024fc..6d45f52d541b9 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/page_providers.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/page_providers.tsx
@@ -10,10 +10,14 @@ import { SourceConfigurationFlyoutState } from '../../components/source_configur
 import { MetricsTimeContainer } from '../../containers/metrics/with_metrics_time';
 import { Source } from '../../containers/source';
 
-export const MetricDetailPageProviders: React.FunctionComponent = ({ children }) => (
+export const withMetricPageProviders = <T extends object>(Component: React.ComponentType<T>) => (
+  props: T
+) => (
   <Source.Provider sourceId="default">
     <SourceConfigurationFlyoutState.Provider>
-      <MetricsTimeContainer.Provider>{children}</MetricsTimeContainer.Provider>
+      <MetricsTimeContainer.Provider>
+        <Component {...props} />
+      </MetricsTimeContainer.Provider>
     </SourceConfigurationFlyoutState.Provider>
   </Source.Provider>
 );
diff --git a/x-pack/legacy/plugins/infra/server/graphql/index.ts b/x-pack/legacy/plugins/infra/server/graphql/index.ts
index 552076c05e8e8..81400b74f0539 100644
--- a/x-pack/legacy/plugins/infra/server/graphql/index.ts
+++ b/x-pack/legacy/plugins/infra/server/graphql/index.ts
@@ -7,7 +7,6 @@
 import { rootSchema } from '../../common/graphql/root/schema.gql';
 import { sharedSchema } from '../../common/graphql/shared/schema.gql';
 import { logEntriesSchema } from './log_entries/schema.gql';
-import { metadataSchema } from './metadata/schema.gql';
 import { metricsSchema } from './metrics/schema.gql';
 import { snapshotSchema } from './snapshot/schema.gql';
 import { sourceStatusSchema } from './source_status/schema.gql';
@@ -16,7 +15,6 @@ import { sourcesSchema } from './sources/schema.gql';
 export const schemas = [
   rootSchema,
   sharedSchema,
-  metadataSchema,
   logEntriesSchema,
   snapshotSchema,
   sourcesSchema,
diff --git a/x-pack/legacy/plugins/infra/server/graphql/metadata/resolvers.ts b/x-pack/legacy/plugins/infra/server/graphql/metadata/resolvers.ts
deleted file mode 100644
index 8d1b386af548e..0000000000000
--- a/x-pack/legacy/plugins/infra/server/graphql/metadata/resolvers.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { InfraSourceResolvers } from '../../graphql/types';
-import { InfraMetadataDomain } from '../../lib/domains/metadata_domain';
-import { ChildResolverOf, InfraResolverOf } from '../../utils/typed_resolvers';
-import { QuerySourceResolver } from '../sources/resolvers';
-
-type InfraSourceMetadataByNodeResolver = ChildResolverOf<
-  InfraResolverOf<InfraSourceResolvers.MetadataByNodeResolver>,
-  QuerySourceResolver
->;
-
-export const createMetadataResolvers = (libs: {
-  metadata: InfraMetadataDomain;
-}): {
-  InfraSource: {
-    metadataByNode: InfraSourceMetadataByNodeResolver;
-  };
-} => ({
-  InfraSource: {
-    async metadataByNode(source, args, { req }) {
-      const result = await libs.metadata.getMetadata(req, source.id, args.nodeId, args.nodeType);
-      return result;
-    },
-  },
-});
diff --git a/x-pack/legacy/plugins/infra/server/graphql/metadata/schema.gql.ts b/x-pack/legacy/plugins/infra/server/graphql/metadata/schema.gql.ts
deleted file mode 100644
index 8944e309d463d..0000000000000
--- a/x-pack/legacy/plugins/infra/server/graphql/metadata/schema.gql.ts
+++ /dev/null
@@ -1,26 +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 gql from 'graphql-tag';
-
-export const metadataSchema = gql`
-  "One metadata entry for a node."
-  type InfraNodeMetadata {
-    id: ID!
-    name: String!
-    features: [InfraNodeFeature!]!
-  }
-
-  type InfraNodeFeature {
-    name: String!
-    source: String!
-  }
-
-  extend type InfraSource {
-    "A hierarchy of metadata entries by node"
-    metadataByNode(nodeId: String!, nodeType: InfraNodeType!): InfraNodeMetadata!
-  }
-`;
diff --git a/x-pack/legacy/plugins/infra/server/graphql/types.ts b/x-pack/legacy/plugins/infra/server/graphql/types.ts
index f4d6529290f33..e223ac7b334a2 100644
--- a/x-pack/legacy/plugins/infra/server/graphql/types.ts
+++ b/x-pack/legacy/plugins/infra/server/graphql/types.ts
@@ -1,7 +1,6 @@
 /* tslint:disable */
 import { InfraContext } from '../lib/infra_types';
 import { GraphQLResolveInfo } from 'graphql';
-import { FieldType } from 'ui/index_patterns';
 
 export type Resolver<Result, Parent = any, Context = any, Args = never> = (
   parent: Parent,
@@ -57,8 +56,6 @@ export interface InfraSource {
   configuration: InfraSourceConfiguration;
   /** The status of the source */
   status: InfraSourceStatus;
-  /** A hierarchy of metadata entries by node */
-  metadataByNode: InfraNodeMetadata;
   /** A consecutive span of log entries surrounding a point in time */
   logEntriesAround: InfraLogEntryInterval;
   /** A consecutive span of log entries within an interval */
@@ -151,21 +148,15 @@ export interface InfraSourceStatus {
   indexFields: InfraIndexField[];
 }
 /** A descriptor of a field in an index */
-export interface InfraIndexField extends FieldType {}
-
-/** One metadata entry for a node. */
-export interface InfraNodeMetadata {
-  id: string;
-
+export interface InfraIndexField {
+  /** The name of the field */
   name: string;
-
-  features: InfraNodeFeature[];
-}
-
-export interface InfraNodeFeature {
-  name: string;
-
-  source: string;
+  /** The type of the field's values as recognized by Kibana */
+  type: string;
+  /** Whether the field's values can be efficiently searched for */
+  searchable: boolean;
+  /** Whether the field's values can be aggregated */
+  aggregatable: boolean;
 }
 /** A consecutive sequence of log entries */
 export interface InfraLogEntryInterval {
@@ -445,11 +436,6 @@ export interface SourceQueryArgs {
   /** The id of the source */
   id: string;
 }
-export interface MetadataByNodeInfraSourceArgs {
-  nodeId: string;
-
-  nodeType: InfraNodeType;
-}
 export interface LogEntriesAroundInfraSourceArgs {
   /** The sort key that corresponds to the point in time */
   key: InfraTimeKeyInput;
@@ -656,8 +642,6 @@ export namespace InfraSourceResolvers {
     configuration?: ConfigurationResolver<InfraSourceConfiguration, TypeParent, Context>;
     /** The status of the source */
     status?: StatusResolver<InfraSourceStatus, TypeParent, Context>;
-    /** A hierarchy of metadata entries by node */
-    metadataByNode?: MetadataByNodeResolver<InfraNodeMetadata, TypeParent, Context>;
     /** A consecutive span of log entries surrounding a point in time */
     logEntriesAround?: LogEntriesAroundResolver<InfraLogEntryInterval, TypeParent, Context>;
     /** A consecutive span of log entries within an interval */
@@ -704,17 +688,6 @@ export namespace InfraSourceResolvers {
     Parent = InfraSource,
     Context = InfraContext
   > = Resolver<R, Parent, Context>;
-  export type MetadataByNodeResolver<
-    R = InfraNodeMetadata,
-    Parent = InfraSource,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context, MetadataByNodeArgs>;
-  export interface MetadataByNodeArgs {
-    nodeId: string;
-
-    nodeType: InfraNodeType;
-  }
-
   export type LogEntriesAroundResolver<
     R = InfraLogEntryInterval,
     Parent = InfraSource,
@@ -1099,51 +1072,6 @@ export namespace InfraIndexFieldResolvers {
     Context = InfraContext
   > = Resolver<R, Parent, Context>;
 }
-/** One metadata entry for a node. */
-export namespace InfraNodeMetadataResolvers {
-  export interface Resolvers<Context = InfraContext, TypeParent = InfraNodeMetadata> {
-    id?: IdResolver<string, TypeParent, Context>;
-
-    name?: NameResolver<string, TypeParent, Context>;
-
-    features?: FeaturesResolver<InfraNodeFeature[], TypeParent, Context>;
-  }
-
-  export type IdResolver<R = string, Parent = InfraNodeMetadata, Context = InfraContext> = Resolver<
-    R,
-    Parent,
-    Context
-  >;
-  export type NameResolver<
-    R = string,
-    Parent = InfraNodeMetadata,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type FeaturesResolver<
-    R = InfraNodeFeature[],
-    Parent = InfraNodeMetadata,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-}
-
-export namespace InfraNodeFeatureResolvers {
-  export interface Resolvers<Context = InfraContext, TypeParent = InfraNodeFeature> {
-    name?: NameResolver<string, TypeParent, Context>;
-
-    source?: SourceResolver<string, TypeParent, Context>;
-  }
-
-  export type NameResolver<
-    R = string,
-    Parent = InfraNodeFeature,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type SourceResolver<
-    R = string,
-    Parent = InfraNodeFeature,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-}
 /** A consecutive sequence of log entries */
 export namespace InfraLogEntryIntervalResolvers {
   export interface Resolvers<Context = InfraContext, TypeParent = InfraLogEntryInterval> {
diff --git a/x-pack/legacy/plugins/infra/server/infra_server.ts b/x-pack/legacy/plugins/infra/server/infra_server.ts
index 25303a1a29de2..02a1d14152a2a 100644
--- a/x-pack/legacy/plugins/infra/server/infra_server.ts
+++ b/x-pack/legacy/plugins/infra/server/infra_server.ts
@@ -8,7 +8,6 @@ import { IResolvers, makeExecutableSchema } from 'graphql-tools';
 import { initIpToHostName } from './routes/ip_to_hostname';
 import { schemas } from './graphql';
 import { createLogEntriesResolvers } from './graphql/log_entries';
-import { createMetadataResolvers } from './graphql/metadata';
 import { createMetricResolvers } from './graphql/metrics/resolvers';
 import { createSnapshotResolvers } from './graphql/snapshot';
 import { createSourceStatusResolvers } from './graphql/source_status';
@@ -16,11 +15,11 @@ import { createSourcesResolvers } from './graphql/sources';
 import { InfraBackendLibs } from './lib/infra_types';
 import { initLegacyLoggingRoutes } from './logging_legacy';
 import { initMetricExplorerRoute } from './routes/metrics_explorer';
+import { initMetadataRoute } from './routes/metadata';
 
 export const initInfraServer = (libs: InfraBackendLibs) => {
   const schema = makeExecutableSchema({
     resolvers: [
-      createMetadataResolvers(libs) as IResolvers,
       createLogEntriesResolvers(libs) as IResolvers,
       createSnapshotResolvers(libs) as IResolvers,
       createSourcesResolvers(libs) as IResolvers,
@@ -35,4 +34,5 @@ export const initInfraServer = (libs: InfraBackendLibs) => {
   initLegacyLoggingRoutes(libs.framework);
   initIpToHostName(libs);
   initMetricExplorerRoute(libs);
+  initMetadataRoute(libs);
 };
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metadata/adapter_types.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/metadata/adapter_types.ts
deleted file mode 100644
index 3e44120a6c5c4..0000000000000
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/metadata/adapter_types.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { InfraSourceConfiguration } from '../../sources';
-import { InfraFrameworkRequest, InfraMetadataAggregationBucket } from '../framework';
-
-export interface InfraMetricsAdapterResponse {
-  id: string;
-  name?: string;
-  buckets: InfraMetadataAggregationBucket[];
-}
-
-export interface InfraMetadataAdapter {
-  getMetricMetadata(
-    req: InfraFrameworkRequest,
-    sourceConfiguration: InfraSourceConfiguration,
-    nodeId: string,
-    nodeType: string
-  ): Promise<InfraMetricsAdapterResponse>;
-}
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metadata/elasticsearch_metadata_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/metadata/elasticsearch_metadata_adapter.ts
deleted file mode 100644
index d23b9b9bb142e..0000000000000
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/metadata/elasticsearch_metadata_adapter.ts
+++ /dev/null
@@ -1,87 +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 { get } from 'lodash';
-import { InfraSourceConfiguration } from '../../sources';
-import {
-  InfraBackendFrameworkAdapter,
-  InfraFrameworkRequest,
-  InfraMetadataAggregationResponse,
-} from '../framework';
-import { InfraMetadataAdapter, InfraMetricsAdapterResponse } from './adapter_types';
-import { NAME_FIELDS } from '../../constants';
-
-export class ElasticsearchMetadataAdapter implements InfraMetadataAdapter {
-  private framework: InfraBackendFrameworkAdapter;
-  constructor(framework: InfraBackendFrameworkAdapter) {
-    this.framework = framework;
-  }
-
-  public async getMetricMetadata(
-    req: InfraFrameworkRequest,
-    sourceConfiguration: InfraSourceConfiguration,
-    nodeId: string,
-    nodeType: 'host' | 'container' | 'pod'
-  ): Promise<InfraMetricsAdapterResponse> {
-    const idFieldName = getIdFieldName(sourceConfiguration, nodeType);
-    const metricQuery = {
-      allowNoIndices: true,
-      ignoreUnavailable: true,
-      index: sourceConfiguration.metricAlias,
-      body: {
-        query: {
-          bool: {
-            filter: {
-              term: { [idFieldName]: nodeId },
-            },
-          },
-        },
-        size: 0,
-        aggs: {
-          nodeName: {
-            terms: {
-              field: NAME_FIELDS[nodeType],
-              size: 1,
-            },
-          },
-          metrics: {
-            terms: {
-              field: 'event.dataset',
-              size: 1000,
-            },
-          },
-        },
-      },
-    };
-
-    const response = await this.framework.callWithRequest<
-      any,
-      { metrics?: InfraMetadataAggregationResponse; nodeName?: InfraMetadataAggregationResponse }
-    >(req, 'search', metricQuery);
-
-    const buckets =
-      response.aggregations && response.aggregations.metrics
-        ? response.aggregations.metrics.buckets
-        : [];
-
-    return {
-      id: nodeId,
-      name: get(response, ['aggregations', 'nodeName', 'buckets', 0, 'key'], nodeId),
-      buckets,
-    };
-  }
-}
-
-const getIdFieldName = (sourceConfiguration: InfraSourceConfiguration, nodeType: string) => {
-  switch (nodeType) {
-    case 'host':
-      return sourceConfiguration.fields.host;
-    case 'container':
-      return sourceConfiguration.fields.container;
-    default:
-      return sourceConfiguration.fields.pod;
-  }
-};
diff --git a/x-pack/legacy/plugins/infra/server/lib/compose/kibana.ts b/x-pack/legacy/plugins/infra/server/lib/compose/kibana.ts
index f1691c9f3c7dd..91f049a08ec96 100644
--- a/x-pack/legacy/plugins/infra/server/lib/compose/kibana.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/compose/kibana.ts
@@ -10,12 +10,10 @@ import { InfraKibanaConfigurationAdapter } from '../adapters/configuration/kiban
 import { FrameworkFieldsAdapter } from '../adapters/fields/framework_fields_adapter';
 import { InfraKibanaBackendFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter';
 import { InfraKibanaLogEntriesAdapter } from '../adapters/log_entries/kibana_log_entries_adapter';
-import { ElasticsearchMetadataAdapter } from '../adapters/metadata/elasticsearch_metadata_adapter';
 import { KibanaMetricsAdapter } from '../adapters/metrics/kibana_metrics_adapter';
 import { InfraElasticsearchSourceStatusAdapter } from '../adapters/source_status';
 import { InfraFieldsDomain } from '../domains/fields_domain';
 import { InfraLogEntriesDomain } from '../domains/log_entries_domain';
-import { InfraMetadataDomain } from '../domains/metadata_domain';
 import { InfraMetricsDomain } from '../domains/metrics_domain';
 import { InfraBackendLibs, InfraDomainLibs } from '../infra_types';
 import { InfraSnapshot } from '../snapshot';
@@ -35,9 +33,6 @@ export function compose(server: Server): InfraBackendLibs {
   const snapshot = new InfraSnapshot({ sources, framework });
 
   const domainLibs: InfraDomainLibs = {
-    metadata: new InfraMetadataDomain(new ElasticsearchMetadataAdapter(framework), {
-      sources,
-    }),
     fields: new InfraFieldsDomain(new FrameworkFieldsAdapter(framework), {
       sources,
     }),
diff --git a/x-pack/legacy/plugins/infra/server/lib/constants.ts b/x-pack/legacy/plugins/infra/server/lib/constants.ts
index c964e691058cd..4f2fa561da0c5 100644
--- a/x-pack/legacy/plugins/infra/server/lib/constants.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/constants.ts
@@ -20,3 +20,5 @@ export const IP_FIELDS = {
   [InfraNodeType.pod]: 'kubernetes.pod.ip',
   [InfraNodeType.container]: 'container.ip_address',
 };
+
+export const CLOUD_METRICS_MODULES = ['aws'];
diff --git a/x-pack/legacy/plugins/infra/server/lib/domains/metadata_domain/metadata_domain.ts b/x-pack/legacy/plugins/infra/server/lib/domains/metadata_domain/metadata_domain.ts
deleted file mode 100644
index 5fb86df5a633a..0000000000000
--- a/x-pack/legacy/plugins/infra/server/lib/domains/metadata_domain/metadata_domain.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { InfraFrameworkRequest, InfraMetadataAggregationBucket } from '../../adapters/framework';
-import { InfraMetadataAdapter } from '../../adapters/metadata';
-import { InfraSources } from '../../sources';
-
-export class InfraMetadataDomain {
-  constructor(
-    private readonly adapter: InfraMetadataAdapter,
-    private readonly libs: { sources: InfraSources }
-  ) {}
-
-  public async getMetadata(
-    req: InfraFrameworkRequest,
-    sourceId: string,
-    nodeId: string,
-    nodeType: string
-  ) {
-    const { configuration } = await this.libs.sources.getSourceConfiguration(req, sourceId);
-    const metricsPromise = this.adapter.getMetricMetadata(req, configuration, nodeId, nodeType);
-
-    const metrics = await metricsPromise;
-
-    const metricMetadata = pickMetadata(metrics.buckets).map(entry => {
-      return { name: entry, source: 'metrics' };
-    });
-
-    const id = metrics.id;
-    const name = metrics.name || id;
-    return { id, name, features: metricMetadata };
-  }
-}
-
-const pickMetadata = (buckets: InfraMetadataAggregationBucket[]): string[] => {
-  if (buckets) {
-    const metadata = buckets.map(bucket => bucket.key);
-    return metadata;
-  } else {
-    return [];
-  }
-};
diff --git a/x-pack/legacy/plugins/infra/server/lib/infra_types.ts b/x-pack/legacy/plugins/infra/server/lib/infra_types.ts
index c63a82c137e13..394d893ede4f4 100644
--- a/x-pack/legacy/plugins/infra/server/lib/infra_types.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/infra_types.ts
@@ -9,14 +9,12 @@ import { InfraConfigurationAdapter } from './adapters/configuration';
 import { InfraBackendFrameworkAdapter, InfraFrameworkRequest } from './adapters/framework';
 import { InfraFieldsDomain } from './domains/fields_domain';
 import { InfraLogEntriesDomain } from './domains/log_entries_domain';
-import { InfraMetadataDomain } from './domains/metadata_domain';
 import { InfraMetricsDomain } from './domains/metrics_domain';
 import { InfraSnapshot } from './snapshot';
 import { InfraSourceStatus } from './source_status';
 import { InfraSources } from './sources';
 
 export interface InfraDomainLibs {
-  metadata: InfraMetadataDomain;
   fields: InfraFieldsDomain;
   logEntries: InfraLogEntriesDomain;
   metrics: InfraMetricsDomain;
diff --git a/x-pack/legacy/plugins/infra/server/routes/metadata/index.ts b/x-pack/legacy/plugins/infra/server/routes/metadata/index.ts
new file mode 100644
index 0000000000000..34b3448b86074
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metadata/index.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Boom, { boomify } from 'boom';
+import { get } from 'lodash';
+import {
+  InfraMetadata,
+  InfraMetadataWrappedRequest,
+  InfraMetadataFeature,
+  InfraMetadataRequestRT,
+  InfraMetadataRT,
+} from '../../../common/http_api/metadata_api';
+import { InfraBackendLibs } from '../../lib/infra_types';
+import { getMetricMetadata } from './lib/get_metric_metadata';
+import { pickFeatureName } from './lib/pick_feature_name';
+import { getCloudMetricsMetadata } from './lib/get_cloud_metric_metadata';
+import { getNodeInfo } from './lib/get_node_info';
+import { throwErrors } from '../../../common/runtime_types';
+
+export const initMetadataRoute = (libs: InfraBackendLibs) => {
+  const { framework } = libs;
+
+  framework.registerRoute<InfraMetadataWrappedRequest, Promise<InfraMetadata>>({
+    method: 'POST',
+    path: '/api/infra/metadata',
+    handler: async req => {
+      try {
+        const { nodeId, nodeType, sourceId } = InfraMetadataRequestRT.decode(
+          req.payload
+        ).getOrElseL(throwErrors(Boom.badRequest));
+
+        const { configuration } = await libs.sources.getSourceConfiguration(req, sourceId);
+        const metricsMetadata = await getMetricMetadata(
+          framework,
+          req,
+          configuration,
+          nodeId,
+          nodeType
+        );
+        const metricFeatures = pickFeatureName(metricsMetadata.buckets).map(
+          nameToFeature('metrics')
+        );
+
+        const info = await getNodeInfo(framework, req, configuration, nodeId, nodeType);
+        const cloudInstanceId = get<string>(info, 'cloud.instance.id');
+
+        const cloudMetricsMetadata = cloudInstanceId
+          ? await getCloudMetricsMetadata(framework, req, configuration, cloudInstanceId)
+          : { buckets: [] };
+        const cloudMetricsFeatures = pickFeatureName(cloudMetricsMetadata.buckets).map(
+          nameToFeature('metrics')
+        );
+
+        const id = metricsMetadata.id;
+        const name = metricsMetadata.name || id;
+        return InfraMetadataRT.decode({
+          id,
+          name,
+          features: [...metricFeatures, ...cloudMetricsFeatures],
+          info,
+        }).getOrElseL(throwErrors(Boom.badImplementation));
+      } catch (error) {
+        throw boomify(error);
+      }
+    },
+  });
+};
+
+const nameToFeature = (source: string) => (name: string): InfraMetadataFeature => ({
+  name,
+  source,
+});
diff --git a/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_cloud_metric_metadata.ts b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_cloud_metric_metadata.ts
new file mode 100644
index 0000000000000..58b3beab42886
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_cloud_metric_metadata.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  InfraBackendFrameworkAdapter,
+  InfraFrameworkRequest,
+  InfraMetadataAggregationBucket,
+  InfraMetadataAggregationResponse,
+} from '../../../lib/adapters/framework';
+import { InfraSourceConfiguration } from '../../../lib/sources';
+import { CLOUD_METRICS_MODULES } from '../../../lib/constants';
+
+export interface InfraCloudMetricsAdapterResponse {
+  buckets: InfraMetadataAggregationBucket[];
+}
+
+export const getCloudMetricsMetadata = async (
+  framework: InfraBackendFrameworkAdapter,
+  req: InfraFrameworkRequest,
+  sourceConfiguration: InfraSourceConfiguration,
+  instanceId: string
+): Promise<InfraCloudMetricsAdapterResponse> => {
+  const metricQuery = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
+    index: sourceConfiguration.metricAlias,
+    body: {
+      query: {
+        bool: {
+          filter: [{ match: { 'cloud.instance.id': instanceId } }],
+          should: CLOUD_METRICS_MODULES.map(module => ({ match: { 'event.module': module } })),
+        },
+      },
+      size: 0,
+      aggs: {
+        metrics: {
+          terms: {
+            field: 'event.dataset',
+            size: 1000,
+          },
+        },
+      },
+    },
+  };
+
+  const response = await framework.callWithRequest<
+    {},
+    {
+      metrics?: InfraMetadataAggregationResponse;
+    }
+  >(req, 'search', metricQuery);
+
+  const buckets =
+    response.aggregations && response.aggregations.metrics
+      ? response.aggregations.metrics.buckets
+      : [];
+
+  return { buckets };
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_id_field_name.ts b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_id_field_name.ts
new file mode 100644
index 0000000000000..5f6bdd30fa2b8
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_id_field_name.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { InfraSourceConfiguration } from '../../../lib/sources';
+
+export const getIdFieldName = (sourceConfiguration: InfraSourceConfiguration, nodeType: string) => {
+  switch (nodeType) {
+    case 'host':
+      return sourceConfiguration.fields.host;
+    case 'container':
+      return sourceConfiguration.fields.container;
+    default:
+      return sourceConfiguration.fields.pod;
+  }
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_metric_metadata.ts b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_metric_metadata.ts
new file mode 100644
index 0000000000000..812bc27fffc8a
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_metric_metadata.ts
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { get } from 'lodash';
+import {
+  InfraFrameworkRequest,
+  InfraMetadataAggregationBucket,
+  InfraBackendFrameworkAdapter,
+  InfraMetadataAggregationResponse,
+} from '../../../lib/adapters/framework';
+import { InfraSourceConfiguration } from '../../../lib/sources';
+import { getIdFieldName } from './get_id_field_name';
+import { NAME_FIELDS } from '../../../lib/constants';
+
+export interface InfraMetricsAdapterResponse {
+  id: string;
+  name?: string;
+  buckets: InfraMetadataAggregationBucket[];
+}
+
+export const getMetricMetadata = async (
+  framework: InfraBackendFrameworkAdapter,
+  req: InfraFrameworkRequest,
+  sourceConfiguration: InfraSourceConfiguration,
+  nodeId: string,
+  nodeType: 'host' | 'pod' | 'container'
+): Promise<InfraMetricsAdapterResponse> => {
+  const idFieldName = getIdFieldName(sourceConfiguration, nodeType);
+
+  const metricQuery = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
+    index: sourceConfiguration.metricAlias,
+    body: {
+      query: {
+        bool: {
+          must_not: [{ match: { 'event.dataset': 'aws.ec2' } }],
+          filter: [
+            {
+              match: { [idFieldName]: nodeId },
+            },
+          ],
+        },
+      },
+      size: 0,
+      aggs: {
+        nodeName: {
+          terms: {
+            field: NAME_FIELDS[nodeType],
+            size: 1,
+          },
+        },
+        metrics: {
+          terms: {
+            field: 'event.dataset',
+            size: 1000,
+          },
+        },
+      },
+    },
+  };
+
+  const response = await framework.callWithRequest<
+    {},
+    {
+      metrics?: InfraMetadataAggregationResponse;
+      nodeName?: InfraMetadataAggregationResponse;
+    }
+  >(req, 'search', metricQuery);
+
+  const buckets =
+    response.aggregations && response.aggregations.metrics
+      ? response.aggregations.metrics.buckets
+      : [];
+
+  return {
+    id: nodeId,
+    name: get(response, ['aggregations', 'nodeName', 'buckets', 0, 'key'], nodeId),
+    buckets,
+  };
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_node_info.ts b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_node_info.ts
new file mode 100644
index 0000000000000..5af25515a42ed
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_node_info.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { first } from 'lodash';
+import {
+  InfraFrameworkRequest,
+  InfraBackendFrameworkAdapter,
+} from '../../../lib/adapters/framework';
+import { InfraSourceConfiguration } from '../../../lib/sources';
+import { InfraNodeType } from '../../../graphql/types';
+import { InfraMetadataInfo } from '../../../../common/http_api/metadata_api';
+import { getPodNodeName } from './get_pod_node_name';
+import { CLOUD_METRICS_MODULES } from '../../../lib/constants';
+import { getIdFieldName } from './get_id_field_name';
+
+export const getNodeInfo = async (
+  framework: InfraBackendFrameworkAdapter,
+  req: InfraFrameworkRequest,
+  sourceConfiguration: InfraSourceConfiguration,
+  nodeId: string,
+  nodeType: 'host' | 'pod' | 'container'
+): Promise<InfraMetadataInfo> => {
+  // If the nodeType is a Kubernetes pod then we need to get the node info
+  // from a host record instead of a pod. This is due to the fact that any host
+  // can report pod details and we can't rely on the host/cloud information associated
+  // with the kubernetes.pod.uid. We need to first lookup the `kubernetes.node.name`
+  // then use that to lookup the host's node information.
+  if (nodeType === InfraNodeType.pod) {
+    const kubernetesNodeName = await getPodNodeName(
+      framework,
+      req,
+      sourceConfiguration,
+      nodeId,
+      nodeType
+    );
+    if (kubernetesNodeName) {
+      return getNodeInfo(
+        framework,
+        req,
+        sourceConfiguration,
+        kubernetesNodeName,
+        InfraNodeType.host
+      );
+    }
+    return {};
+  }
+  const params = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
+    terminateAfter: 1,
+    index: sourceConfiguration.metricAlias,
+    body: {
+      size: 1,
+      _source: ['host.*', 'cloud.*'],
+      query: {
+        bool: {
+          must_not: CLOUD_METRICS_MODULES.map(module => ({ match: { 'event.module': module } })),
+          filter: [{ match: { [getIdFieldName(sourceConfiguration, nodeType)]: nodeId } }],
+        },
+      },
+    },
+  };
+  const response = await framework.callWithRequest<{ _source: InfraMetadataInfo }, {}>(
+    req,
+    'search',
+    params
+  );
+  const firstHit = first(response.hits.hits);
+  if (firstHit) {
+    return firstHit._source;
+  }
+  return {};
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_pod_node_name.ts b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_pod_node_name.ts
new file mode 100644
index 0000000000000..893707a4660ee
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_pod_node_name.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 { first, get } from 'lodash';
+import {
+  InfraFrameworkRequest,
+  InfraBackendFrameworkAdapter,
+} from '../../../lib/adapters/framework';
+import { InfraSourceConfiguration } from '../../../lib/sources';
+import { getIdFieldName } from './get_id_field_name';
+
+export const getPodNodeName = async (
+  framework: InfraBackendFrameworkAdapter,
+  req: InfraFrameworkRequest,
+  sourceConfiguration: InfraSourceConfiguration,
+  nodeId: string,
+  nodeType: 'host' | 'pod' | 'container'
+): Promise<string | undefined> => {
+  const params = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
+    terminateAfter: 1,
+    index: sourceConfiguration.metricAlias,
+    body: {
+      size: 1,
+      _source: ['kubernetes.node.name'],
+      query: {
+        bool: {
+          filter: [
+            { match: { [getIdFieldName(sourceConfiguration, nodeType)]: nodeId } },
+            { exists: { field: `kubernetes.node.name` } },
+          ],
+        },
+      },
+    },
+  };
+  const response = await framework.callWithRequest<
+    { _source: { kubernetes: { node: { name: string } } } },
+    {}
+  >(req, 'search', params);
+  const firstHit = first(response.hits.hits);
+  if (firstHit) {
+    return get(firstHit, '_source.kubernetes.node.name');
+  }
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metadata/lib/pick_feature_name.ts b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/pick_feature_name.ts
new file mode 100644
index 0000000000000..8b6bb49d9f645
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/pick_feature_name.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { InfraMetadataAggregationBucket } from '../../../lib/adapters/framework';
+
+export const pickFeatureName = (buckets: InfraMetadataAggregationBucket[]): string[] => {
+  if (buckets) {
+    const metadata = buckets.map(bucket => bucket.key);
+    return metadata;
+  } else {
+    return [];
+  }
+};
diff --git a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
index 9045f3b44a7f1..e82685d62a316 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
+++ b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
@@ -860,6 +860,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                       >
                         <EuiFilePicker
                           compressed={false}
+                          display="large"
                           id="licenseFile"
                           initialPromptText={
                             <FormattedMessage
@@ -885,20 +886,22 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                             }
                           >
                             <div
-                              className="euiFilePicker"
+                              className="euiFilePicker euiFilePicker--large"
                             >
                               <div
                                 className="euiFilePicker__wrap"
                               >
-                                <input
-                                  className="euiFilePicker__input"
-                                  id="licenseFile"
-                                  onChange={[Function]}
-                                  onDragLeave={[Function]}
-                                  onDragOver={[Function]}
-                                  onDrop={[Function]}
-                                  type="file"
-                                />
+                                <EuiValidatableControl>
+                                  <input
+                                    className="euiFilePicker__input"
+                                    id="licenseFile"
+                                    onChange={[Function]}
+                                    onDragLeave={[Function]}
+                                    onDragOver={[Function]}
+                                    onDrop={[Function]}
+                                    type="file"
+                                  />
+                                </EuiValidatableControl>
                                 <div
                                   className="euiFilePicker__prompt"
                                 >
@@ -1314,6 +1317,7 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                       >
                         <EuiFilePicker
                           compressed={false}
+                          display="large"
                           id="licenseFile"
                           initialPromptText={
                             <FormattedMessage
@@ -1339,20 +1343,22 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                             }
                           >
                             <div
-                              className="euiFilePicker"
+                              className="euiFilePicker euiFilePicker--large"
                             >
                               <div
                                 className="euiFilePicker__wrap"
                               >
-                                <input
-                                  className="euiFilePicker__input"
-                                  id="licenseFile"
-                                  onChange={[Function]}
-                                  onDragLeave={[Function]}
-                                  onDragOver={[Function]}
-                                  onDrop={[Function]}
-                                  type="file"
-                                />
+                                <EuiValidatableControl>
+                                  <input
+                                    className="euiFilePicker__input"
+                                    id="licenseFile"
+                                    onChange={[Function]}
+                                    onDragLeave={[Function]}
+                                    onDragOver={[Function]}
+                                    onDrop={[Function]}
+                                    type="file"
+                                  />
+                                </EuiValidatableControl>
                                 <div
                                   className="euiFilePicker__prompt"
                                 >
@@ -1772,6 +1778,7 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                       >
                         <EuiFilePicker
                           compressed={false}
+                          display="large"
                           id="licenseFile"
                           initialPromptText={
                             <FormattedMessage
@@ -1797,20 +1804,22 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                             }
                           >
                             <div
-                              className="euiFilePicker"
+                              className="euiFilePicker euiFilePicker--large"
                             >
                               <div
                                 className="euiFilePicker__wrap"
                               >
-                                <input
-                                  className="euiFilePicker__input"
-                                  id="licenseFile"
-                                  onChange={[Function]}
-                                  onDragLeave={[Function]}
-                                  onDragOver={[Function]}
-                                  onDrop={[Function]}
-                                  type="file"
-                                />
+                                <EuiValidatableControl>
+                                  <input
+                                    className="euiFilePicker__input"
+                                    id="licenseFile"
+                                    onChange={[Function]}
+                                    onDragLeave={[Function]}
+                                    onDragOver={[Function]}
+                                    onDrop={[Function]}
+                                    type="file"
+                                  />
+                                </EuiValidatableControl>
                                 <div
                                   className="euiFilePicker__prompt"
                                 >
@@ -2230,6 +2239,7 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                       >
                         <EuiFilePicker
                           compressed={false}
+                          display="large"
                           id="licenseFile"
                           initialPromptText={
                             <FormattedMessage
@@ -2255,20 +2265,22 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                             }
                           >
                             <div
-                              className="euiFilePicker"
+                              className="euiFilePicker euiFilePicker--large"
                             >
                               <div
                                 className="euiFilePicker__wrap"
                               >
-                                <input
-                                  className="euiFilePicker__input"
-                                  id="licenseFile"
-                                  onChange={[Function]}
-                                  onDragLeave={[Function]}
-                                  onDragOver={[Function]}
-                                  onDrop={[Function]}
-                                  type="file"
-                                />
+                                <EuiValidatableControl>
+                                  <input
+                                    className="euiFilePicker__input"
+                                    id="licenseFile"
+                                    onChange={[Function]}
+                                    onDragLeave={[Function]}
+                                    onDragOver={[Function]}
+                                    onDrop={[Function]}
+                                    type="file"
+                                  />
+                                </EuiValidatableControl>
                                 <div
                                   className="euiFilePicker__prompt"
                                 >
@@ -2684,6 +2696,7 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                       >
                         <EuiFilePicker
                           compressed={false}
+                          display="large"
                           id="licenseFile"
                           initialPromptText={
                             <FormattedMessage
@@ -2709,20 +2722,22 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                             }
                           >
                             <div
-                              className="euiFilePicker"
+                              className="euiFilePicker euiFilePicker--large"
                             >
                               <div
                                 className="euiFilePicker__wrap"
                               >
-                                <input
-                                  className="euiFilePicker__input"
-                                  id="licenseFile"
-                                  onChange={[Function]}
-                                  onDragLeave={[Function]}
-                                  onDragOver={[Function]}
-                                  onDrop={[Function]}
-                                  type="file"
-                                />
+                                <EuiValidatableControl>
+                                  <input
+                                    className="euiFilePicker__input"
+                                    id="licenseFile"
+                                    onChange={[Function]}
+                                    onDragLeave={[Function]}
+                                    onDragOver={[Function]}
+                                    onDrop={[Function]}
+                                    type="file"
+                                  />
+                                </EuiValidatableControl>
                                 <div
                                   className="euiFilePicker__prompt"
                                 >
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/view.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/view.js
index a935f7b8c5158..439c2e18f097c 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/view.js
@@ -47,19 +47,21 @@ export class AddLayerPanel extends Component {
     return panelDescription;
   }
 
-  _viewLayer = async source => {
+  _viewLayer = async (source, options = {}) => {
     if (!source) {
       this.setState({ layer: null });
       this.props.removeTransientLayer();
       return;
     }
-
-    const layerOptions = this.state.layer
-      ? { style: this.state.layer.getCurrentStyle().getDescriptor() }
-      : {};
-    const newLayer = source.createDefaultLayer(layerOptions, this.props.mapColors);
-    this.setState({ layer: newLayer }, () =>
-      this.props.viewLayer(this.state.layer));
+    const layerInitProps = {
+      ...options,
+      ...(this.state.layer && { style: this.state.layer.getCurrentStyle().getDescriptor() })
+    };
+    const newLayer = source.createDefaultLayer(layerInitProps, this.props.mapColors);
+    this.setState(
+      { layer: newLayer },
+      () => this.props.viewLayer(this.state.layer)
+    );
   };
 
   _clearLayerData = ({ keepSourceType = false }) => {
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
index ad74b57389355..44e380b4f834c 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
@@ -92,6 +92,7 @@ export class FilterEditor extends Component {
       >
         <div className="mapFilterEditor" data-test-subj="mapFilterEditor">
           <QueryBar
+            uiSettings={settings}
             query={layerQuery ? layerQuery : { language: settings.get('search:queryLanguage'), query: '' }}
             onSubmit={this._onQueryChange}
             appName="maps"
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/where_expression.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/where_expression.js
index deafb561f1182..4795b29eb4f0d 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/where_expression.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/where_expression.js
@@ -79,6 +79,7 @@ export class WhereExpression extends Component {
             />
           </EuiFormHelpText>
           <QueryBar
+            uiSettings={settings}
             query={whereQuery ? whereQuery : { language: settings.get('search:queryLanguage'), query: '' }}
             onSubmit={this._onQueryChange}
             appName="maps"
diff --git a/x-pack/legacy/plugins/maps/public/inspector/views/map_view.js b/x-pack/legacy/plugins/maps/public/inspector/views/map_view.js
index e1bdcbdf191b7..5be15e1edccb7 100644
--- a/x-pack/legacy/plugins/maps/public/inspector/views/map_view.js
+++ b/x-pack/legacy/plugins/maps/public/inspector/views/map_view.js
@@ -6,8 +6,6 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-
-import { InspectorView } from 'ui/inspector';
 import { MapDetails } from './map_details';
 import { i18n } from '@kbn/i18n';
 
@@ -38,14 +36,12 @@ class MapViewComponent extends Component {
 
   render() {
     return (
-      <InspectorView>
-        <MapDetails
-          centerLon={this.state.stats.center[0]}
-          centerLat={this.state.stats.center[1]}
-          zoom={this.state.stats.zoom}
-          mapStyle={this.state.mapStyle}
-        />
-      </InspectorView>
+      <MapDetails
+        centerLon={this.state.stats.center[0]}
+        centerLat={this.state.stats.center[1]}
+        zoom={this.state.stats.zoom}
+        mapStyle={this.state.mapStyle}
+      />
     );
   }
 }
diff --git a/x-pack/legacy/plugins/infra/server/lib/domains/metadata_domain/index.ts b/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/constants.js
similarity index 83%
rename from x-pack/legacy/plugins/infra/server/lib/domains/metadata_domain/index.ts
rename to x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/constants.js
index 8095e8424873a..779ac2861e9f4 100644
--- a/x-pack/legacy/plugins/infra/server/lib/domains/metadata_domain/index.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/constants.js
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './metadata_domain';
+export const DEFAULT_APPLY_GLOBAL_QUERY = false;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
index a95d587042254..ed6c06f58b6ad 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
@@ -6,11 +6,18 @@
 
 import { AbstractVectorSource } from '../vector_source';
 import React from 'react';
-import { ES_GEO_FIELD_TYPE, GEOJSON_FILE } from '../../../../common/constants';
+import {
+  ES_GEO_FIELD_TYPE,
+  GEOJSON_FILE,
+  ES_SIZE_LIMIT
+} from '../../../../common/constants';
 import { ClientFileCreateSourceEditor } from './create_client_file_source_editor';
 import { ESSearchSource } from '../es_search_source';
 import uuid from 'uuid/v4';
 import _ from 'lodash';
+import {
+  DEFAULT_APPLY_GLOBAL_QUERY
+} from './constants';
 
 export class GeojsonFileSource extends AbstractVectorSource {
 
@@ -20,6 +27,9 @@ export class GeojsonFileSource extends AbstractVectorSource {
   static icon = 'importAction';
   static isIndexingSource = true;
   static isBeta = true;
+  static layerDefaults = {
+    applyGlobalQuery: DEFAULT_APPLY_GLOBAL_QUERY
+  }
 
   static createDescriptor(geoJson, name) {
     // Wrap feature as feature collection if needed
@@ -56,12 +66,15 @@ export class GeojsonFileSource extends AbstractVectorSource {
       if (!indexPatternId || !geoField) {
         addAndViewSource(null);
       } else {
+        // Only turn on bounds filter for large doc counts
+        const filterByMapBounds = indexDataResp.docCount > ES_SIZE_LIMIT;
         const source = new ESSearchSource({
           id: uuid(),
           indexPatternId,
           geoField,
+          filterByMapBounds
         }, inspectorAdapters);
-        addAndViewSource(source);
+        addAndViewSource(source, this.layerDefaults);
         importSuccessHandler(indexResponses);
       }
     };
diff --git a/x-pack/legacy/plugins/maps/public/reducers/map.js b/x-pack/legacy/plugins/maps/public/reducers/map.js
index 3f30e5cbe27d5..fca277515affd 100644
--- a/x-pack/legacy/plugins/maps/public/reducers/map.js
+++ b/x-pack/legacy/plugins/maps/public/reducers/map.js
@@ -114,7 +114,6 @@ const INITIAL_STATE = {
 };
 
 
-
 export function map(state = INITIAL_STATE, action) {
   switch (action.type) {
     case UPDATE_DRAW_STATE:
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.js
index 710d2c0d81fef..58996a1afe41f 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.js
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.js
@@ -26,7 +26,7 @@ async function fetch(server) {
         bool: {
           filter: {
             term: {
-              _id: TASK_ID
+              _id: `task:${TASK_ID}`
             }
           }
         }
diff --git a/x-pack/legacy/plugins/ml/public/components/navigation_menu/navigation_menu_react_wrapper_directive.js b/x-pack/legacy/plugins/ml/public/components/navigation_menu/navigation_menu_react_wrapper_directive.js
index 7c8764c45b964..dcdaec159cc0a 100644
--- a/x-pack/legacy/plugins/ml/public/components/navigation_menu/navigation_menu_react_wrapper_directive.js
+++ b/x-pack/legacy/plugins/ml/public/components/navigation_menu/navigation_menu_react_wrapper_directive.js
@@ -12,11 +12,6 @@ import { uiModules } from 'ui/modules';
 const module = uiModules.get('apps/ml');
 
 import 'ui/directives/kbn_href';
-import chrome from 'ui/chrome';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
-
-import { NavigationMenuContext } from '../../util/context_utils';
 
 import { NavigationMenu } from './navigation_menu';
 
@@ -25,12 +20,7 @@ module.directive('mlNavMenu', function () {
     restrict: 'E',
     transclude: true,
     link: function (scope, element, attrs) {
-      ReactDOM.render(
-        <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-          <NavigationMenu tabId={attrs.name} />
-        </NavigationMenuContext.Provider>,
-        element[0]
-      );
+      ReactDOM.render(<NavigationMenu tabId={attrs.name} />, element[0]);
 
       element.on('$destroy', () => {
         ReactDOM.unmountComponentAtNode(element[0]);
diff --git a/x-pack/legacy/plugins/ml/public/components/navigation_menu/top_nav/top_nav.tsx b/x-pack/legacy/plugins/ml/public/components/navigation_menu/top_nav/top_nav.tsx
index 54f24d0765f5c..b93f438b469df 100644
--- a/x-pack/legacy/plugins/ml/public/components/navigation_menu/top_nav/top_nav.tsx
+++ b/x-pack/legacy/plugins/ml/public/components/navigation_menu/top_nav/top_nav.tsx
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC, Fragment, useContext, useState, useEffect } from 'react';
+import React, { FC, Fragment, useState, useEffect } from 'react';
 import { EuiSuperDatePicker } from '@elastic/eui';
 import { TimeHistory, TimeRange } from 'ui/timefilter/time_history';
 
 import { mlTimefilterRefresh$ } from '../../../services/timefilter_refresh_service';
-import { NavigationMenuContext } from '../../../util/context_utils';
+import { useUiContext } from '../../../contexts/ui/use_ui_context';
 
 interface Duration {
   start: string;
@@ -28,9 +28,8 @@ function getRecentlyUsedRangesFactory(timeHistory: TimeHistory) {
 }
 
 export const TopNav: FC = () => {
-  const navigationMenuContext = useContext(NavigationMenuContext);
-  const timefilter = navigationMenuContext.timefilter;
-  const getRecentlyUsedRanges = getRecentlyUsedRangesFactory(navigationMenuContext.timeHistory);
+  const { chrome, timefilter, timeHistory } = useUiContext();
+  const getRecentlyUsedRanges = getRecentlyUsedRangesFactory(timeHistory);
 
   const [refreshInterval, setRefreshInterval] = useState(timefilter.getRefreshInterval());
   const [time, setTime] = useState(timefilter.getTime());
@@ -42,7 +41,7 @@ export const TopNav: FC = () => {
     timefilter.isTimeRangeSelectorEnabled
   );
 
-  const dateFormat = navigationMenuContext.chrome.getUiSettingsClient().get('dateFormat');
+  const dateFormat = chrome.getUiSettingsClient().get('dateFormat');
 
   useEffect(() => {
     timefilter.on('refreshIntervalUpdate', timefilterUpdateListener);
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/index_pattern.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/index_pattern.ts
new file mode 100644
index 0000000000000..a9f30a904d54b
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/index_pattern.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IndexPattern } from 'ui/index_patterns';
+
+export const indexPatternMock = ({
+  id: 'the-index-pattern-id',
+  title: 'the-index-pattern-title',
+  fields: [],
+} as unknown) as IndexPattern;
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/index_patterns.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/index_patterns.ts
new file mode 100644
index 0000000000000..778872d8183ee
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/index_patterns.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IndexPatterns } from 'ui/index_patterns';
+
+export const indexPatternsMock = (new (class {
+  fieldFormats = [];
+  config = {};
+  savedObjectsClient = {};
+  refreshSavedObjectsCache = {};
+  clearCache = jest.fn();
+  get = jest.fn();
+  getDefault = jest.fn();
+  getFields = jest.fn();
+  getIds = jest.fn();
+  getTitles = jest.fn();
+  make = jest.fn();
+})() as unknown) as IndexPatterns;
diff --git a/x-pack/legacy/plugins/infra/server/graphql/metadata/index.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/kibana_config.ts
similarity index 61%
rename from x-pack/legacy/plugins/infra/server/graphql/metadata/index.ts
rename to x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/kibana_config.ts
index cda731bdaa9b6..247764a197bbf 100644
--- a/x-pack/legacy/plugins/infra/server/graphql/metadata/index.ts
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/kibana_config.ts
@@ -4,5 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { createMetadataResolvers } from './resolvers';
-export { metadataSchema } from './schema.gql';
+export const kibanaConfigMock = {
+  get: <T>(key: string): T => ({} as T),
+  has: (key: string) => false,
+  set: (key: string, value: any) => {},
+};
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/kibana_context_value.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/kibana_context_value.ts
new file mode 100644
index 0000000000000..8f54c7f1ad656
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/kibana_context_value.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { indexPatternMock } from './index_pattern';
+import { indexPatternsMock } from './index_patterns';
+import { kibanaConfigMock } from './kibana_config';
+import { savedSearchMock } from './saved_search';
+
+export const kibanaContextValueMock = {
+  combinedQuery: {
+    query: 'the-query-string',
+    language: 'the-query-language',
+  },
+  currentIndexPattern: indexPatternMock,
+  currentSavedSearch: savedSearchMock,
+  indexPatterns: indexPatternsMock,
+  kbnBaseUrl: 'url',
+  kibanaConfig: kibanaConfigMock,
+};
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/saved_search.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/saved_search.ts
new file mode 100644
index 0000000000000..311e6688f7aa9
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/__mocks__/saved_search.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const savedSearchMock = {
+  id: 'the-saved-search-id',
+  title: 'the-saved-search-title',
+  searchSource: {},
+  columns: [],
+  sort: [],
+  destroy: () => {},
+};
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/index.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/index.ts
new file mode 100644
index 0000000000000..629e52797fb42
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/index.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.
+ */
+
+export {
+  KibanaContext,
+  KibanaContextValue,
+  SavedSearchQuery,
+  KibanaConfigTypeFix,
+} from './kibana_context';
+export { useKibanaContext } from './use_kibana_context';
+export { useCurrentIndexPattern } from './use_current_index_pattern';
+export { useCurrentSavedSearch } from './use_current_saved_search';
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/kibana_context.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/kibana_context.ts
new file mode 100644
index 0000000000000..afa2a53ef5dcf
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/kibana_context.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { KibanaConfig } from 'src/legacy/server/kbn_server';
+import { SavedSearch } from 'src/legacy/core_plugins/kibana/public/discover/types';
+
+import { IndexPattern, IndexPatterns } from 'ui/index_patterns';
+
+// set() method is missing in original d.ts
+export interface KibanaConfigTypeFix extends KibanaConfig {
+  set(key: string, value: any): void;
+}
+
+export interface KibanaContextValue {
+  combinedQuery: any;
+  currentIndexPattern: IndexPattern;
+  currentSavedSearch: SavedSearch;
+  indexPatterns: IndexPatterns;
+  kbnBaseUrl: string;
+  kibanaConfig: KibanaConfigTypeFix;
+}
+
+export type SavedSearchQuery = object;
+
+// This context provides dependencies which can be injected
+// via angularjs only (like services, currentIndexPattern etc.).
+// Because we cannot just import these dependencies, the default value
+// for the context is just {} and of type `Partial<KibanaContextValue>`
+// for the angularjs based dependencies. Therefore, the
+// actual dependencies are set like we did previously with KibanaContext
+// in the wrapping angularjs directive. In the custom hook we check if
+// the dependencies are present with error reporting if they weren't
+// added properly. That's why in tests, these custom hooks must not
+// be mocked, instead <UiChrome.Provider value="mocked-value">` needs
+// to be used. This guarantees that we have both properly set up
+// TypeScript support and runtime checks for these dependencies.
+// Multiple custom hooks can be created to access subsets of
+// the overall context value if necessary too,
+// see useCurrentIndexPattern() for example.
+export const KibanaContext = React.createContext<Partial<KibanaContextValue>>({});
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/use_current_index_pattern.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/use_current_index_pattern.ts
new file mode 100644
index 0000000000000..62be409882dff
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/use_current_index_pattern.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useContext } from 'react';
+
+import { KibanaContext } from './kibana_context';
+
+export const useCurrentIndexPattern = () => {
+  const context = useContext(KibanaContext);
+
+  if (context.currentIndexPattern === undefined) {
+    throw new Error('currentIndexPattern is undefined');
+  }
+
+  return context.currentIndexPattern;
+};
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/use_current_saved_search.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/use_current_saved_search.ts
new file mode 100644
index 0000000000000..1147b905f237e
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/use_current_saved_search.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useContext } from 'react';
+
+import { KibanaContext } from './kibana_context';
+
+export const useCurrentSavedSearch = () => {
+  const context = useContext(KibanaContext);
+
+  if (context.currentSavedSearch === undefined) {
+    throw new Error('currentSavedSearch is undefined');
+  }
+
+  return context.currentSavedSearch;
+};
diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/use_kibana_context.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/use_kibana_context.ts
new file mode 100644
index 0000000000000..1cc670875dff3
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/use_kibana_context.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useContext } from 'react';
+
+import { KibanaContext, KibanaContextValue } from './kibana_context';
+
+export const useKibanaContext = () => {
+  const context = useContext(KibanaContext);
+
+  if (
+    context.combinedQuery === undefined ||
+    context.currentIndexPattern === undefined ||
+    context.currentSavedSearch === undefined ||
+    context.indexPatterns === undefined ||
+    context.kbnBaseUrl === undefined ||
+    context.kibanaConfig === undefined
+  ) {
+    throw new Error('required attribute is undefined');
+  }
+
+  return context as KibanaContextValue;
+};
diff --git a/x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/mocks.ts b/x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/mocks.ts
new file mode 100644
index 0000000000000..fb44ee602804d
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/mocks.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const uiChromeMock = {
+  getBasePath: () => 'basePath',
+  getUiSettingsClient: () => {
+    return {
+      get: (key: string) => {
+        switch (key) {
+          case 'dateFormat':
+          case 'timepicker:timeDefaults':
+            return {};
+          case 'timepicker:refreshIntervalDefaults':
+            return { pause: false, value: 0 };
+          default:
+            throw new Error(`Unexpected config key: ${key}`);
+        }
+      },
+    };
+  },
+};
+
+export const uiTimefilterMock = {
+  getRefreshInterval: () => '30s',
+  getTime: () => ({ from: 0, to: 0 }),
+  on: (event: string, reload: () => void) => {},
+};
+
+export const uiTimeHistoryMock = {
+  get: () => [{ from: 0, to: 0 }],
+};
diff --git a/x-pack/test/types/services.d.ts b/x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/use_ui_chrome_context.ts
similarity index 71%
rename from x-pack/test/types/services.d.ts
rename to x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/use_ui_chrome_context.ts
index a219e43ebd956..929a9454f9682 100644
--- a/x-pack/test/types/services.d.ts
+++ b/x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/use_ui_chrome_context.ts
@@ -4,6 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export interface LogService {
-  debug: (message: string) => void;
-}
+import { uiChromeMock } from './mocks';
+
+export const useUiChromeContext = () => uiChromeMock;
diff --git a/x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/use_ui_context.ts b/x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/use_ui_context.ts
new file mode 100644
index 0000000000000..ec2a812e9fe78
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/ui/__mocks__/use_ui_context.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { uiChromeMock, uiTimefilterMock, uiTimeHistoryMock } from './mocks';
+
+export const useUiContext = () => ({
+  chrome: uiChromeMock,
+  timefilter: uiTimefilterMock,
+  timeHistory: uiTimeHistoryMock,
+});
diff --git a/x-pack/legacy/plugins/ml/public/contexts/ui/index.ts b/x-pack/legacy/plugins/ml/public/contexts/ui/index.ts
new file mode 100644
index 0000000000000..18cbb49181e38
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/ui/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// We only export UiContext but not any custom hooks, because if we'd import them
+// from here, mocking the hook from jest tests won't work as expected.
+export { UiContext } from './ui_context';
diff --git a/x-pack/legacy/plugins/ml/public/contexts/ui/ui_context.tsx b/x-pack/legacy/plugins/ml/public/contexts/ui/ui_context.tsx
new file mode 100644
index 0000000000000..52a90f795e5bd
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/ui/ui_context.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import chrome from 'ui/chrome';
+import { timefilter } from 'ui/timefilter';
+import { timeHistory } from 'ui/timefilter/time_history';
+
+// This provides ui/* based imports via React Context.
+// Because these dependencies can use regular imports,
+// they are just passed on as the default value
+// of the Context which means it's not necessary
+// to add <UiContext.Provider value="..." />... to the
+// wrapping angular directive, reducing a lot of boilerplate.
+// The custom hooks like useUiContext() need to be mocked in
+// tests because we rely on the properly set up default value.
+// Different custom hooks can be created to access parts only
+// from the full context value, see useUiChromeContext() as an example.
+export const UiContext = React.createContext({
+  chrome,
+  timefilter,
+  timeHistory,
+});
diff --git a/x-pack/legacy/plugins/ml/public/contexts/ui/use_ui_chrome_context.ts b/x-pack/legacy/plugins/ml/public/contexts/ui/use_ui_chrome_context.ts
new file mode 100644
index 0000000000000..1765bdb23df7f
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/ui/use_ui_chrome_context.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useContext } from 'react';
+
+import { UiContext } from './ui_context';
+
+export const useUiChromeContext = () => {
+  return useContext(UiContext).chrome;
+};
diff --git a/x-pack/legacy/plugins/ml/public/contexts/ui/use_ui_context.ts b/x-pack/legacy/plugins/ml/public/contexts/ui/use_ui_context.ts
new file mode 100644
index 0000000000000..156a42d9f3c50
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/contexts/ui/use_ui_context.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useContext } from 'react';
+
+import { UiContext } from './ui_context';
+
+export const useUiContext = () => {
+  return useContext(UiContext);
+};
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/common/index.ts b/x-pack/legacy/plugins/ml/public/data_frame/common/index.ts
index 7610843fa53a6..6c86e3d25321a 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/common/index.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame/common/index.ts
@@ -16,13 +16,6 @@ export {
   MAX_COLUMNS,
 } from './fields';
 export { DropDownLabel, DropDownOption, Label } from './dropdown';
-export {
-  KibanaContext,
-  KibanaContextValue,
-  isKibanaContext,
-  NullableKibanaContextValue,
-  SavedSearchQuery,
-} from './kibana_context';
 export {
   isTransformIdValid,
   refreshTransformList$,
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/common/kibana_context.ts b/x-pack/legacy/plugins/ml/public/data_frame/common/kibana_context.ts
deleted file mode 100644
index 94e8986753f50..0000000000000
--- a/x-pack/legacy/plugins/ml/public/data_frame/common/kibana_context.ts
+++ /dev/null
@@ -1,38 +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 { IndexPattern } from 'ui/index_patterns';
-
-export interface KibanaContextValue {
-  combinedQuery: any;
-  currentIndexPattern: IndexPattern;
-  currentSavedSearch: any;
-  indexPatterns: any;
-  kbnBaseUrl: string;
-  kibanaConfig: any;
-}
-
-export type SavedSearchQuery = object;
-
-// Because we're only getting the actual contextvalue within a wrapping angular component,
-// we need to initialize here with `null` because TypeScript doesn't allow createContext()
-// without a default value. The nullable union type takes care of allowing
-// the actual required type and `null`.
-export type NullableKibanaContextValue = KibanaContextValue | null;
-export const KibanaContext = React.createContext<NullableKibanaContextValue>(null);
-
-export function isKibanaContext(arg: any): arg is KibanaContextValue {
-  return (
-    arg.combinedQuery !== undefined &&
-    arg.currentIndexPattern !== undefined &&
-    arg.currentSavedSearch !== undefined &&
-    arg.indexPatterns !== undefined &&
-    typeof arg.kbnBaseUrl === 'string' &&
-    arg.kibanaConfig !== undefined
-  );
-}
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/common/navigation.ts b/x-pack/legacy/plugins/ml/public/data_frame/common/navigation.ts
index cc88e3ba2dee2..746193f1e1262 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/common/navigation.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame/common/navigation.ts
@@ -6,8 +6,6 @@
 
 import rison from 'rison-node';
 
-import chrome from 'ui/chrome';
-
 export function moveToDataFrameWizard() {
   window.location.href = '#/data_frames/new_transform';
 }
@@ -16,7 +14,7 @@ export function moveToDataFrameTransformList() {
   window.location.href = '#/data_frames';
 }
 
-export function moveToDiscover(indexPatternId: string, kbnBaseUrl: string) {
+export function moveToDiscover(indexPatternId: string, baseUrl: string) {
   const _g = rison.encode({});
 
   // Add the index pattern ID to the appState part of the URL.
@@ -24,7 +22,6 @@ export function moveToDiscover(indexPatternId: string, kbnBaseUrl: string) {
     index: indexPatternId,
   });
 
-  const baseUrl = chrome.addBasePath(kbnBaseUrl);
   const hash = `#/discover?_g=${_g}&_a=${_a}`;
 
   window.location.href = `${baseUrl}${hash}`;
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/common/request.ts b/x-pack/legacy/plugins/ml/public/data_frame/common/request.ts
index 598bb6a0c3610..ecef6fcc2f740 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/common/request.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame/common/request.ts
@@ -9,6 +9,7 @@ import { DefaultOperator } from 'elasticsearch';
 import { IndexPattern } from 'ui/index_patterns';
 
 import { dictionaryToArray } from '../../../common/types/common';
+import { SavedSearchQuery } from '../../contexts/kibana';
 
 import { StepDefineExposedState } from '../pages/data_frame_new_pivot/components/step_define/step_define_form';
 import { StepDetailsExposedState } from '../pages/data_frame_new_pivot/components/step_details/step_details_form';
@@ -24,7 +25,6 @@ import {
 
 import { PivotAggsConfig } from './pivot_aggs';
 import { DateHistogramAgg, HistogramAgg, TermsAgg } from './pivot_group_by';
-import { SavedSearchQuery } from './kibana_context';
 import { PreviewRequestBody, CreateRequestBody } from './transform';
 
 export interface SimpleQuery {
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/access_denied/directive.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/access_denied/directive.tsx
index ba43564d1573b..e16d5736db6ec 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/access_denied/directive.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/access_denied/directive.tsx
@@ -14,13 +14,8 @@ import uiChrome from 'ui/chrome';
 const module = uiModules.get('apps/ml', ['react']);
 
 import { I18nContext } from 'ui/i18n';
-import chrome from 'ui/chrome';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 import { InjectorService } from '../../../../common/types/angular';
 
-import { NavigationMenuContext } from '../../../util/context_utils';
-
 import { Page } from './page';
 
 module.directive('mlDataFrameAccessDenied', ($injector: InjectorService) => {
@@ -41,9 +36,7 @@ module.directive('mlDataFrameAccessDenied', ($injector: InjectorService) => {
 
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <Page goToKibana={goToKibana} retry={retry} />
-          </NavigationMenuContext.Provider>
+          <Page goToKibana={goToKibana} retry={retry} />
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/__snapshots__/source_index_preview.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/__snapshots__/source_index_preview.test.tsx.snap
index 1bdb1ee05349e..9179d9c8bcf61 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/__snapshots__/source_index_preview.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/__snapshots__/source_index_preview.test.tsx.snap
@@ -5,16 +5,42 @@ exports[`Data Frame: <SourceIndexPreview /> Minimal initialization 1`] = `
   <ContextProvider
     value={
       Object {
-        "combinedQuery": Object {},
+        "combinedQuery": Object {
+          "language": "the-query-language",
+          "query": "the-query-string",
+        },
         "currentIndexPattern": Object {
           "fields": Array [],
           "id": "the-index-pattern-id",
           "title": "the-index-pattern-title",
         },
-        "currentSavedSearch": Object {},
-        "indexPatterns": Object {},
+        "currentSavedSearch": Object {
+          "columns": Array [],
+          "destroy": [Function],
+          "id": "the-saved-search-id",
+          "searchSource": Object {},
+          "sort": Array [],
+          "title": "the-saved-search-title",
+        },
+        "indexPatterns": _temp {
+          "clearCache": [MockFunction],
+          "config": Object {},
+          "fieldFormats": Array [],
+          "get": [MockFunction],
+          "getDefault": [MockFunction],
+          "getFields": [MockFunction],
+          "getIds": [MockFunction],
+          "getTitles": [MockFunction],
+          "make": [MockFunction],
+          "refreshSavedObjectsCache": Object {},
+          "savedObjectsClient": Object {},
+        },
         "kbnBaseUrl": "url",
-        "kibanaConfig": Object {},
+        "kibanaConfig": Object {
+          "get": [Function],
+          "has": [Function],
+          "set": [Function],
+        },
       }
     }
   >
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/source_index_preview.test.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/source_index_preview.test.tsx
index 6e39365bd9b85..0e8d9809274f1 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/source_index_preview.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/source_index_preview.test.tsx
@@ -7,8 +7,10 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { IndexPattern } from 'ui/index_patterns';
-import { getPivotQuery, KibanaContext } from '../../../../common';
+import { KibanaContext } from '../../../../../contexts/kibana';
+import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__/kibana_context_value';
+
+import { getPivotQuery } from '../../../../common';
 
 import { SourceIndexPreview } from './source_index_preview';
 
@@ -20,12 +22,6 @@ jest.mock('react', () => {
 
 describe('Data Frame: <SourceIndexPreview />', () => {
   test('Minimal initialization', () => {
-    const currentIndexPattern = ({
-      id: 'the-index-pattern-id',
-      title: 'the-index-pattern-title',
-      fields: [],
-    } as unknown) as IndexPattern;
-
     const props = {
       query: getPivotQuery('the-query'),
     };
@@ -34,16 +30,7 @@ describe('Data Frame: <SourceIndexPreview />', () => {
     // with the Provider being the outer most component.
     const wrapper = shallow(
       <div>
-        <KibanaContext.Provider
-          value={{
-            combinedQuery: {},
-            currentIndexPattern,
-            currentSavedSearch: {},
-            indexPatterns: {},
-            kbnBaseUrl: 'url',
-            kibanaConfig: {},
-          }}
-        >
+        <KibanaContext.Provider value={kibanaContextValueMock}>
           <SourceIndexPreview {...props} />
         </KibanaContext.Provider>
       </div>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/source_index_preview.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/source_index_preview.tsx
index 71602fa0f2eb9..2841f2e28492c 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/source_index_preview.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/source_index_preview/source_index_preview.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FunctionComponent, useContext, useState } from 'react';
+import React, { FunctionComponent, useState } from 'react';
 import moment from 'moment-timezone';
 
 import { i18n } from '@kbn/i18n';
@@ -43,13 +43,13 @@ import { KBN_FIELD_TYPES } from '../../../../../../common/constants/field_types'
 import { Dictionary } from '../../../../../../common/types/common';
 import { formatHumanReadableDateTimeSeconds } from '../../../../../util/date_utils';
 
+import { useCurrentIndexPattern } from '../../../../../contexts/kibana';
+
 import {
-  isKibanaContext,
   toggleSelectedField,
   EsDoc,
   EsFieldName,
   MAX_COLUMNS,
-  KibanaContext,
   PivotQuery,
 } from '../../../../common';
 
@@ -100,13 +100,7 @@ interface Props {
 export const SourceIndexPreview: React.SFC<Props> = React.memo(({ cellClick, query }) => {
   const [clearTable, setClearTable] = useState(false);
 
-  const kibanaContext = useContext(KibanaContext);
-
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
-
-  const indexPattern = kibanaContext.currentIndexPattern;
+  const indexPattern = useCurrentIndexPattern();
 
   const [selectedFields, setSelectedFields] = useState([] as EsFieldName[]);
   const [isColumnsPopoverVisible, setColumnsPopoverVisible] = useState(false);
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/__snapshots__/step_create_form.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/__snapshots__/step_create_form.test.tsx.snap
index f1e413a03dde8..26844efb711e5 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/__snapshots__/step_create_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/__snapshots__/step_create_form.test.tsx.snap
@@ -5,16 +5,42 @@ exports[`Data Frame: <StepCreateForm /> Minimal initialization 1`] = `
   <ContextProvider
     value={
       Object {
-        "combinedQuery": Object {},
+        "combinedQuery": Object {
+          "language": "the-query-language",
+          "query": "the-query-string",
+        },
         "currentIndexPattern": Object {
           "fields": Array [],
           "id": "the-index-pattern-id",
           "title": "the-index-pattern-title",
         },
-        "currentSavedSearch": Object {},
-        "indexPatterns": Object {},
+        "currentSavedSearch": Object {
+          "columns": Array [],
+          "destroy": [Function],
+          "id": "the-saved-search-id",
+          "searchSource": Object {},
+          "sort": Array [],
+          "title": "the-saved-search-title",
+        },
+        "indexPatterns": _temp {
+          "clearCache": [MockFunction],
+          "config": Object {},
+          "fieldFormats": Array [],
+          "get": [MockFunction],
+          "getDefault": [MockFunction],
+          "getFields": [MockFunction],
+          "getIds": [MockFunction],
+          "getTitles": [MockFunction],
+          "make": [MockFunction],
+          "refreshSavedObjectsCache": Object {},
+          "savedObjectsClient": Object {},
+        },
         "kbnBaseUrl": "url",
-        "kibanaConfig": Object {},
+        "kibanaConfig": Object {
+          "get": [Function],
+          "has": [Function],
+          "set": [Function],
+        },
       }
     }
   >
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/step_create_form.test.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/step_create_form.test.tsx
index e22a5eabea24a..c99d2c657e71f 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/step_create_form.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/step_create_form.test.tsx
@@ -7,10 +7,12 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { KibanaContext } from '../../../../common';
+import { KibanaContext } from '../../../../../contexts/kibana';
+import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__/kibana_context_value';
 
 import { StepCreateForm } from './step_create_form';
-import { IndexPattern } from 'ui/index_patterns';
+
+jest.mock('../../../../../contexts/ui/use_ui_chrome_context');
 
 // workaround to make React.memo() work with enzyme
 jest.mock('react', () => {
@@ -28,26 +30,11 @@ describe('Data Frame: <StepCreateForm />', () => {
       onChange() {},
     };
 
-    const currentIndexPattern = ({
-      id: 'the-index-pattern-id',
-      title: 'the-index-pattern-title',
-      fields: [],
-    } as unknown) as IndexPattern;
-
     // Using a wrapping <div> element because shallow() would fail
     // with the Provider being the outer most component.
     const wrapper = shallow(
       <div>
-        <KibanaContext.Provider
-          value={{
-            combinedQuery: {},
-            currentIndexPattern,
-            currentSavedSearch: {},
-            indexPatterns: {},
-            kbnBaseUrl: 'url',
-            kibanaConfig: {},
-          }}
-        >
+        <KibanaContext.Provider value={kibanaContextValueMock}>
           <StepCreateForm {...props} />
         </KibanaContext.Provider>
       </div>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/step_create_form.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/step_create_form.tsx
index 7ea15673fb18a..2b40edea7a8f3 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/step_create_form.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_create/step_create_form.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, SFC, useContext, useEffect, useState } from 'react';
+import React, { Fragment, SFC, useEffect, useState } from 'react';
 import { idx } from '@kbn/elastic-idx';
 import { i18n } from '@kbn/i18n';
 import { toastNotifications } from 'ui/notify';
@@ -31,14 +31,11 @@ import {
 } from '@elastic/eui';
 
 import { ml } from '../../../../../services/ml_api_service';
+import { useKibanaContext } from '../../../../../contexts/kibana/use_kibana_context';
+import { useUiChromeContext } from '../../../../../contexts/ui/use_ui_chrome_context';
 import { PROGRESS_JOBS_REFRESH_INTERVAL_MS } from '../../../../../../common/constants/jobs_list';
 
-import {
-  isKibanaContext,
-  KibanaContext,
-  moveToDataFrameTransformList,
-  moveToDiscover,
-} from '../../../../common';
+import { moveToDataFrameTransformList, moveToDiscover } from '../../../../common';
 
 export interface StepDetailsExposedState {
   created: boolean;
@@ -73,11 +70,8 @@ export const StepCreateForm: SFC<Props> = React.memo(
       undefined
     );
 
-    const kibanaContext = useContext(KibanaContext);
-
-    if (!isKibanaContext(kibanaContext)) {
-      return null;
-    }
+    const kibanaContext = useKibanaContext();
+    const baseUrl = useUiChromeContext().addBasePath(kibanaContext.kbnBaseUrl);
 
     useEffect(() => {
       onChange({ created, started, indexPatternId });
@@ -156,6 +150,18 @@ export const StepCreateForm: SFC<Props> = React.memo(
 
         const id = await newIndexPattern.create();
 
+        // id returns false if there's a duplicate index pattern.
+        if (id === false) {
+          toastNotifications.addDanger(
+            i18n.translate('xpack.ml.dataframe.stepCreateForm.duplicateIndexPatternErrorMessage', {
+              defaultMessage:
+                'An error occurred creating the Kibana index pattern {indexPatternName}: The index pattern already exists.',
+              values: { indexPatternName },
+            })
+          );
+          return;
+        }
+
         // check if there's a default index pattern, if not,
         // set the newly created one as the default index pattern.
         if (!kibanaContext.kibanaConfig.get('defaultIndex')) {
@@ -163,7 +169,7 @@ export const StepCreateForm: SFC<Props> = React.memo(
         }
 
         toastNotifications.addSuccess(
-          i18n.translate('xpack.ml.dataframe.stepCreateForm.reateIndexPatternSuccessMessage', {
+          i18n.translate('xpack.ml.dataframe.stepCreateForm.createIndexPatternSuccessMessage', {
             defaultMessage: 'Kibana index pattern {indexPatternName} created successfully.',
             values: { indexPatternName },
           })
@@ -391,7 +397,7 @@ export const StepCreateForm: SFC<Props> = React.memo(
                         defaultMessage: 'Use Discover to explore the data frame pivot.',
                       }
                     )}
-                    onClick={() => moveToDiscover(indexPatternId, kibanaContext.kbnBaseUrl)}
+                    onClick={() => moveToDiscover(indexPatternId, baseUrl)}
                   />
                 </EuiFlexItem>
               )}
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/pivot_preview.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/pivot_preview.test.tsx.snap
index e97a9695101d4..192d9d2cff625 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/pivot_preview.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/pivot_preview.test.tsx.snap
@@ -5,16 +5,42 @@ exports[`Data Frame: <PivotPreview /> Minimal initialization 1`] = `
   <ContextProvider
     value={
       Object {
-        "combinedQuery": Object {},
+        "combinedQuery": Object {
+          "language": "the-query-language",
+          "query": "the-query-string",
+        },
         "currentIndexPattern": Object {
           "fields": Array [],
           "id": "the-index-pattern-id",
           "title": "the-index-pattern-title",
         },
-        "currentSavedSearch": Object {},
-        "indexPatterns": Object {},
+        "currentSavedSearch": Object {
+          "columns": Array [],
+          "destroy": [Function],
+          "id": "the-saved-search-id",
+          "searchSource": Object {},
+          "sort": Array [],
+          "title": "the-saved-search-title",
+        },
+        "indexPatterns": _temp {
+          "clearCache": [MockFunction],
+          "config": Object {},
+          "fieldFormats": Array [],
+          "get": [MockFunction],
+          "getDefault": [MockFunction],
+          "getFields": [MockFunction],
+          "getIds": [MockFunction],
+          "getTitles": [MockFunction],
+          "make": [MockFunction],
+          "refreshSavedObjectsCache": Object {},
+          "savedObjectsClient": Object {},
+        },
         "kbnBaseUrl": "url",
-        "kibanaConfig": Object {},
+        "kibanaConfig": Object {
+          "get": [Function],
+          "has": [Function],
+          "set": [Function],
+        },
       }
     }
   >
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/step_define_form.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/step_define_form.test.tsx.snap
index 5c8717ba9e0e2..033eea8cf290e 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/step_define_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/step_define_form.test.tsx.snap
@@ -5,16 +5,42 @@ exports[`Data Frame: <DefinePivotForm /> Minimal initialization 1`] = `
   <ContextProvider
     value={
       Object {
-        "combinedQuery": Object {},
+        "combinedQuery": Object {
+          "language": "the-query-language",
+          "query": "the-query-string",
+        },
         "currentIndexPattern": Object {
           "fields": Array [],
           "id": "the-index-pattern-id",
           "title": "the-index-pattern-title",
         },
-        "currentSavedSearch": Object {},
-        "indexPatterns": Object {},
+        "currentSavedSearch": Object {
+          "columns": Array [],
+          "destroy": [Function],
+          "id": "the-saved-search-id",
+          "searchSource": Object {},
+          "sort": Array [],
+          "title": "the-saved-search-title",
+        },
+        "indexPatterns": _temp {
+          "clearCache": [MockFunction],
+          "config": Object {},
+          "fieldFormats": Array [],
+          "get": [MockFunction],
+          "getDefault": [MockFunction],
+          "getFields": [MockFunction],
+          "getIds": [MockFunction],
+          "getTitles": [MockFunction],
+          "make": [MockFunction],
+          "refreshSavedObjectsCache": Object {},
+          "savedObjectsClient": Object {},
+        },
         "kbnBaseUrl": "url",
-        "kibanaConfig": Object {},
+        "kibanaConfig": Object {
+          "get": [Function],
+          "has": [Function],
+          "set": [Function],
+        },
       }
     }
   >
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/step_define_summary.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/step_define_summary.test.tsx.snap
index 03a7fb32c1301..c3b75584f0a51 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/step_define_summary.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/__snapshots__/step_define_summary.test.tsx.snap
@@ -5,16 +5,42 @@ exports[`Data Frame: <DefinePivotSummary /> Minimal initialization 1`] = `
   <ContextProvider
     value={
       Object {
-        "combinedQuery": Object {},
+        "combinedQuery": Object {
+          "language": "the-query-language",
+          "query": "the-query-string",
+        },
         "currentIndexPattern": Object {
           "fields": Array [],
           "id": "the-index-pattern-id",
           "title": "the-index-pattern-title",
         },
-        "currentSavedSearch": Object {},
-        "indexPatterns": Object {},
+        "currentSavedSearch": Object {
+          "columns": Array [],
+          "destroy": [Function],
+          "id": "the-saved-search-id",
+          "searchSource": Object {},
+          "sort": Array [],
+          "title": "the-saved-search-title",
+        },
+        "indexPatterns": _temp {
+          "clearCache": [MockFunction],
+          "config": Object {},
+          "fieldFormats": Array [],
+          "get": [MockFunction],
+          "getDefault": [MockFunction],
+          "getFields": [MockFunction],
+          "getIds": [MockFunction],
+          "getTitles": [MockFunction],
+          "make": [MockFunction],
+          "refreshSavedObjectsCache": Object {},
+          "savedObjectsClient": Object {},
+        },
         "kbnBaseUrl": "url",
-        "kibanaConfig": Object {},
+        "kibanaConfig": Object {
+          "get": [Function],
+          "has": [Function],
+          "set": [Function],
+        },
       }
     }
   >
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.test.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.test.tsx
index 860a5e7c9b048..a7350247c2dba 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.test.tsx
@@ -7,17 +7,17 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
+import { KibanaContext } from '../../../../../contexts/kibana';
+import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__/kibana_context_value';
+
 import {
   getPivotQuery,
-  KibanaContext,
   PivotAggsConfig,
   PivotGroupByConfig,
   PIVOT_SUPPORTED_AGGS,
   PIVOT_SUPPORTED_GROUP_BY_AGGS,
 } from '../../../../common';
 
-import { IndexPattern } from 'ui/index_patterns';
-
 import { PivotPreview } from './pivot_preview';
 
 // workaround to make React.memo() work with enzyme
@@ -28,12 +28,6 @@ jest.mock('react', () => {
 
 describe('Data Frame: <PivotPreview />', () => {
   test('Minimal initialization', () => {
-    const currentIndexPattern = ({
-      id: 'the-index-pattern-id',
-      title: 'the-index-pattern-title',
-      fields: [],
-    } as unknown) as IndexPattern;
-
     const groupBy: PivotGroupByConfig = {
       agg: PIVOT_SUPPORTED_GROUP_BY_AGGS.TERMS,
       field: 'the-group-by-field',
@@ -56,16 +50,7 @@ describe('Data Frame: <PivotPreview />', () => {
     // with the Provider being the outer most component.
     const wrapper = shallow(
       <div>
-        <KibanaContext.Provider
-          value={{
-            combinedQuery: {},
-            currentIndexPattern,
-            currentSavedSearch: {},
-            indexPatterns: {},
-            kbnBaseUrl: 'url',
-            kibanaConfig: {},
-          }}
-        >
+        <KibanaContext.Provider value={kibanaContextValueMock}>
           <PivotPreview {...props} />
         </KibanaContext.Provider>
       </div>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.tsx
index 001cc5b046ddd..f82b69dcc0a83 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { SFC, useContext, useEffect, useRef, useState } from 'react';
+import React, { SFC, useEffect, useRef, useState } from 'react';
 import moment from 'moment-timezone';
 
 import { i18n } from '@kbn/i18n';
@@ -28,11 +28,11 @@ import { Dictionary, dictionaryToArray } from '../../../../../../common/types/co
 import { ES_FIELD_TYPES } from '../../../../../../common/constants/field_types';
 import { formatHumanReadableDateTimeSeconds } from '../../../../../util/date_utils';
 
+import { useCurrentIndexPattern } from '../../../../../contexts/kibana';
+
 import {
   getFlattenedFields,
-  isKibanaContext,
   PreviewRequestBody,
-  KibanaContext,
   PivotAggsConfigDict,
   PivotGroupByConfig,
   PivotGroupByConfigDict,
@@ -139,13 +139,8 @@ interface PivotPreviewProps {
 export const PivotPreview: SFC<PivotPreviewProps> = React.memo(({ aggs, groupBy, query }) => {
   const [clearTable, setClearTable] = useState(false);
 
-  const kibanaContext = useContext(KibanaContext);
-
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const indexPattern = useCurrentIndexPattern();
 
-  const indexPattern = kibanaContext.currentIndexPattern;
   const {
     dataFramePreviewData,
     dataFramePreviewMappings,
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_form.test.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_form.test.tsx
index 4d251ade87d75..e3f2e94e7cdd0 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_form.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_form.test.tsx
@@ -7,14 +7,15 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
+import { KibanaContext } from '../../../../../contexts/kibana';
+import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__/kibana_context_value';
+
 import {
-  KibanaContext,
   PivotAggsConfigDict,
   PivotGroupByConfigDict,
   PIVOT_SUPPORTED_AGGS,
   PIVOT_SUPPORTED_GROUP_BY_AGGS,
 } from '../../../../common';
-import { IndexPattern } from 'ui/index_patterns';
 import { StepDefineForm, isAggNameConflict } from './step_define_form';
 
 // workaround to make React.memo() work with enzyme
@@ -25,26 +26,11 @@ jest.mock('react', () => {
 
 describe('Data Frame: <DefinePivotForm />', () => {
   test('Minimal initialization', () => {
-    const currentIndexPattern = ({
-      id: 'the-index-pattern-id',
-      title: 'the-index-pattern-title',
-      fields: [],
-    } as unknown) as IndexPattern;
-
     // Using a wrapping <div> element because shallow() would fail
     // with the Provider being the outer most component.
     const wrapper = shallow(
       <div>
-        <KibanaContext.Provider
-          value={{
-            combinedQuery: {},
-            currentIndexPattern,
-            currentSavedSearch: {},
-            indexPatterns: {},
-            kbnBaseUrl: 'url',
-            kibanaConfig: {},
-          }}
-        >
+        <KibanaContext.Provider value={kibanaContextValueMock}>
           <StepDefineForm onChange={() => {}} />
         </KibanaContext.Provider>
       </div>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_form.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_form.tsx
index 37d8442acb693..fea9f425a2582 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_form.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_form.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, SFC, useContext, useEffect, useState } from 'react';
+import React, { Fragment, SFC, useEffect, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
@@ -37,14 +37,17 @@ import { PivotPreview } from './pivot_preview';
 import { KqlFilterBar } from '../../../../../components/kql_filter_bar';
 import { SwitchModal } from './switch_modal';
 
+import {
+  useKibanaContext,
+  KibanaContextValue,
+  SavedSearchQuery,
+} from '../../../../../contexts/kibana';
+
 import {
   AggName,
   DropDownLabel,
   getPivotQuery,
   getPreviewRequestBody,
-  isKibanaContext,
-  KibanaContext,
-  KibanaContextValue,
   PivotAggDict,
   PivotAggsConfig,
   PivotAggsConfigDict,
@@ -53,7 +56,6 @@ import {
   PivotGroupByConfigDict,
   PivotSupportedGroupByAggs,
   PIVOT_SUPPORTED_AGGS,
-  SavedSearchQuery,
 } from '../../../../common';
 
 import { getPivotDropdownOptions } from './common';
@@ -197,11 +199,7 @@ interface Props {
 }
 
 export const StepDefineForm: SFC<Props> = React.memo(({ overrides = {}, onChange }) => {
-  const kibanaContext = useContext(KibanaContext);
-
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const kibanaContext = useKibanaContext();
 
   const indexPattern = kibanaContext.currentIndexPattern;
 
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_summary.test.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_summary.test.tsx
index bc25dfa06cfdd..7015912fd2e29 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_summary.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_summary.test.tsx
@@ -7,14 +7,15 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
+import { KibanaContext } from '../../../../../contexts/kibana';
+import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__/kibana_context_value';
+
 import {
-  KibanaContext,
   PivotAggsConfig,
   PivotGroupByConfig,
   PIVOT_SUPPORTED_AGGS,
   PIVOT_SUPPORTED_GROUP_BY_AGGS,
 } from '../../../../common';
-import { IndexPattern } from 'ui/index_patterns';
 import { StepDefineExposedState } from './step_define_form';
 import { StepDefineSummary } from './step_define_summary';
 
@@ -26,12 +27,6 @@ jest.mock('react', () => {
 
 describe('Data Frame: <DefinePivotSummary />', () => {
   test('Minimal initialization', () => {
-    const currentIndexPattern = ({
-      id: 'the-index-pattern-id',
-      title: 'the-index-pattern-title',
-      fields: [],
-    } as unknown) as IndexPattern;
-
     const groupBy: PivotGroupByConfig = {
       agg: PIVOT_SUPPORTED_GROUP_BY_AGGS.TERMS,
       field: 'the-group-by-field',
@@ -59,16 +54,7 @@ describe('Data Frame: <DefinePivotSummary />', () => {
     // with the Provider being the outer most component.
     const wrapper = shallow(
       <div>
-        <KibanaContext.Provider
-          value={{
-            combinedQuery: {},
-            currentIndexPattern,
-            currentSavedSearch: {},
-            indexPatterns: {},
-            kbnBaseUrl: 'url',
-            kibanaConfig: {},
-          }}
-        >
+        <KibanaContext.Provider value={kibanaContextValueMock}>
           <StepDefineSummary {...props} />
         </KibanaContext.Provider>
       </div>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_summary.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_summary.tsx
index a17582e8b63ba..21250cb64ec70 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_summary.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/step_define_summary.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, SFC, useContext } from 'react';
+import React, { Fragment, SFC } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
@@ -17,11 +17,13 @@ import {
   EuiText,
 } from '@elastic/eui';
 
+import { useKibanaContext } from '../../../../../contexts/kibana';
+
 import { AggListSummary } from '../aggregation_list';
 import { GroupByListSummary } from '../group_by_list';
 import { PivotPreview } from './pivot_preview';
 
-import { getPivotQuery, isKibanaContext, KibanaContext } from '../../../../common';
+import { getPivotQuery } from '../../../../common';
 import { StepDefineExposedState } from './step_define_form';
 
 const defaultSearch = '*';
@@ -33,11 +35,7 @@ export const StepDefineSummary: SFC<StepDefineExposedState> = ({
   groupByList,
   aggList,
 }) => {
-  const kibanaContext = useContext(KibanaContext);
-
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const kibanaContext = useKibanaContext();
 
   const pivotQuery = getPivotQuery(searchQuery);
   let useCodeBlock = false;
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_details/step_details_form.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_details/step_details_form.tsx
index de8aa08ee9e69..f5e97c43b6dda 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_details/step_details_form.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/step_details/step_details_form.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, SFC, useContext, useEffect, useState } from 'react';
+import React, { Fragment, SFC, useEffect, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { metadata } from 'ui/metadata';
@@ -12,17 +12,16 @@ import { toastNotifications } from 'ui/notify';
 
 import { EuiLink, EuiSwitch, EuiFieldText, EuiForm, EuiFormRow, EuiSelect } from '@elastic/eui';
 
+import { useKibanaContext } from '../../../../../contexts/kibana';
 import { isValidIndexName } from '../../../../../../common/util/es_utils';
 
 import { ml } from '../../../../../services/ml_api_service';
 
 import {
   delayFormatRegex,
-  isKibanaContext,
   isTransformIdValid,
   DataFrameTransformId,
   DataFrameTransformPivotConfig,
-  KibanaContext,
 } from '../../../../common';
 import { EsIndexName, IndexPatternTitle } from './common';
 
@@ -58,11 +57,7 @@ interface Props {
 }
 
 export const StepDetailsForm: SFC<Props> = React.memo(({ overrides = {}, onChange }) => {
-  const kibanaContext = useContext(KibanaContext);
-
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const kibanaContext = useKibanaContext();
 
   const defaults = { ...getDefaultStepDetailsState(), ...overrides };
 
@@ -123,7 +118,7 @@ export const StepDetailsForm: SFC<Props> = React.memo(({ overrides = {}, onChang
       }
 
       try {
-        setIndexPatternTitles(await kibanaContext.indexPatterns.getTitles());
+        setIndexPatternTitles((await kibanaContext.indexPatterns.getTitles(false)) as string[]);
       } catch (e) {
         toastNotifications.addDanger(
           i18n.translate('xpack.ml.dataframe.stepDetailsForm.errorGettingIndexPatternTitles', {
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/wizard/wizard.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/wizard/wizard.tsx
index aff418c454e8c..7bd6b86bda5f8 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/wizard/wizard.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/wizard/wizard.tsx
@@ -4,13 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, SFC, useContext, useRef, useState } from 'react';
+import React, { Fragment, SFC, useRef, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
 import { EuiSteps, EuiStepStatus } from '@elastic/eui';
 
-import { isKibanaContext, getCreateRequestBody, KibanaContext } from '../../../../common';
+import { useKibanaContext } from '../../../../../contexts/kibana';
+
+import { getCreateRequestBody } from '../../../../common';
 
 import {
   StepDefineExposedState,
@@ -61,11 +63,7 @@ const StepDefine: SFC<DefinePivotStepProps> = ({
 };
 
 export const Wizard: SFC = React.memo(() => {
-  const kibanaContext = useContext(KibanaContext);
-
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const kibanaContext = useKibanaContext();
 
   const indexPattern = kibanaContext.currentIndexPattern;
 
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx
index 928d5dfce3760..4ed9d70b23dc5 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx
@@ -7,16 +7,15 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import chrome from 'ui/chrome';
 // @ts-ignore
 import { uiModules } from 'ui/modules';
 const module = uiModules.get('apps/ml', ['react']);
 
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern, IndexPatterns } from 'ui/index_patterns';
 import { I18nContext } from 'ui/i18n';
 import { IPrivate } from 'ui/private';
 import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
+
 import { InjectorService } from '../../../../common/types/angular';
 
 // @ts-ignore
@@ -28,8 +27,7 @@ type CreateSearchItems = () => {
   combinedQuery: any;
 };
 
-import { NavigationMenuContext } from '../../../util/context_utils';
-import { KibanaContext } from '../../common';
+import { KibanaConfigTypeFix, KibanaContext } from '../../../contexts/kibana';
 import { Page } from './page';
 
 module.directive('mlNewDataFrame', ($injector: InjectorService) => {
@@ -37,10 +35,10 @@ module.directive('mlNewDataFrame', ($injector: InjectorService) => {
     scope: {},
     restrict: 'E',
     link: (scope: ng.IScope, element: ng.IAugmentedJQuery) => {
-      const indexPatterns = $injector.get('indexPatterns');
+      const indexPatterns = $injector.get<IndexPatterns>('indexPatterns');
       const kbnBaseUrl = $injector.get<string>('kbnBaseUrl');
-      const kibanaConfig = $injector.get('config');
-      const Private: IPrivate = $injector.get('Private');
+      const kibanaConfig = $injector.get<KibanaConfigTypeFix>('config');
+      const Private = $injector.get<IPrivate>('Private');
 
       timefilter.disableTimeRangeSelector();
       timefilter.disableAutoRefreshSelector();
@@ -59,11 +57,9 @@ module.directive('mlNewDataFrame', ($injector: InjectorService) => {
 
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <KibanaContext.Provider value={kibanaContext}>
-              <Page />
-            </KibanaContext.Provider>
-          </NavigationMenuContext.Provider>
+          <KibanaContext.Provider value={kibanaContext}>
+            <Page />
+          </KibanaContext.Provider>
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/directive.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/directive.tsx
index b1a862a914ab2..749fe1dc31536 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/directive.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/directive.tsx
@@ -10,12 +10,8 @@ import ReactDOM from 'react-dom';
 // @ts-ignore
 import { uiModules } from 'ui/modules';
 const module = uiModules.get('apps/ml', ['react']);
-import chrome from 'ui/chrome';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 
 import { I18nContext } from 'ui/i18n';
-import { NavigationMenuContext } from '../../../util/context_utils';
 import { Page } from './page';
 
 module.directive('mlDataFramePage', () => {
@@ -25,9 +21,7 @@ module.directive('mlDataFramePage', () => {
     link: (scope: ng.IScope, element: ng.IAugmentedJQuery) => {
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <Page />
-          </NavigationMenuContext.Provider>
+          <Page />
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/selector/datavisualizer_selector.js b/x-pack/legacy/plugins/ml/public/datavisualizer/selector/datavisualizer_selector.js
index 9e5df0de49426..b9bcaf5ed71c9 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/selector/datavisualizer_selector.js
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/selector/datavisualizer_selector.js
@@ -22,11 +22,8 @@ import {
 
 import { isFullLicense } from '../../license/check_license';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
-import chrome from 'ui/chrome';
 import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 
-import { NavigationMenuContext } from '../../util/context_utils';
 import { NavigationMenu } from '../../components/navigation_menu/navigation_menu';
 
 function startTrialDescription() {
@@ -57,7 +54,7 @@ export const DatavisualizerSelector = injectI18n(function (props) {
   const startTrialVisible = isFullLicense() === false;
 
   return (
-    <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
+    <Fragment>
       <NavigationMenu tabId="datavisualizer" />
       <EuiPage restrictWidth={1000}>
         <EuiPageBody>
@@ -182,6 +179,6 @@ export const DatavisualizerSelector = injectI18n(function (props) {
           )}
         </EuiPageBody>
       </EuiPage>
-    </NavigationMenuContext.Provider>
+    </Fragment>
   );
 });
diff --git a/x-pack/legacy/plugins/ml/public/explorer/explorer_react_wrapper_directive.js b/x-pack/legacy/plugins/ml/public/explorer/explorer_react_wrapper_directive.js
index fd6e537532553..0f6a8dcaa0b5a 100644
--- a/x-pack/legacy/plugins/ml/public/explorer/explorer_react_wrapper_directive.js
+++ b/x-pack/legacy/plugins/ml/public/explorer/explorer_react_wrapper_directive.js
@@ -17,12 +17,8 @@ import { uiModules } from 'ui/modules';
 const module = uiModules.get('apps/ml');
 
 import { I18nContext } from 'ui/i18n';
-import chrome from 'ui/chrome';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 
 import { jobSelectServiceFactory } from '../components/job_selector/job_select_service_utils';
-import { NavigationMenuContext } from '../util/context_utils';
 
 import { Explorer } from './explorer';
 import { EXPLORER_ACTION } from './explorer_constants';
@@ -37,17 +33,15 @@ module.directive('mlExplorerReactWrapper', function (config, globalState) {
 
     ReactDOM.render(
       <I18nContext>
-        <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-          <Explorer {...{
-            appStateHandler: scope.appStateHandler,
-            config,
-            dateFormatTz,
-            globalState,
-            jobSelectService,
-            MlTimeBuckets: scope.MlTimeBuckets,
-          }}
-          />
-        </NavigationMenuContext.Provider>
+        <Explorer {...{
+          appStateHandler: scope.appStateHandler,
+          config,
+          dateFormatTz,
+          globalState,
+          jobSelectService,
+          MlTimeBuckets: scope.MlTimeBuckets,
+        }}
+        />
       </I18nContext>,
       element[0]
     );
diff --git a/x-pack/legacy/plugins/ml/public/file_datavisualizer/file_datavisualizer.js b/x-pack/legacy/plugins/ml/public/file_datavisualizer/file_datavisualizer.js
index c6ee2e2761d9c..02d5761041a07 100644
--- a/x-pack/legacy/plugins/ml/public/file_datavisualizer/file_datavisualizer.js
+++ b/x-pack/legacy/plugins/ml/public/file_datavisualizer/file_datavisualizer.js
@@ -4,25 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { FileDataVisualizerView } from './components/file_datavisualizer_view';
-
-import React from 'react';
+import React, { Fragment } from 'react';
 
-import chrome from 'ui/chrome';
 import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 
-import { NavigationMenuContext } from '../util/context_utils';
 import { NavigationMenu } from '../components/navigation_menu/navigation_menu';
 
+import { FileDataVisualizerView } from './components/file_datavisualizer_view';
+
 export function FileDataVisualizerPage({ indexPatterns, kibanaConfig }) {
   timefilter.disableTimeRangeSelector();
   timefilter.disableAutoRefreshSelector();
 
   return (
-    <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
+    <Fragment>
       <NavigationMenu tabId="datavisualizer" />
       <FileDataVisualizerView indexPatterns={indexPatterns} kibanaConfig={kibanaConfig} />
-    </NavigationMenuContext.Provider>
+    </Fragment>
   );
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/directive.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/directive.js
index e39d599d0f3c4..0b347a35ce73a 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/directive.js
+++ b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/directive.js
@@ -17,12 +17,8 @@ import { checkGetJobsPrivilege } from 'plugins/ml/privilege/check_privilege';
 import { getMlNodeCount } from 'plugins/ml/ml_nodes_check/check_ml_nodes';
 import { getJobManagementBreadcrumbs } from 'plugins/ml/jobs/breadcrumbs';
 import { loadNewJobDefaults } from 'plugins/ml/jobs/new_job/utils/new_job_defaults';
-import { NavigationMenuContext } from '../../util/context_utils';
 
-import chrome from 'ui/chrome';
 import uiRoutes from 'ui/routes';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 
 const template = `<jobs-page data-test-subj="mlPageJobManagement" />`;
 
@@ -49,9 +45,7 @@ module.directive('jobsPage', function () {
     link: (scope, element) => {
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <JobsPage angularWrapperScope={scope} />
-          </NavigationMenuContext.Provider>
+          <JobsPage angularWrapperScope={scope} />
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job/wizard/preconfigured_job_redirect.js b/x-pack/legacy/plugins/ml/public/jobs/new_job/wizard/preconfigured_job_redirect.js
index 65e1e196b2d84..963cefa1abbab 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job/wizard/preconfigured_job_redirect.js
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job/wizard/preconfigured_job_redirect.js
@@ -93,7 +93,7 @@ function getWizardUrlFromCloningJob(job) {
     }
     const indexPatternId = getIndexPatternIdFromName(job.datafeed_config.indices[0]);
 
-    return `jobs/new_job/simple/${page}?index=${indexPatternId}&_g=()`;
+    return `jobs/new_job/new_new_job/${page}?index=${indexPatternId}&_g=()`;
   } else {
     return null;
   }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/configs/combined_job.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/configs/combined_job.ts
new file mode 100644
index 0000000000000..435b7696af398
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/configs/combined_job.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { cloneDeep } from 'lodash';
+import { Datafeed } from './datafeed';
+import { Job } from './job';
+
+// in older implementations of the job config, the datafeed was placed inside the job
+// for convenience.
+export interface CombinedJob extends Job {
+  datafeed_config: Datafeed;
+}
+
+export function expandCombinedJobConfig(combinedJob: CombinedJob) {
+  const combinedJobClone = cloneDeep(combinedJob);
+  const job = combinedJobClone;
+  const datafeed = combinedJobClone.datafeed_config;
+  delete job.datafeed_config;
+
+  return { job, datafeed };
+}
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/configs/index.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/configs/index.ts
index f4502d7dc5873..c8b71ead4b6fb 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/configs/index.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/configs/index.ts
@@ -6,3 +6,4 @@
 
 export * from './job';
 export * from './datafeed';
+export * from './combined_job';
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/job_creator.ts
index 43246fa71911b..7787b4d3fbb14 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/job_creator.ts
@@ -356,4 +356,19 @@ export class JobCreator {
   public get formattedDatafeedJson() {
     return JSON.stringify(this._datafeed_config, null, 2);
   }
+
+  protected _overrideConfigs(job: Job, datafeed: Datafeed) {
+    this._job_config = job;
+    this._datafeed_config = datafeed;
+
+    this._detectors = this._job_config.analysis_config.detectors;
+    this._influencers = this._job_config.analysis_config.influencers;
+    if (this._job_config.groups === undefined) {
+      this._job_config.groups = [];
+    }
+
+    if (this._job_config.analysis_config.influencers !== undefined) {
+      this._job_config.analysis_config.influencers.forEach(i => this.addInfluencer(i));
+    }
+  }
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/multi_metric_job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/multi_metric_job_creator.ts
index 2116511b53a75..c44cadca33adb 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/multi_metric_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/multi_metric_job_creator.ts
@@ -8,10 +8,11 @@ import { SavedSearch } from 'src/legacy/core_plugins/kibana/public/discover/type
 import { IndexPattern } from 'ui/index_patterns';
 import { JobCreator } from './job_creator';
 import { Field, Aggregation, SplitField, AggFieldPair } from '../../../../../common/types/fields';
-import { Detector } from './configs';
+import { Job, Datafeed, Detector } from './configs';
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL, DEFAULT_MODEL_MEMORY_LIMIT } from './util/constants';
 import { ml } from '../../../../services/ml_api_service';
+import { getRichDetectors } from './util/general';
 
 export class MultiMetricJobCreator extends JobCreator {
   // a multi metric job has one optional overall partition field
@@ -136,4 +137,24 @@ export class MultiMetricJobCreator extends JobCreator {
       agg: this._aggs[i],
     }));
   }
+
+  public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
+    this._overrideConfigs(job, datafeed);
+    this.jobId = '';
+    const detectors = getRichDetectors(job.analysis_config.detectors);
+
+    this.removeAllDetectors();
+
+    detectors.forEach((d, i) => {
+      const dtr = detectors[i];
+      if (dtr.agg !== null && dtr.field !== null) {
+        this.addDetector(dtr.agg, dtr.field);
+      }
+    });
+    if (detectors.length) {
+      if (detectors[0].partitionField !== null) {
+        this.setSplitField(detectors[0].partitionField);
+      }
+    }
+  }
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/population_job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/population_job_creator.ts
index 31b29231377e6..d567e108e02e8 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/population_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/population_job_creator.ts
@@ -8,9 +8,10 @@ import { SavedSearch } from 'src/legacy/core_plugins/kibana/public/discover/type
 import { IndexPattern } from 'ui/index_patterns';
 import { JobCreator } from './job_creator';
 import { Field, Aggregation, SplitField, AggFieldPair } from '../../../../../common/types/fields';
-import { Detector } from './configs';
+import { Job, Datafeed, Detector } from './configs';
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL } from './util/constants';
+import { getRichDetectors } from './util/general';
 
 export class PopulationJobCreator extends JobCreator {
   // a population job has one overall over (split) field, which is the same for all detectors
@@ -125,4 +126,27 @@ export class PopulationJobCreator extends JobCreator {
       },
     }));
   }
+
+  public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
+    this._overrideConfigs(job, datafeed);
+    this.jobId = '';
+    const detectors = getRichDetectors(job.analysis_config.detectors);
+
+    this.removeAllDetectors();
+
+    if (detectors.length) {
+      if (detectors[0].overField !== null) {
+        this.setSplitField(detectors[0].overField);
+      }
+    }
+    detectors.forEach((d, i) => {
+      const dtr = detectors[i];
+      if (dtr.agg !== null && dtr.field !== null) {
+        this.addDetector(dtr.agg, dtr.field);
+        if (dtr.byField !== null) {
+          this.setByField(dtr.byField, i);
+        }
+      }
+    });
+  }
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/single_metric_job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/single_metric_job_creator.ts
index 6bba0f6de9be9..a2ba0801e3324 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/single_metric_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/single_metric_job_creator.ts
@@ -9,10 +9,11 @@ import { IndexPattern } from 'ui/index_patterns';
 import { parseInterval } from 'ui/utils/parse_interval';
 import { JobCreator } from './job_creator';
 import { Field, Aggregation, AggFieldPair } from '../../../../../common/types/fields';
-import { Detector, BucketSpan } from './configs';
+import { Job, Datafeed, Detector, BucketSpan } from './configs';
 import { createBasicDetector } from './util/default_configs';
 import { KIBANA_AGGREGATION } from '../../../../../common/constants/aggregation_types';
 import { JOB_TYPE, CREATED_BY_LABEL } from './util/constants';
+import { getRichDetectors } from './util/general';
 
 export class SingleMetricJobCreator extends JobCreator {
   protected _type: JOB_TYPE = JOB_TYPE.SINGLE_METRIC;
@@ -176,4 +177,17 @@ export class SingleMetricJobCreator extends JobCreator {
       };
     }
   }
+
+  public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
+    this._overrideConfigs(job, datafeed);
+    this.jobId = '';
+    const detectors = getRichDetectors(job.analysis_config.detectors);
+
+    this.removeAllDetectors();
+
+    const dtr = detectors[0];
+    if (detectors.length && dtr.agg !== null && dtr.field !== null) {
+      this.setDetector(dtr.agg, dtr.field);
+    }
+  }
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/util/general.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/util/general.ts
new file mode 100644
index 0000000000000..3f2375c452c3c
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/util/general.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Detector } from '../configs';
+import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
+
+// populate the detectors with Field and Agg objects loaded from the job capabilities service
+export function getRichDetectors(detectors: Detector[]) {
+  return detectors.map(d => {
+    return {
+      agg: newJobCapsService.getAggById(d.function),
+      field: d.field_name !== undefined ? newJobCapsService.getFieldById(d.field_name) : null,
+      byField:
+        d.by_field_name !== undefined ? newJobCapsService.getFieldById(d.by_field_name) : null,
+      overField:
+        d.over_field_name !== undefined ? newJobCapsService.getFieldById(d.over_field_name) : null,
+      partitionField:
+        d.partition_field_name !== undefined
+          ? newJobCapsService.getFieldById(d.partition_field_name)
+          : null,
+    };
+  });
+}
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx
index 28f8a0460246f..fb21f0c1ae109 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx
@@ -12,18 +12,21 @@ import moment from 'moment';
 import { WizardNav } from '../wizard_nav';
 import { WIZARD_STEPS, StepProps } from '../step_types';
 import { JobCreatorContext } from '../job_creator_context';
-import { KibanaContext, isKibanaContext } from '../../../../../data_frame/common/kibana_context';
+import { useKibanaContext } from '../../../../../contexts/kibana';
 import { FullTimeRangeSelector } from '../../../../../components/full_time_range_selector';
 import { EventRateChart } from '../charts/event_rate_chart';
 import { LineChartPoint } from '../../../common/chart_loader';
 import { TimeRangePicker } from './time_range_picker';
 import { GetTimeFieldRangeResponse } from '../../../../../services/ml_api_service';
+import { mlJobService } from '../../../../../services/job_service';
+import { ml } from '../../../../../services/ml_api_service';
 
+export interface TimeRange {
+  start: number;
+  end: number;
+}
 export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep }) => {
-  const kibanaContext = useContext(KibanaContext);
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const kibanaContext = useKibanaContext();
 
   const {
     jobCreator,
@@ -33,8 +36,10 @@ export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
     chartInterval,
   } = useContext(JobCreatorContext);
 
-  const [start, setStart] = useState(jobCreator.start);
-  const [end, setEnd] = useState(jobCreator.end);
+  const [timeRange, setTimeRange] = useState<TimeRange>({
+    start: jobCreator.start,
+    end: jobCreator.end,
+  });
   const [eventRateChartData, setEventRateChartData] = useState<LineChartPoint[]>([]);
 
   async function loadChart() {
@@ -47,6 +52,7 @@ export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
   }
 
   useEffect(() => {
+    const { start, end } = timeRange;
     jobCreator.setTimeRange(start, end);
     chartInterval.setBounds({
       min: moment(start),
@@ -60,25 +66,51 @@ export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
 
     jobCreatorUpdate();
     loadChart();
-  }, [start, end]);
+  }, [JSON.stringify(timeRange)]);
 
   useEffect(() => {
-    setStart(jobCreator.start);
-    setEnd(jobCreator.end);
+    setTimeRange({
+      start: jobCreator.start,
+      end: jobCreator.end,
+    });
   }, [jobCreatorUpdated]);
 
   function fullTimeRangeCallback(range: GetTimeFieldRangeResponse) {
-    setStart(range.start.epoch);
-    setEnd(range.end.epoch);
+    setTimeRange({
+      start: range.start.epoch,
+      end: range.end.epoch,
+    });
   }
 
+  useEffect(() => {
+    if (mlJobService.currentJob !== undefined) {
+      (async (index: string, timeFieldName: string | undefined, query: object) => {
+        const resp = await ml.getTimeFieldRange({
+          index,
+          timeFieldName,
+          query,
+        });
+        setTimeRange({
+          start: resp.start.epoch,
+          end: resp.end.epoch,
+        });
+        // wipe the cloning job
+        mlJobService.currentJob = undefined;
+      })(
+        kibanaContext.currentIndexPattern.title,
+        kibanaContext.currentIndexPattern.timeFieldName,
+        kibanaContext.combinedQuery
+      );
+    }
+  }, []);
+
   return (
     <Fragment>
       {isCurrentStep && (
         <Fragment>
           <EuiFlexGroup>
             <EuiFlexItem grow={false}>
-              <TimeRangePicker setStart={setStart} setEnd={setEnd} start={start} end={end} />
+              <TimeRangePicker setTimeRange={setTimeRange} timeRange={timeRange} />
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
               <FullTimeRangeSelector
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx
index 1c8964a0dc588..3cac139b27b88 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx
@@ -5,31 +5,27 @@
  */
 
 import moment from 'moment';
-import React, { Fragment, FC, useContext, useState, useEffect } from 'react';
+import React, { Fragment, FC, useState, useEffect } from 'react';
 import { EuiDatePickerRange, EuiDatePicker } from '@elastic/eui';
 
-import { KibanaContext, isKibanaContext } from '../../../../../data_frame/common/kibana_context';
+import { useKibanaContext } from '../../../../../contexts/kibana';
+import { TimeRange } from './time_range';
 
 const WIDTH = '512px';
 
 interface Props {
-  setStart: (s: number) => void;
-  setEnd: (e: number) => void;
-  start: number;
-  end: number;
+  setTimeRange: (d: TimeRange) => void;
+  timeRange: TimeRange;
 }
 
 type Moment = moment.Moment;
 
-export const TimeRangePicker: FC<Props> = ({ setStart, setEnd, start, end }) => {
-  const kibanaContext = useContext(KibanaContext);
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
-  const dateFormat = kibanaContext.kibanaConfig.get('dateFormat');
+export const TimeRangePicker: FC<Props> = ({ setTimeRange, timeRange }) => {
+  const kibanaContext = useKibanaContext();
+  const dateFormat: string = kibanaContext.kibanaConfig.get('dateFormat');
 
-  const [startMoment, setStartMoment] = useState<Moment | undefined>(moment(start));
-  const [endMoment, setEndMoment] = useState<Moment | undefined>(moment(end));
+  const [startMoment, setStartMoment] = useState<Moment | undefined>(moment(timeRange.start));
+  const [endMoment, setEndMoment] = useState<Moment | undefined>(moment(timeRange.end));
 
   function handleChangeStart(date: Moment | null) {
     setStartMoment(date || undefined);
@@ -42,8 +38,10 @@ export const TimeRangePicker: FC<Props> = ({ setStart, setEnd, start, end }) =>
   // update the parent start and end if the timepicker changes
   useEffect(() => {
     if (startMoment !== undefined && endMoment !== undefined) {
-      setStart(startMoment.valueOf());
-      setEnd(endMoment.valueOf());
+      setTimeRange({
+        start: startMoment.valueOf(),
+        end: endMoment.valueOf(),
+      });
     }
   }, [startMoment, endMoment]);
 
@@ -51,9 +49,9 @@ export const TimeRangePicker: FC<Props> = ({ setStart, setEnd, start, end }) =>
   // the parent start and end updates.
   // this happens if the use full data button is pressed.
   useEffect(() => {
-    setStartMoment(moment(start));
-    setEndMoment(moment(end));
-  }, [start, end]);
+    setStartMoment(moment(timeRange.start));
+    setEndMoment(moment(timeRange.end));
+  }, [JSON.stringify(timeRange)]);
 
   return (
     <Fragment>
@@ -69,6 +67,7 @@ export const TimeRangePicker: FC<Props> = ({ setStart, setEnd, start, end }) =>
               aria-label="Start date"
               showTimeSelect
               dateFormat={dateFormat}
+              maxDate={endMoment}
             />
           }
           endDateControl={
@@ -80,6 +79,7 @@ export const TimeRangePicker: FC<Props> = ({ setStart, setEnd, start, end }) =>
               aria-label="End date"
               showTimeSelect
               dateFormat={dateFormat}
+              minDate={startMoment}
             />
           }
         />
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx
index cd80a7f6ca034..6513d9c69da1b 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx
@@ -11,6 +11,7 @@ import ReactDOM from 'react-dom';
 import { uiModules } from 'ui/modules';
 const module = uiModules.get('apps/ml', ['react']);
 import { timefilter } from 'ui/timefilter';
+import { IndexPatterns } from 'ui/index_patterns';
 
 import { I18nContext } from 'ui/i18n';
 import { IPrivate } from 'ui/private';
@@ -20,7 +21,7 @@ import { SearchItemsProvider } from '../../../new_job/utils/new_job_utils';
 import { Page, PageProps } from './page';
 import { JOB_TYPE } from '../../common/job_creator/util/constants';
 
-import { KibanaContext } from '../../../../data_frame/common/kibana_context';
+import { KibanaContext, KibanaConfigTypeFix } from '../../../../contexts/kibana';
 
 module.directive('mlNewJobPage', ($injector: InjectorService) => {
   return {
@@ -30,10 +31,10 @@ module.directive('mlNewJobPage', ($injector: InjectorService) => {
       timefilter.disableTimeRangeSelector();
       timefilter.disableAutoRefreshSelector();
 
-      const indexPatterns = $injector.get('indexPatterns');
+      const indexPatterns = $injector.get<IndexPatterns>('indexPatterns');
       const kbnBaseUrl = $injector.get<string>('kbnBaseUrl');
-      const kibanaConfig = $injector.get('config');
-      const Private: IPrivate = $injector.get('Private');
+      const kibanaConfig = $injector.get<KibanaConfigTypeFix>('config');
+      const Private = $injector.get<IPrivate>('Private');
       const $route = $injector.get<any>('$route');
       const existingJobsAndGroups = $route.current.locals.existingJobsAndGroups;
 
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
index 6a06d29c5c690..7397cba6953bd 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC, useContext, useEffect, Fragment } from 'react';
+import React, { FC, useEffect, Fragment } from 'react';
 
 import { EuiPage, EuiPageBody, EuiPageContentBody } from '@elastic/eui';
 import { Wizard } from './wizard';
@@ -21,11 +21,12 @@ import {
 import { ChartLoader } from '../../common/chart_loader';
 import { ResultsLoader } from '../../common/results_loader';
 import { JobValidator } from '../../common/job_validator';
-import { KibanaContext, isKibanaContext } from '../../../../data_frame/common/kibana_context';
+import { useKibanaContext } from '../../../../contexts/kibana';
 import { getTimeFilterRange } from '../../../../components/full_time_range_selector';
 import { MlTimeBuckets } from '../../../../util/ml_time_buckets';
 import { newJobDefaults } from '../../../new_job/utils/new_job_defaults';
-import { ExistingJobsAndGroups } from '../../../../services/job_service';
+import { ExistingJobsAndGroups, mlJobService } from '../../../../services/job_service';
+import { expandCombinedJobConfig } from '../../common/job_creator/configs';
 
 const PAGE_WIDTH = 1200; // document.querySelector('.single-metric-job-container').width();
 const BAR_TARGET = PAGE_WIDTH > 2000 ? 1000 : PAGE_WIDTH / 2;
@@ -37,10 +38,7 @@ export interface PageProps {
 }
 
 export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
-  const kibanaContext = useContext(KibanaContext);
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const kibanaContext = useKibanaContext();
 
   const jobDefaults = newJobDefaults();
 
@@ -53,18 +51,24 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
   const { from, to } = getTimeFilterRange();
   jobCreator.setTimeRange(from, to);
 
-  jobCreator.bucketSpan = DEFAULT_BUCKET_SPAN;
-
-  if (isPopulationJobCreator(jobCreator) === true) {
-    // for population jobs use the default mml (1GB)
-    jobCreator.modelMemoryLimit = jobDefaults.anomaly_detectors.model_memory_limit;
+  if (mlJobService.currentJob !== undefined) {
+    const clonedJob = mlJobService.cloneJob(mlJobService.currentJob);
+    const { job, datafeed } = expandCombinedJobConfig(clonedJob);
+    jobCreator.cloneFromExistingJob(job, datafeed);
   } else {
-    // for all other jobs, use 10MB
-    jobCreator.modelMemoryLimit = DEFAULT_MODEL_MEMORY_LIMIT;
-  }
-
-  if (isSingleMetricJobCreator(jobCreator) === true) {
-    jobCreator.modelPlot = true;
+    jobCreator.bucketSpan = DEFAULT_BUCKET_SPAN;
+
+    if (isPopulationJobCreator(jobCreator) === true) {
+      // for population jobs use the default mml (1GB)
+      jobCreator.modelMemoryLimit = jobDefaults.anomaly_detectors.model_memory_limit;
+    } else {
+      // for all other jobs, use 10MB
+      jobCreator.modelMemoryLimit = DEFAULT_MODEL_MEMORY_LIMIT;
+    }
+
+    if (isSingleMetricJobCreator(jobCreator) === true) {
+      jobCreator.modelPlot = true;
+    }
   }
 
   const chartInterval = new MlTimeBuckets();
@@ -85,6 +89,7 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
   useEffect(() => {
     return () => {
       jobCreator.forceStopRefreshPolls();
+      mlJobService.currentJob = undefined;
     };
   });
 
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/wizard.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/wizard.tsx
index 6c0ba54793007..ccb0d27b5dbcf 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/wizard.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/wizard.tsx
@@ -80,6 +80,9 @@ export const Wizard: FC<Props> = ({
   const [highestStep, setHighestStep] = useState(WIZARD_STEPS.TIME_RANGE);
   const [disableSteps, setDisableSteps] = useState(false);
   const [progress, setProgress] = useState(resultsLoader.progress);
+  const [stringifiedConfigs, setStringifiedConfigs] = useState(
+    stringifyConfigs(jobCreator.jobConfig, jobCreator.datafeedConfig)
+  );
 
   useEffect(() => {
     // IIFE to run the validation. the useEffect callback can't be async
@@ -87,8 +90,14 @@ export const Wizard: FC<Props> = ({
       await jobValidator.validate();
       setJobValidatorUpdate(jobValidatorUpdated);
     })();
+
     // if the job config has changed, reset the highestStep
-    setHighestStep(currentStep);
+    // compare a stringified config to ensure the configs have actually changed
+    const tempConfigs = stringifyConfigs(jobCreator.jobConfig, jobCreator.datafeedConfig);
+    if (tempConfigs !== stringifiedConfigs) {
+      setHighestStep(currentStep);
+      setStringifiedConfigs(tempConfigs);
+    }
   }, [jobCreatorUpdated]);
 
   useEffect(() => {
@@ -228,3 +237,7 @@ const Title: FC = ({ children }) => {
     </Fragment>
   );
 };
+
+function stringifyConfigs(jobConfig: object, datafeedConfig: object) {
+  return JSON.stringify(jobConfig) + JSON.stringify(datafeedConfig);
+}
diff --git a/x-pack/legacy/plugins/ml/public/services/job_service.d.ts b/x-pack/legacy/plugins/ml/public/services/job_service.d.ts
index 2dc3f791aa8bf..e4d323d6542f4 100644
--- a/x-pack/legacy/plugins/ml/public/services/job_service.d.ts
+++ b/x-pack/legacy/plugins/ml/public/services/job_service.d.ts
@@ -10,7 +10,9 @@ export interface ExistingJobsAndGroups {
 }
 
 declare interface JobService {
+  currentJob: any;
   saveNewJob(job: any): Promise<any>;
+  cloneJob(job: any): any;
   openJob(jobId: string): Promise<any>;
   saveNewDatafeed(datafeedConfig: any, jobId: string): Promise<any>;
   startDatafeed(datafeedId: string, jobId: string, start: number, end: number): Promise<any>;
diff --git a/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts b/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts
index 51e8b49ef0982..99f4d14b3ffc8 100644
--- a/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts
+++ b/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts
@@ -83,6 +83,16 @@ class NewJobCapsService {
       console.error('Unable to load new job capabilities', error); // eslint-disable-line no-console
     }
   }
+
+  public getFieldById(id: string): Field | null {
+    const field = this._fields.find(f => f.id === id);
+    return field === undefined ? null : field;
+  }
+
+  public getAggById(id: string): Aggregation | null {
+    const agg = this._aggs.find(f => f.id === id);
+    return agg === undefined ? null : agg;
+  }
 }
 
 // using the response from the endpoint, create the field and aggs objects
diff --git a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/directive.js b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/directive.js
index 2d5427f091def..728176a9b7eb1 100644
--- a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/directive.js
+++ b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/directive.js
@@ -17,14 +17,9 @@ import { checkGetJobsPrivilege, checkPermission } from '../../../privilege/check
 import { checkMlNodesAvailable } from '../../../ml_nodes_check/check_ml_nodes';
 import { getCreateCalendarBreadcrumbs, getEditCalendarBreadcrumbs } from '../../breadcrumbs';
 
-import chrome from 'ui/chrome';
 import uiRoutes from 'ui/routes';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 import { I18nContext } from 'ui/i18n';
 
-import { NavigationMenuContext } from '../../../util/context_utils';
-
 const template = `
   <div class="euiSpacer euiSpacer--s" />
   <ml-new-calendar />
@@ -66,9 +61,7 @@ module.directive('mlNewCalendar', function ($route) {
 
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <NewCalendar {...props} />
-          </NavigationMenuContext.Provider>
+          <NewCalendar {...props} />
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
index 179e453281cd6..ce0f62b585f20 100644
--- a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
@@ -45,6 +45,7 @@ exports[`ImportModal Renders import modal 1`] = `
           <EuiFilePicker
             compressed={true}
             disabled={false}
+            display="large"
             initialPromptText="Select or drag and drop a file"
             onChange={[Function]}
           />
diff --git a/x-pack/legacy/plugins/ml/public/settings/calendars/list/directive.js b/x-pack/legacy/plugins/ml/public/settings/calendars/list/directive.js
index 4f16433b987d5..32085fa0e9939 100644
--- a/x-pack/legacy/plugins/ml/public/settings/calendars/list/directive.js
+++ b/x-pack/legacy/plugins/ml/public/settings/calendars/list/directive.js
@@ -16,14 +16,9 @@ import { checkGetJobsPrivilege, checkPermission } from '../../../privilege/check
 import { getMlNodeCount } from '../../../ml_nodes_check/check_ml_nodes';
 import { getCalendarManagementBreadcrumbs } from '../../breadcrumbs';
 
-import chrome from 'ui/chrome';
 import uiRoutes from 'ui/routes';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 import { I18nContext } from 'ui/i18n';
 
-import { NavigationMenuContext } from '../../../util/context_utils';
-
 const template = `
   <div class="euiSpacer euiSpacer--s" />
   <ml-calendars-list />
@@ -54,9 +49,7 @@ module.directive('mlCalendarsList', function () {
 
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <CalendarsList {...props} />
-          </NavigationMenuContext.Provider>
+          <CalendarsList {...props} />
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/directive.js b/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/directive.js
index af3ba07d1b655..1d6c72c13f9f2 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/directive.js
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/directive.js
@@ -18,14 +18,9 @@ import { checkGetJobsPrivilege, checkPermission } from 'plugins/ml/privilege/che
 import { getMlNodeCount } from 'plugins/ml/ml_nodes_check/check_ml_nodes';
 import { EditFilterList } from './edit_filter_list';
 
-import chrome from 'ui/chrome';
 import uiRoutes from 'ui/routes';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 import { I18nContext } from 'ui/i18n';
 
-import { NavigationMenuContext } from '../../../util/context_utils';
-
 const template = `
   <div class="euiSpacer euiSpacer--s" />
   <ml-edit-filter-list />
@@ -65,9 +60,7 @@ module.directive('mlEditFilterList', function ($route) {
 
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <EditFilterList {...props} />
-          </NavigationMenuContext.Provider>
+          <EditFilterList {...props} />
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/list/directive.js b/x-pack/legacy/plugins/ml/public/settings/filter_lists/list/directive.js
index 95cdebf3518f7..311bf1bcb358a 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/list/directive.js
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/list/directive.js
@@ -18,14 +18,9 @@ import { checkGetJobsPrivilege, checkPermission } from 'plugins/ml/privilege/che
 import { getMlNodeCount } from 'plugins/ml/ml_nodes_check/check_ml_nodes';
 import { FilterLists } from './filter_lists';
 
-import chrome from 'ui/chrome';
 import uiRoutes from 'ui/routes';
-import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 import { I18nContext } from 'ui/i18n';
 
-import { NavigationMenuContext } from '../../../util/context_utils';
-
 const template = `
   <div class="euiSpacer euiSpacer--s" />
   <ml-filter-lists />
@@ -55,9 +50,7 @@ module.directive('mlFilterLists', function () {
 
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <FilterLists {...props} />
-          </NavigationMenuContext.Provider>
+          <FilterLists {...props} />
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/settings/settings.js b/x-pack/legacy/plugins/ml/public/settings/settings.js
index 3e1b7d724f188..e8d2533af7f4b 100644
--- a/x-pack/legacy/plugins/ml/public/settings/settings.js
+++ b/x-pack/legacy/plugins/ml/public/settings/settings.js
@@ -22,14 +22,14 @@ import {
 
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { useNavigationMenuContext } from '../util/context_utils';
+import { useUiChromeContext } from '../contexts/ui/use_ui_chrome_context';
 import { NavigationMenu } from '../components/navigation_menu/navigation_menu';
 
 export function Settings({
   canGetFilters,
   canGetCalendars
 }) {
-  const basePath = useNavigationMenuContext().chrome.getBasePath();
+  const basePath = useUiChromeContext().getBasePath();
 
   return (
     <Fragment>
diff --git a/x-pack/legacy/plugins/ml/public/settings/settings.test.js b/x-pack/legacy/plugins/ml/public/settings/settings.test.js
index 3e7129bbc0718..0fe0a4ab50be4 100644
--- a/x-pack/legacy/plugins/ml/public/settings/settings.test.js
+++ b/x-pack/legacy/plugins/ml/public/settings/settings.test.js
@@ -5,27 +5,18 @@
  */
 
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import PropTypes from 'prop-types';
 import React from 'react';
 
-import * as ContextUtils from '../util/context_utils';
 import { Settings } from './settings';
 
-const navigationMenuMock = ContextUtils.navigationMenuMock;
-const mountOptions = {
-  context: { NavigationMenuContext: navigationMenuMock },
-  childContextTypes: { NavigationMenuContext: PropTypes.object }
-};
-
+jest.mock('../contexts/ui/use_ui_chrome_context');
 jest.mock('../components/navigation_menu/navigation_menu', () => ({
-  NavigationMenu: () => <div id="mockNavigationMenu" />
+  NavigationMenu: () => <div id="mockNavigationMenu" />,
 }));
-jest.spyOn(ContextUtils, 'useNavigationMenuContext').mockImplementation(() => navigationMenuMock);
-
 
 describe('Settings', () => {
   test('Renders settings page with all buttons enabled.', () => {
-    const wrapper = mountWithIntl(<Settings canGetFilters={true} canGetCalendars={true} />, mountOptions);
+    const wrapper = mountWithIntl(<Settings canGetFilters={true} canGetCalendars={true} />);
 
     const filterButton = wrapper
       .find('[data-test-subj="ml_filter_lists_button"]')
@@ -39,7 +30,7 @@ describe('Settings', () => {
   });
 
   test('Filter Lists button disabled if canGetFilters is false', () => {
-    const wrapper = mountWithIntl(<Settings canGetFilters={false} canGetCalendars={true} />, mountOptions);
+    const wrapper = mountWithIntl(<Settings canGetFilters={false} canGetCalendars={true} />);
 
     const filterButton = wrapper
       .find('[data-test-subj="ml_filter_lists_button"]')
@@ -53,7 +44,7 @@ describe('Settings', () => {
   });
 
   test('Calendar management button disabled if canGetCalendars is false', () => {
-    const wrapper = mountWithIntl(<Settings canGetFilters={true} canGetCalendars={false} />, mountOptions);
+    const wrapper = mountWithIntl(<Settings canGetFilters={true} canGetCalendars={false} />);
 
     const filterButton = wrapper
       .find('[data-test-subj="ml_filter_lists_button"]')
diff --git a/x-pack/legacy/plugins/ml/public/settings/settings_directive.js b/x-pack/legacy/plugins/ml/public/settings/settings_directive.js
index ab03c548f53cd..8692d903b1bd0 100644
--- a/x-pack/legacy/plugins/ml/public/settings/settings_directive.js
+++ b/x-pack/legacy/plugins/ml/public/settings/settings_directive.js
@@ -15,14 +15,11 @@ const module = uiModules.get('apps/ml', ['react']);
 import { checkFullLicense } from '../license/check_license';
 import { checkGetJobsPrivilege, checkPermission } from '../privilege/check_privilege';
 import { getMlNodeCount } from '../ml_nodes_check/check_ml_nodes';
-import { NavigationMenuContext } from '../util/context_utils';
 import { getSettingsBreadcrumbs } from './breadcrumbs';
 
 import { I18nContext } from 'ui/i18n';
-import chrome from 'ui/chrome';
 import uiRoutes from 'ui/routes';
 import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 
 const template = `
   <div class="euiSpacer euiSpacer--s" />
@@ -58,9 +55,7 @@ module.directive('mlSettings', function () {
 
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }} >
-            <Settings canGetCalendars={canGetCalendars} canGetFilters={canGetFilters} />
-          </NavigationMenuContext.Provider>
+          <Settings canGetCalendars={canGetCalendars} canGetFilters={canGetFilters} />
         </I18nContext>,
         element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_directive.js b/x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_directive.js
index d7b902709a6c7..048a8dbc4a6db 100644
--- a/x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_directive.js
+++ b/x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_directive.js
@@ -14,9 +14,7 @@ import ReactDOM from 'react-dom';
 import { uiModules } from 'ui/modules';
 const module = uiModules.get('apps/ml');
 
-import chrome from 'ui/chrome';
 import { timefilter } from 'ui/timefilter';
-import { timeHistory } from 'ui/timefilter/time_history';
 import { I18nContext } from 'ui/i18n';
 
 import '../components/controls';
@@ -24,7 +22,6 @@ import '../components/controls';
 import { severity$ } from '../components/controls/select_severity/select_severity';
 import { interval$ } from '../components/controls/select_interval/select_interval';
 import { subscribeAppStateToObservable } from '../util/app_state_utils';
-import { NavigationMenuContext } from '../util/context_utils';
 
 import { TimeSeriesExplorer } from './timeseriesexplorer';
 import { APP_STATE_ACTION } from './timeseriesexplorer_constants';
@@ -88,15 +85,13 @@ module.directive('mlTimeSeriesExplorer', function ($injector) {
 
       ReactDOM.render(
         <I18nContext>
-          <NavigationMenuContext.Provider value={{ chrome, timefilter, timeHistory }}>
-            <TimeSeriesExplorer {...{
-              appStateHandler,
-              dateFormatTz,
-              globalState,
-              timefilter,
-            }}
-            />
-          </NavigationMenuContext.Provider>
+          <TimeSeriesExplorer {...{
+            appStateHandler,
+            dateFormatTz,
+            globalState,
+            timefilter,
+          }}
+          />
         </I18nContext>,
         $element[0]
       );
diff --git a/x-pack/legacy/plugins/ml/public/util/context_utils.tsx b/x-pack/legacy/plugins/ml/public/util/context_utils.tsx
deleted file mode 100644
index 88d340bd6aa6b..0000000000000
--- a/x-pack/legacy/plugins/ml/public/util/context_utils.tsx
+++ /dev/null
@@ -1,66 +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, { useContext } from 'react';
-
-import { Chrome } from 'ui/chrome';
-import { Timefilter } from 'ui/timefilter';
-import { TimeHistory } from 'ui/timefilter/time_history';
-
-export const ChromeContext = React.createContext<Chrome>({} as Chrome);
-export const TimefilterContext = React.createContext<Timefilter>({} as Timefilter);
-export const TimeHistoryContext = React.createContext<TimeHistory>({} as TimeHistory);
-
-interface NavigationMenuContextValue {
-  chrome: Chrome;
-  timefilter: Timefilter;
-  timeHistory: TimeHistory;
-}
-export const NavigationMenuContext = React.createContext<NavigationMenuContextValue>({
-  chrome: {} as Chrome,
-  timefilter: {} as Timefilter,
-  timeHistory: {} as TimeHistory,
-});
-
-export const useNavigationMenuContext = () => {
-  return useContext(NavigationMenuContext);
-};
-
-// testing mocks
-export const chromeMock = {
-  getBasePath: () => 'basePath',
-  getUiSettingsClient: () => {
-    return {
-      get: (key: string) => {
-        switch (key) {
-          case 'dateFormat':
-          case 'timepicker:timeDefaults':
-            return {};
-          case 'timepicker:refreshIntervalDefaults':
-            return { pause: false, value: 0 };
-          default:
-            throw new Error(`Unexpected config key: ${key}`);
-        }
-      },
-    };
-  },
-} as Chrome;
-
-export const timefilterMock = ({
-  getRefreshInterval: () => '30s',
-  getTime: () => ({ from: 0, to: 0 }),
-  on: (event: string, reload: () => void) => {},
-} as unknown) as Timefilter;
-
-export const timeHistoryMock = ({
-  get: () => [{ from: 0, to: 0 }],
-} as unknown) as TimeHistory;
-
-export const navigationMenuMock = {
-  chrome: chromeMock,
-  timefilter: timefilterMock,
-  timeHistory: timeHistoryMock,
-};
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node_detail_status/index.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node_detail_status/index.js
index b9043529c9853..83bdb29406e25 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node_detail_status/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node_detail_status/index.js
@@ -15,6 +15,7 @@ export function NodeDetailStatus({ stats }) {
     transport_address: transportAddress,
     usedHeap,
     freeSpace,
+    totalSpace,
     documents,
     dataSize,
     indexCount,
@@ -24,6 +25,8 @@ export function NodeDetailStatus({ stats }) {
     isOnline,
   } = stats;
 
+  const percentSpaceUsed = (freeSpace / totalSpace) * 100;
+
   const metrics = [
     {
       label: i18n.translate('xpack.monitoring.elasticsearch.nodeDetailStatus.transportAddress', {
@@ -45,9 +48,9 @@ export function NodeDetailStatus({ stats }) {
     },
     {
       label: i18n.translate('xpack.monitoring.elasticsearch.nodeDetailStatus.freeDiskSpaceLabel', {
-        defaultMessage: 'Free Disk Space'
+        defaultMessage: 'Free Disk Space',
       }),
-      value: formatMetric(freeSpace, '0.0 b'),
+      value: formatMetric(freeSpace, '0.0 b') + ' (' + formatMetric(percentSpaceUsed, '0,0.[00]', '%', { prependSpace: false  }) + ')',
       'data-test-subj': 'freeDiskSpace'
     },
     {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js
index 40904aac2cde0..1df42256482be 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js
@@ -59,6 +59,7 @@ describe('Elasticsearch Node Summary get_node_summary handleResponse', () => {
         documents: undefined,
         dataSize: undefined,
         freeSpace: undefined,
+        totalSpace: undefined,
         usedHeap: undefined,
         nodeTypeLabel: 'Node',
         nodeTypeClass: 'fa-server',
@@ -108,7 +109,8 @@ describe('Elasticsearch Node Summary get_node_summary handleResponse', () => {
                   },
                   fs: {
                     total: {
-                      available_in_bytes: 8700
+                      available_in_bytes: 8700,
+                      total_in_bytes: 10000
                     }
                   },
                   jvm: {
@@ -135,6 +137,7 @@ describe('Elasticsearch Node Summary get_node_summary handleResponse', () => {
         documents: 11000,
         dataSize: 35000,
         freeSpace: 8700,
+        totalSpace: 10000,
         usedHeap: 33,
         nodeTypeLabel: 'Master Node',
         nodeTypeClass: 'fa-star',
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js
index a470dbc1f4ad3..c33fea9563f38 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js
@@ -44,6 +44,7 @@ export function handleResponse(clusterState, shardStats, nodeUuid) {
         documents: get(sourceStats, 'indices.docs.count'),
         dataSize: get(sourceStats, 'indices.store.size_in_bytes'),
         freeSpace: get(sourceStats, 'fs.total.available_in_bytes'),
+        totalSpace: get(sourceStats, 'fs.total.total_in_bytes'),
         usedHeap: get(sourceStats, 'jvm.mem.heap_used_percent'),
         status: i18n.translate('xpack.monitoring.es.nodes.onlineStatusLabel', {
           defaultMessage: 'Online' }),
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts
index 8976cffc8ea40..2db431af7a4a2 100644
--- a/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts
@@ -19,7 +19,7 @@ async function fetch(server: HapiServer) {
   let docs;
   try {
     ({ docs } = await taskManager.fetch({
-      query: { bool: { filter: { term: { _id: `${PLUGIN_ID}-${VIS_TELEMETRY_TASK}` } } } },
+      query: { bool: { filter: { term: { _id: `task:${PLUGIN_ID}-${VIS_TELEMETRY_TASK}` } } } },
     }));
   } catch (err) {
     const errMessage = err && err.message ? err.message : err.toString();
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/layout.ts
index e6e29e36d3648..5d824eafba271 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/layout.ts
@@ -3,6 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
+import { HeadlessChromiumDriver } from '../../../server/browsers/chromium/driver';
 import { Size, ViewZoomWidthHeight } from '../../../types';
 
 export interface PageSizeParams {
@@ -14,6 +16,15 @@ export interface PageSizeParams {
   subheadingHeight: number;
 }
 
+export interface LayoutSelectorDictionary {
+  screenshot: string;
+  renderComplete: string;
+  itemsCountAttribute: string;
+  timefilterFromAttribute: string;
+  timefilterToAttribute: string;
+  toastHeader: string;
+}
+
 export interface PdfImageSize {
   width: number;
   height?: number;
@@ -40,3 +51,10 @@ export abstract class Layout {
 
   public abstract getCssOverridesPath(): string;
 }
+
+export type LayoutInstance = Layout & {
+  // Fields that are not part of Layout: the instances
+  // independently implement these fields on their own
+  selectors: LayoutSelectorDictionary;
+  positionElements?: (browser: HeadlessChromiumDriver) => Promise<void>;
+};
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/preserve_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/preserve_layout.ts
index 39b96988ff8cf..4d3b3c71c296d 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/preserve_layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/preserve_layout.ts
@@ -6,13 +6,13 @@
 import path from 'path';
 import { Size } from '../../../types';
 import { LayoutTypes } from '../constants';
-import { Layout, PageSizeParams } from './layout';
+import { Layout, LayoutSelectorDictionary, PageSizeParams } from './layout';
 
 // We use a zoom of two to bump up the resolution of the screenshot a bit.
 const ZOOM: number = 2;
 
 export class PreserveLayout extends Layout {
-  public readonly selectors = {
+  public readonly selectors: LayoutSelectorDictionary = {
     screenshot: '[data-shared-items-container]',
     renderComplete: '[data-shared-item]',
     itemsCountAttribute: 'data-shared-items-count',
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
index c4233736f09cf..1e9e7dc280353 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
@@ -4,17 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import path from 'path';
+import { HeadlessChromiumDriver } from '../../../server/browsers/chromium/driver';
 import { EvaluateOptions, KbnServer, Size } from '../../../types';
 import { LayoutTypes } from '../constants';
-import { Layout } from './layout';
+import { Layout, LayoutSelectorDictionary } from './layout';
 import { CaptureConfig } from './types';
 
-interface BrowserClient {
-  evaluate: (evaluateOptions: EvaluateOptions) => void;
-}
-
 export class PrintLayout extends Layout {
-  public readonly selectors = {
+  public readonly selectors: LayoutSelectorDictionary = {
     screenshot: '[data-shared-item]',
     renderComplete: '[data-shared-item]',
     itemsCountAttribute: 'data-shared-items-count',
@@ -52,7 +49,7 @@ export class PrintLayout extends Layout {
     };
   }
 
-  public async positionElements(browser: BrowserClient): Promise<void> {
+  public async positionElements(browser: HeadlessChromiumDriver): Promise<void> {
     const elementSize: Size = {
       width: this.captureConfig.viewport.width / this.captureConfig.zoom,
       height: this.captureConfig.viewport.height / this.captureConfig.zoom,
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots.js b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots.ts
similarity index 66%
rename from x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots.js
rename to x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots.ts
index edec54605dbb3..6604638690a41 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots.js
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots.ts
@@ -7,31 +7,62 @@
 import * as Rx from 'rxjs';
 import { first, tap, mergeMap } from 'rxjs/operators';
 import fs from 'fs';
-import getPort from 'get-port';
 import { promisify } from 'util';
+import { i18n } from '@kbn/i18n';
 import { PLUGIN_ID } from '../../../common/constants';
 import { LevelLogger } from '../../../server/lib/level_logger';
-import { i18n } from '@kbn/i18n';
+import { KbnServer, ElementPosition } from '../../../types';
+import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../server/browsers/chromium/driver';
+import { Layout, LayoutInstance } from '../layouts/layout';
+import { HeadlessChromiumDriverFactory } from '../../../server/browsers/chromium/driver_factory';
+
+interface TimeRange {
+  from: any;
+  to: any;
+}
+
+interface AttributesMap {
+  [key: string]: any;
+}
+
+interface ElementsPositionAndAttribute {
+  position: ElementPosition;
+  attributes: AttributesMap;
+}
+
+interface ScreenShotOpts {
+  browser: HeadlessBrowser;
+  elementsPositionAndAttributes: ElementsPositionAndAttribute[];
+}
+
+interface Screenshot {
+  base64EncodedData: string;
+  title: string;
+  description: string;
+}
+
+interface TimeRangeOpts {
+  timeRange: TimeRange;
+}
 
-const fsp = {
-  readFile: promisify(fs.readFile, fs),
-};
+const fsp = { readFile: promisify(fs.readFile) };
 
-export function screenshotsObservableFactory(server) {
+export function screenshotsObservableFactory(server: KbnServer) {
   const config = server.config();
   const logger = LevelLogger.createForServer(server, [PLUGIN_ID, 'screenshots']);
 
-  const browserDriverFactory = server.plugins.reporting.browserDriverFactory;
+  const browserDriverFactory: HeadlessChromiumDriverFactory =
+    server.plugins.reporting.browserDriverFactory;
   const captureConfig = config.get('xpack.reporting.capture');
 
-  const asyncDurationLogger = async (description, promise) => {
-    const start = new Date();
+  const asyncDurationLogger = async (description: string, promise: Promise<any>) => {
+    const start: number = Date.now();
     const result = await promise;
-    logger.debug(`${description} took ${new Date() - start}ms`);
+    logger.debug(`${description} took ${Date.now() - start}ms`);
     return result;
   };
 
-  const openUrl = async (browser, url, conditionalHeaders) => {
+  const openUrl = async (browser: HeadlessBrowser, url: string, conditionalHeaders: any) => {
     const waitForSelector = '.application';
 
     await browser.open(url, {
@@ -40,11 +71,11 @@ export function screenshotsObservableFactory(server) {
     });
   };
 
-  const injectCustomCss = async (browser, layout) => {
+  const injectCustomCss = async (browser: HeadlessBrowser, layout: Layout) => {
     const filePath = layout.getCssOverridesPath();
     const buffer = await fsp.readFile(filePath);
     await browser.evaluate({
-      fn: (css) => {
+      fn: css => {
         const node = document.createElement('style');
         node.type = 'text/css';
         node.innerHTML = css; // eslint-disable-line no-unsanitized/property
@@ -54,7 +85,10 @@ export function screenshotsObservableFactory(server) {
     });
   };
 
-  const waitForElementOrItemsCountAttribute = async (browser, layout) => {
+  const waitForElementOrItemsCountAttribute = async (
+    browser: HeadlessBrowser,
+    layout: LayoutInstance
+  ) => {
     // the dashboard is using the `itemsCountAttribute` attribute to let us
     // know how many items to expect since gridster incrementally adds panels
     // we have to use this hint to wait for all of them
@@ -63,10 +97,10 @@ export function screenshotsObservableFactory(server) {
     );
   };
 
-  const checkForToastMessage = async (browser, layout) => {
+  const checkForToastMessage = async (browser: HeadlessBrowser, layout: LayoutInstance) => {
     await browser.waitForSelector(layout.selectors.toastHeader, { silent: true });
     const toastHeaderText = await browser.evaluate({
-      fn: (selector) => {
+      fn: selector => {
         const nodeList = document.querySelectorAll(selector);
         return nodeList.item(0).innerText;
       },
@@ -83,14 +117,21 @@ export function screenshotsObservableFactory(server) {
     );
   };
 
-  const getNumberOfItems = async (browser, layout) => {
+  const getNumberOfItems = async (
+    browser: HeadlessBrowser,
+    layout: LayoutInstance
+  ): Promise<number> => {
     // returns the value of the `itemsCountAttribute` if it's there, otherwise
     // we just count the number of `itemSelector`
     const itemsCount = await browser.evaluate({
       fn: (selector, countAttribute) => {
         const elementWithCount = document.querySelector(`[${countAttribute}]`);
         if (elementWithCount) {
-          return parseInt(elementWithCount.getAttribute(countAttribute));
+          const count = elementWithCount.getAttribute(countAttribute);
+          // the conditional allows count === "0", not null or undefined
+          if (count != null && count !== '') {
+            return parseInt(count, 10);
+          }
         }
 
         return document.querySelectorAll(selector).length;
@@ -100,9 +141,13 @@ export function screenshotsObservableFactory(server) {
     return itemsCount;
   };
 
-  const waitForElementsToBeInDOM = async (browser, itemsCount, layout) => {
+  const waitForElementsToBeInDOM = async (
+    browser: HeadlessBrowser,
+    itemsCount: number,
+    layout: LayoutInstance
+  ) => {
     await browser.waitFor({
-      fn: (selector) => {
+      fn: selector => {
         return document.querySelectorAll(selector).length;
       },
       args: [layout.selectors.renderComplete],
@@ -110,33 +155,38 @@ export function screenshotsObservableFactory(server) {
     });
   };
 
-  const setViewport = async (browser, itemsCount, layout) => {
+  const setViewport = async (
+    browser: HeadlessBrowser,
+    itemsCount: number,
+    layout: LayoutInstance
+  ) => {
     const viewport = layout.getViewport(itemsCount);
     await browser.setViewport(viewport);
   };
 
-  const positionElements = async (browser, layout) => {
+  const positionElements = async (browser: HeadlessBrowser, layout: LayoutInstance) => {
     if (layout.positionElements) {
+      // print layout
       await layout.positionElements(browser);
     }
   };
 
-  const waitForRenderComplete = async (browser, layout) => {
+  const waitForRenderComplete = async (browser: HeadlessBrowser, layout: LayoutInstance) => {
     await browser.evaluate({
       fn: (selector, visLoadDelay) => {
         // wait for visualizations to finish loading
-        const visualizations = document.querySelectorAll(selector);
+        const visualizations: NodeListOf<Element> = document.querySelectorAll(selector);
         const visCount = visualizations.length;
         const renderedTasks = [];
 
-        function waitForRender(visualization) {
-          return new Promise((resolve) => {
+        function waitForRender(visualization: Element) {
+          return new Promise(resolve => {
             visualization.addEventListener('renderComplete', () => resolve());
           });
         }
 
         function waitForRenderDelay() {
-          return new Promise((resolve) => {
+          return new Promise(resolve => {
             setTimeout(resolve, visLoadDelay);
           });
         }
@@ -163,12 +213,14 @@ export function screenshotsObservableFactory(server) {
         return Promise.all(renderedTasks).then(hackyWaitForVisualizations);
       },
       args: [layout.selectors.renderComplete, captureConfig.loadDelay],
-      awaitPromise: true,
     });
   };
 
-  const getTimeRange = async (browser, layout) => {
-    const timeRange = await browser.evaluate({
+  const getTimeRange = async (
+    browser: HeadlessBrowser,
+    layout: LayoutInstance
+  ): Promise<TimeRange | null> => {
+    const timeRange: TimeRange | null = await browser.evaluate({
       fn: (fromAttribute, toAttribute) => {
         const fromElement = document.querySelector(`[${fromAttribute}]`);
         const toElement = document.querySelector(`[${toAttribute}]`);
@@ -186,20 +238,23 @@ export function screenshotsObservableFactory(server) {
         return { from, to };
       },
       args: [layout.selectors.timefilterFromAttribute, layout.selectors.timefilterToAttribute],
-      returnByValue: true,
     });
     return timeRange;
   };
 
-  const getElementPositionAndAttributes = async (browser, layout) => {
+  const getElementPositionAndAttributes = async (
+    browser: HeadlessBrowser,
+    layout: LayoutInstance
+  ): Promise<ElementsPositionAndAttribute[]> => {
     const elementsPositionAndAttributes = await browser.evaluate({
       fn: (selector, attributes) => {
-        const elements = document.querySelectorAll(selector);
+        const elements: NodeListOf<Element> = document.querySelectorAll(selector);
 
         // NodeList isn't an array, just an iterator, unable to use .map/.forEach
-        const results = [];
-        for (const element of elements) {
-          const boundingClientRect = element.getBoundingClientRect();
+        const results: ElementsPositionAndAttribute[] = [];
+        for (let i = 0; i < elements.length; i++) {
+          const element = elements[i];
+          const boundingClientRect = element.getBoundingClientRect() as DOMRect;
           results.push({
             position: {
               boundingClientRect: {
@@ -214,7 +269,7 @@ export function screenshotsObservableFactory(server) {
                 y: window.scrollY,
               },
             },
-            attributes: Object.keys(attributes).reduce((result, key) => {
+            attributes: Object.keys(attributes).reduce((result: AttributesMap, key) => {
               const attribute = attributes[key];
               result[key] = element.getAttribute(attribute);
               return result;
@@ -224,13 +279,15 @@ export function screenshotsObservableFactory(server) {
         return results;
       },
       args: [layout.selectors.screenshot, { title: 'data-title', description: 'data-description' }],
-      returnByValue: true,
     });
     return elementsPositionAndAttributes;
   };
 
-  const getScreenshots = async ({ browser, elementsPositionAndAttributes }) => {
-    const screenshots = [];
+  const getScreenshots = async ({
+    browser,
+    elementsPositionAndAttributes,
+  }: ScreenShotOpts): Promise<Screenshot[]> => {
+    const screenshots: Screenshot[] = [];
     for (const item of elementsPositionAndAttributes) {
       const base64EncodedData = await asyncDurationLogger(
         'screenshot',
@@ -246,36 +303,41 @@ export function screenshotsObservableFactory(server) {
     return screenshots;
   };
 
-  return function screenshotsObservable(url, conditionalHeaders, layout, browserTimezone) {
-    return Rx.defer(async () => await getPort()).pipe(
-      mergeMap(bridgePort => {
-        logger.debug(`Creating browser driver factory`);
-        return browserDriverFactory.create({
-          bridgePort,
-          viewport: layout.getBrowserViewport(),
-          zoom: layout.getBrowserZoom(),
-          logger,
-          browserTimezone,
-        });
-      }),
-      tap(() => logger.debug('Driver factory created')),
+  return function screenshotsObservable(
+    url: string,
+    conditionalHeaders: any,
+    layout: LayoutInstance,
+    browserTimezone: string
+  ): Rx.Observable<void> {
+    logger.debug(`Creating browser driver factory`);
+
+    const create$ = browserDriverFactory.create({
+      viewport: layout.getBrowserViewport(),
+      browserTimezone,
+    });
+
+    return create$.pipe(
       mergeMap(({ driver$, exit$, message$, consoleMessage$ }) => {
-        message$.subscribe(line => {
+        logger.debug('Driver factory created');
+        message$.subscribe((line: string) => {
           logger.debug(line, ['browser']);
         });
 
-        consoleMessage$.subscribe(line => {
+        consoleMessage$.subscribe((line: string) => {
           logger.debug(line, ['browserConsole']);
         });
 
         const screenshot$ = driver$.pipe(
           tap(() => logger.debug(`opening ${url}`)),
-          mergeMap(browser => openUrl(browser, url, conditionalHeaders), browser => browser),
+          mergeMap(
+            (browser: HeadlessBrowser) => openUrl(browser, url, conditionalHeaders),
+            browser => browser
+          ),
           tap(() =>
             logger.debug('waiting for elements or items count attribute; or not found to interrupt')
           ),
           mergeMap(
-            browser =>
+            (browser: HeadlessBrowser) =>
               Rx.race(
                 Rx.from(waitForElementOrItemsCountAttribute(browser, layout)),
                 Rx.from(checkForToastMessage(browser, layout))
@@ -284,7 +346,7 @@ export function screenshotsObservableFactory(server) {
           ),
           tap(() => logger.debug('determining how many items we have')),
           mergeMap(
-            browser => getNumberOfItems(browser, layout),
+            (browser: HeadlessBrowser) => getNumberOfItems(browser, layout),
             (browser, itemsCount) => ({ browser, itemsCount })
           ),
           tap(() => logger.debug('setting viewport')),
@@ -307,10 +369,13 @@ export function screenshotsObservableFactory(server) {
           tap(() => logger.debug('positioning elements')),
           mergeMap(({ browser }) => positionElements(browser, layout), ({ browser }) => browser),
           tap(() => logger.debug('waiting for rendering to complete')),
-          mergeMap(browser => waitForRenderComplete(browser, layout), browser => browser),
+          mergeMap(
+            (browser: HeadlessBrowser) => waitForRenderComplete(browser, layout),
+            browser => browser
+          ),
           tap(() => logger.debug('rendering is complete')),
           mergeMap(
-            browser => getTimeRange(browser, layout),
+            (browser: HeadlessBrowser) => getTimeRange(browser, layout),
             (browser, timeRange) => ({ browser, timeRange })
           ),
           tap(({ timeRange }) =>
@@ -320,13 +385,16 @@ export function screenshotsObservableFactory(server) {
           ),
           mergeMap(
             ({ browser }) => getElementPositionAndAttributes(browser, layout),
-            ({ browser, timeRange }, elementsPositionAndAttributes) => {
+            (
+              { browser, timeRange }: { browser: HeadlessBrowser; timeRange: any },
+              elementsPositionAndAttributes: ElementsPositionAndAttribute[]
+            ) => {
               return { browser, timeRange, elementsPositionAndAttributes };
             }
           ),
           tap(() => logger.debug(`taking screenshots`)),
           mergeMap(
-            ({ browser, elementsPositionAndAttributes }) =>
+            ({ browser, elementsPositionAndAttributes }: ScreenShotOpts & TimeRangeOpts) =>
               getScreenshots({ browser, elementsPositionAndAttributes }),
             ({ timeRange }, screenshots) => ({ timeRange, screenshots })
           )
diff --git a/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx b/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx
index 5f542c397525e..673e371da5331 100644
--- a/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx
+++ b/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx
@@ -12,6 +12,7 @@ declare module '@elastic/eui' {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import moment from 'moment';
+import { get } from 'lodash';
 import React, { Component } from 'react';
 import chrome from 'ui/chrome';
 import { toastNotifications } from 'ui/notify';
@@ -381,19 +382,13 @@ class ReportListingUi extends Component<Props, State> {
 
   private onTableChange = ({ page }: { page: { index: number } }) => {
     const { index: pageIndex } = page;
-
-    this.setState(
-      {
-        page: pageIndex,
-      },
-      this.fetchJobs
-    );
+    this.setState(() => ({ page: pageIndex }), this.fetchJobs);
   };
 
   private fetchJobs = async () => {
     // avoid page flicker when poller is updating table - only display loading screen on first load
     if (this.isInitialJobsFetch) {
-      this.setState({ isLoading: true });
+      this.setState(() => ({ isLoading: true }));
     }
 
     let jobs: JobQueueEntry[];
@@ -419,35 +414,37 @@ class ReportListingUi extends Component<Props, State> {
         );
       }
       if (this.mounted) {
-        this.setState({ isLoading: false, jobs: [], total: 0 });
+        this.setState(() => ({ isLoading: false, jobs: [], total: 0 }));
       }
       return;
     }
 
     if (this.mounted) {
-      this.setState({
+      this.setState(() => ({
         isLoading: false,
         total,
         jobs: jobs.map(
-          (job: JobQueueEntry): Job => ({
-            id: job._id,
-            type: job._source.jobtype,
-            object_type: job._source.payload.type,
-            object_title: job._source.payload.title,
-            created_by: job._source.created_by,
-            created_at: job._source.created_at,
-            started_at: job._source.started_at,
-            completed_at: job._source.completed_at,
-            status: job._source.status,
-            statusLabel:
-              jobStatusLabelsMap.get(job._source.status as JobStatuses) || job._source.status,
-            max_size_reached: job._source.output ? job._source.output.max_size_reached : false,
-            attempts: job._source.attempts,
-            max_attempts: job._source.max_attempts,
-            csv_contains_formulas: job._source.output.csv_contains_formulas,
-          })
+          (job: JobQueueEntry): Job => {
+            const { _source: source } = job;
+            return {
+              id: job._id,
+              type: source.jobtype,
+              object_type: source.payload.type,
+              object_title: source.payload.title,
+              created_by: source.created_by,
+              created_at: source.created_at,
+              started_at: source.started_at,
+              completed_at: source.completed_at,
+              status: source.status,
+              statusLabel: jobStatusLabelsMap.get(source.status as JobStatuses) || source.status,
+              max_size_reached: source.output ? source.output.max_size_reached : false,
+              attempts: source.attempts,
+              max_attempts: source.max_attempts,
+              csv_contains_formulas: get(source, 'output.csv_contains_formulas'),
+            };
+          }
         ),
-      });
+      }));
     }
   };
 
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
index 62ec3da62f27a..49efb077dfc58 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
@@ -87,7 +87,12 @@ export class HeadlessChromiumDriverFactory {
   }: {
     viewport: IArgOptions['viewport'];
     browserTimezone: string;
-  }): Rx.Observable<any> {
+  }): Rx.Observable<{
+    driver$: Rx.Observable<HeadlessChromiumDriver>;
+    consoleMessage$: Rx.Observable<string>;
+    message$: Rx.Observable<string>;
+    exit$: Rx.Observable<never>;
+  }> {
     return Rx.Observable.create(async (observer: InnerSubscriber<any, any>) => {
       const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
       const chromiumArgs = args({
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.js b/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
similarity index 77%
rename from x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.js
rename to x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
index 6c17b4867a970..b3688464ee5a1 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.js
+++ b/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
@@ -4,11 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// @ts-ignore
 import { ensureBrowserDownloaded } from './download';
+// @ts-ignore
 import { installBrowser } from './install';
 import { LevelLogger } from '../lib/level_logger';
+import { KbnServer } from '../../types';
 
-export async function createBrowserDriverFactory(server) {
+export async function createBrowserDriverFactory(server: KbnServer) {
   const config = server.config();
   const logger = LevelLogger.createForServer(server, ['reporting', 'browser-driver']);
 
@@ -24,14 +27,20 @@ export async function createBrowserDriverFactory(server) {
   }
 
   try {
-    const browserDriverFactory = await installBrowser(logger, BROWSER_CONFIG, BROWSER_TYPE, DATA_DIR, REPORTING_TIMEOUT);
+    const browserDriverFactory = await installBrowser(
+      logger,
+      BROWSER_CONFIG,
+      BROWSER_TYPE,
+      DATA_DIR,
+      REPORTING_TIMEOUT
+    );
     logger.debug(`Browser installed at ${browserDriverFactory.binaryPath}`);
     return browserDriverFactory;
   } catch (error) {
     if (error.cause && ['EACCES', 'EEXIST'].includes(error.cause.code)) {
       logger.error(
         `Error code ${error.cause.code}: Insufficient permissions for extracting the browser archive. ` +
-        `Make sure the Kibana data directory (path.data) is owned by the same user that is running Kibana.`
+          `Make sure the Kibana data directory (path.data) is owned by the same user that is running Kibana.`
       );
     }
 
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
index 25837e96650b0..eb9cabc3a8e36 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
@@ -21,6 +21,10 @@ function formatJobObject(job) {
   };
 }
 
+const MAX_PARTIAL_ERROR_LENGTH = 1000; // 1000 of beginning, 1000 of end
+const ERROR_PARTIAL_SEPARATOR = '...';
+const MAX_ERROR_LENGTH = (MAX_PARTIAL_ERROR_LENGTH * 2) + ERROR_PARTIAL_SEPARATOR.length;
+
 function getLogger(opts, id, logLevel) {
   return (msg, err) => {
     const logger = opts.logger || function () {};
@@ -29,7 +33,26 @@ function getLogger(opts, id, logLevel) {
     const tags = ['worker', logLevel];
 
     if (err) {
-      logger(`${message}: ${err.stack  ? err.stack : err }`, tags);
+      // The error message string could be very long if it contains the request
+      // body of a request that was too large for Elasticsearch.
+      // This takes a partial version of the error message without scanning
+      // every character of the string, which would block Node.
+      const errString = `${message}: ${err.stack ? err.stack : err}`;
+      const errLength = errString.length;
+      const subStr = String.prototype.substring.bind(errString);
+      if (errLength > MAX_ERROR_LENGTH) {
+        const partialError =
+          subStr(0, MAX_PARTIAL_ERROR_LENGTH) +
+          ERROR_PARTIAL_SEPARATOR +
+          subStr(errLength - MAX_PARTIAL_ERROR_LENGTH);
+
+        logger(partialError, tags);
+        logger(
+          `A partial version of the entire error message was logged. ` +
+          `The entire error message length is: ${errLength} characters.`,
+          tags
+        );
+      }
       return;
     }
 
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
index 4784e3dc45d1c..6f41b1f2c99cd 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
@@ -24,6 +24,7 @@ import {
   getTheme,
   ChartSeriesConfigs,
   browserTimezone,
+  chartDefaultSettings,
 } from './common';
 import { AutoSizer } from '../auto_sizer';
 
@@ -68,11 +69,14 @@ export const AreaChartBaseComponent = React.memo<{
   const yTickFormatter = get('configs.axis.yTickFormatter', chartConfigs);
   const xAxisId = getAxisId(`group-${data[0].key}-x`);
   const yAxisId = getAxisId(`group-${data[0].key}-y`);
-
+  const settings = {
+    ...chartDefaultSettings,
+    ...get('configs.settings', chartConfigs),
+  };
   return chartConfigs.width && chartConfigs.height ? (
     <div style={{ height: chartConfigs.height, width: chartConfigs.width, position: 'relative' }}>
       <Chart>
-        <Settings theme={getTheme()} />
+        <Settings {...settings} theme={getTheme()} />
         {data.map(series => {
           const seriesKey = series.key;
           const seriesSpecId = getSpecId(seriesKey);
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
index f63b1699e2f4d..4408879ec729c 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
@@ -18,6 +18,7 @@ import {
   getTheme,
   ChartSeriesConfigs,
   browserTimezone,
+  chartDefaultSettings,
 } from './common';
 import { AutoSizer } from '../auto_sizer';
 
@@ -32,10 +33,13 @@ export const BarChartBaseComponent = React.memo<{
   const yTickFormatter = get('configs.axis.yTickFormatter', chartConfigs);
   const xAxisId = getAxisId(`stat-items-barchart-${data[0].key}-x`);
   const yAxisId = getAxisId(`stat-items-barchart-${data[0].key}-y`);
-
+  const settings = {
+    ...chartDefaultSettings,
+    ...get('configs.settings', chartConfigs),
+  };
   return chartConfigs.width && chartConfigs.height ? (
     <Chart>
-      <Settings rotation={90} theme={getTheme()} />
+      <Settings {...settings} theme={getTheme()} />
       {data.map(series => {
         const barSeriesKey = series.key;
         const barSeriesSpecId = getSpecId(barSeriesKey);
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
index c8646900e5250..05ca3d29dafa6 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
@@ -17,14 +17,18 @@ import {
   ScaleType,
 } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
-import { TickFormatter } from '@elastic/charts/dist/lib/series/specs';
+import { TickFormatter, Rotation, Rendering } from '@elastic/charts/dist/lib/series/specs';
 import chrome from 'ui/chrome';
 import moment from 'moment-timezone';
+import { SettingSpecProps } from '@elastic/charts/dist/specs/settings';
 
 const chartHeight = 74;
+const chartDefaultRotation: Rotation = 0;
+const chartDefaultRendering: Rendering = 'canvas';
 const FlexGroup = styled(EuiFlexGroup)`
   height: 100%;
 `;
+export type UpdateDateRange = (min: number, max: number) => void;
 
 export const ChartHolder = () => (
   <FlexGroup justifyContent="center" alignItems="center">
@@ -38,6 +42,15 @@ export const ChartHolder = () => (
   </FlexGroup>
 );
 
+export const chartDefaultSettings = {
+  rotation: chartDefaultRotation,
+  rendering: chartDefaultRendering,
+  animatedData: false,
+  showLegend: false,
+  showLegendDisplayValue: false,
+  debug: false,
+};
+
 export interface ChartData {
   x: number | string | null;
   y: number | string | null;
@@ -54,6 +67,7 @@ export interface ChartSeriesConfigs {
     xTickFormatter?: TickFormatter | undefined;
     yTickFormatter?: TickFormatter | undefined;
   };
+  settings?: Partial<SettingSpecProps>;
 }
 
 export interface ChartConfigsData {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
index 671514062e394..f9e23b2810916 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
@@ -17,17 +17,32 @@ describe('kpiHostsComponent', () => {
   const ID = 'kpiHost';
   const from = new Date('2019-06-15T06:00:00.000Z').valueOf();
   const to = new Date('2019-06-18T06:00:00.000Z').valueOf();
+  const narrowDateRange = () => {};
   describe('render', () => {
     test('it should render spinner if it is loading', () => {
       const wrapper: ShallowWrapper = shallow(
-        <KpiHostsComponent data={mockKpiHostsData} from={from} id={ID} loading={true} to={to} />
+        <KpiHostsComponent
+          data={mockKpiHostsData}
+          from={from}
+          id={ID}
+          loading={true}
+          to={to}
+          narrowDateRange={narrowDateRange}
+        />
       );
       expect(toJson(wrapper)).toMatchSnapshot();
     });
 
     test('it should render KpiHostsData', () => {
       const wrapper: ShallowWrapper = shallow(
-        <KpiHostsComponent data={mockKpiHostsData} from={from} id={ID} loading={false} to={to} />
+        <KpiHostsComponent
+          data={mockKpiHostsData}
+          from={from}
+          id={ID}
+          loading={false}
+          to={to}
+          narrowDateRange={narrowDateRange}
+        />
       );
       expect(toJson(wrapper)).toMatchSnapshot();
     });
@@ -40,6 +55,7 @@ describe('kpiHostsComponent', () => {
           id={ID}
           loading={false}
           to={to}
+          narrowDateRange={narrowDateRange}
         />
       );
       expect(toJson(wrapper)).toMatchSnapshot();
@@ -56,7 +72,16 @@ describe('kpiHostsComponent', () => {
     });
 
     beforeEach(() => {
-      shallow(<KpiHostsComponent data={data} from={from} id={ID} loading={false} to={to} />);
+      shallow(
+        <KpiHostsComponent
+          data={data}
+          from={from}
+          id={ID}
+          loading={false}
+          to={to}
+          narrowDateRange={narrowDateRange}
+        />
+      );
     });
 
     afterEach(() => {
@@ -68,7 +93,7 @@ describe('kpiHostsComponent', () => {
     });
 
     test(`it should apply correct mapping by given data type`, () => {
-      expect(mockUseKpiMatrixStatus).toBeCalledWith(mapping, data, ID, from, to);
+      expect(mockUseKpiMatrixStatus).toBeCalledWith(mapping, data, ID, from, to, narrowDateRange);
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.tsx
index b8fa63c8d55e5..c7dafa224142e 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.tsx
@@ -13,6 +13,7 @@ import { KpiHostsData, KpiHostDetailsData } from '../../../../graphql/types';
 import { StatItemsComponent, StatItemsProps, useKpiMatrixStatus } from '../../../stat_items';
 import { kpiHostsMapping } from './kpi_hosts_mapping';
 import { kpiHostDetailsMapping } from './kpi_host_details_mapping';
+import { UpdateDateRange } from '../../../charts/common';
 
 const kpiWidgetHeight = 247;
 
@@ -21,6 +22,7 @@ interface GenericKpiHostProps {
   id: string;
   loading: boolean;
   to: number;
+  narrowDateRange: UpdateDateRange;
 }
 
 interface KpiHostsProps extends GenericKpiHostProps {
@@ -43,10 +45,18 @@ export const KpiHostsComponent = ({
   loading,
   id,
   to,
+  narrowDateRange,
 }: KpiHostsProps | KpiHostDetailsProps) => {
   const mappings =
     (data as KpiHostsData).hosts !== undefined ? kpiHostsMapping : kpiHostDetailsMapping;
-  const statItemsProps: StatItemsProps[] = useKpiMatrixStatus(mappings, data, id, from, to);
+  const statItemsProps: StatItemsProps[] = useKpiMatrixStatus(
+    mappings,
+    data,
+    id,
+    from,
+    to,
+    narrowDateRange
+  );
   return loading ? (
     <FlexGroupSpinner justifyContent="center" alignItems="center">
       <EuiFlexItem grow={false}>
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/__snapshots__/index.test.tsx.snap
index 2895b3b41a3a8..912a383d09e43 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/__snapshots__/index.test.tsx.snap
@@ -35,6 +35,7 @@ exports[`KpiNetwork Component rendering it renders loading icons 1`] = `
   from={1560578400000}
   id="kpiNetwork"
   loading={true}
+  narrowDateRange={[MockFunction]}
   to={1560837600000}
 />
 `;
@@ -74,6 +75,7 @@ exports[`KpiNetwork Component rendering it renders the default widget 1`] = `
   from={1560578400000}
   id="kpiNetwork"
   loading={false}
+  narrowDateRange={[MockFunction]}
   to={1560837600000}
 />
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
index cfcbbfd682879..eb6204044bdb7 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
@@ -19,6 +19,7 @@ describe('KpiNetwork Component', () => {
   const state: State = mockGlobalState;
   const from = new Date('2019-06-15T06:00:00.000Z').valueOf();
   const to = new Date('2019-06-18T06:00:00.000Z').valueOf();
+  const narrowDateRange = jest.fn();
 
   let store = createStore(state, apolloClientObservable);
 
@@ -36,6 +37,7 @@ describe('KpiNetwork Component', () => {
             id="kpiNetwork"
             loading={true}
             to={to}
+            narrowDateRange={narrowDateRange}
           />
         </ReduxStoreProvider>
       );
@@ -52,6 +54,7 @@ describe('KpiNetwork Component', () => {
             id="kpiNetwork"
             loading={false}
             to={to}
+            narrowDateRange={narrowDateRange}
           />
         </ReduxStoreProvider>
       );
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
index 9cf34029f5433..88c895eeb8af4 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
@@ -20,6 +20,7 @@ import {
 import { KpiNetworkData } from '../../../../graphql/types';
 
 import * as i18n from './translations';
+import { UpdateDateRange } from '../../../charts/common';
 
 const kipsPerRow = 2;
 const kpiWidgetHeight = 228;
@@ -34,6 +35,7 @@ interface KpiNetworkProps {
   id: string;
   loading: boolean;
   to: number;
+  narrowDateRange: UpdateDateRange;
 }
 
 export const fieldTitleChartMapping: Readonly<StatItems[]> = [
@@ -124,14 +126,23 @@ export const KpiNetworkBaseComponent = ({
   id,
   from,
   to,
+  narrowDateRange,
 }: {
   fieldsMapping: Readonly<StatItems[]>;
   data: KpiNetworkData;
   id: string;
   from: number;
   to: number;
+  narrowDateRange: UpdateDateRange;
 }) => {
-  const statItemsProps: StatItemsProps[] = useKpiMatrixStatus(fieldsMapping, data, id, from, to);
+  const statItemsProps: StatItemsProps[] = useKpiMatrixStatus(
+    fieldsMapping,
+    data,
+    id,
+    from,
+    to,
+    narrowDateRange
+  );
 
   return (
     <EuiFlexGroup wrap>
@@ -143,7 +154,7 @@ export const KpiNetworkBaseComponent = ({
 };
 
 export const KpiNetworkComponent = React.memo<KpiNetworkProps>(
-  ({ data, from, id, loading, to }) => {
+  ({ data, from, id, loading, to, narrowDateRange }) => {
     return loading ? (
       <FlexGroup justifyContent="center" alignItems="center">
         <EuiFlexItem grow={false}>
@@ -162,6 +173,7 @@ export const KpiNetworkComponent = React.memo<KpiNetworkProps>(
                 fieldsMapping={mappingsPerLine}
                 from={from}
                 to={to}
+                narrowDateRange={narrowDateRange}
               />
             </React.Fragment>
           ))}
@@ -173,6 +185,7 @@ export const KpiNetworkComponent = React.memo<KpiNetworkProps>(
             fieldsMapping={fieldTitleChartMapping}
             from={from}
             to={to}
+            narrowDateRange={narrowDateRange}
           />
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts
index 69e14b4796fbe..d7f0686dc5b69 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts
@@ -7,6 +7,8 @@
 import { KpiNetworkData } from '../../../../graphql/types';
 import { StatItems } from '../../../stat_items';
 
+export const mockNarrowDateRange = jest.fn();
+
 export const mockData: { KpiNetwork: KpiNetworkData } = {
   KpiNetwork: {
     networkEvents: 16,
@@ -216,4 +218,5 @@ export const mockEnableChartsData = {
   id: 'statItem',
   index: 4,
   to: 1560837600000,
+  narrowDateRange: mockNarrowDateRange,
 };
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
index fb0e584d032bc..a26a654c80940 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
@@ -28,6 +28,7 @@ exports[`Stat Items Component disable charts it renders the default widget 1`] =
     id="statItems"
     index={0}
     key="mock-keys"
+    narrowDateRange={[MockFunction]}
     to={1560837600000}
   >
     <Styled(EuiFlexItem)>
@@ -271,6 +272,7 @@ exports[`Stat Items Component disable charts it renders the default widget 2`] =
     id="statItems"
     index={0}
     key="mock-keys"
+    narrowDateRange={[MockFunction]}
     to={1560837600000}
   >
     <Styled(EuiFlexItem)>
@@ -587,6 +589,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
     id="statItems"
     index={0}
     key="mock-keys"
+    narrowDateRange={[MockFunction]}
     to={1560837600000}
   >
     <Styled(EuiFlexItem)>
@@ -973,6 +976,10 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                 "xScaleType": "ordinal",
                                 "yScaleType": "linear",
                               },
+                              "settings": Object {
+                                "onElementClick": [Function],
+                                "rotation": 90,
+                              },
                             }
                           }
                         >
@@ -996,6 +1003,10 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                         "xScaleType": "ordinal",
                                         "yScaleType": "linear",
                                       },
+                                      "settings": Object {
+                                        "onElementClick": [Function],
+                                        "rotation": 90,
+                                      },
                                     }
                                   }
                                   data={
@@ -1033,6 +1044,10 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                           "xScaleType": "ordinal",
                                           "yScaleType": "linear",
                                         },
+                                        "settings": Object {
+                                          "onElementClick": [Function],
+                                          "rotation": 90,
+                                        },
                                       }
                                     }
                                     data={
@@ -1126,6 +1141,9 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                 "xScaleType": "time",
                                 "yScaleType": "linear",
                               },
+                              "settings": Object {
+                                "onBrushEnd": [MockFunction],
+                              },
                             }
                           }
                         >
@@ -1150,6 +1168,9 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                         "xScaleType": "time",
                                         "yScaleType": "linear",
                                       },
+                                      "settings": Object {
+                                        "onBrushEnd": [MockFunction],
+                                      },
                                     }
                                   }
                                   data={
@@ -1204,6 +1225,9 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                           "xScaleType": "time",
                                           "yScaleType": "linear",
                                         },
+                                        "settings": Object {
+                                          "onBrushEnd": [MockFunction],
+                                        },
                                       }
                                     }
                                     data={
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
index e171e1d853c00..b6185d7f0d12d 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
@@ -25,6 +25,7 @@ import {
   mockData,
   mockEnableChartsData,
   mockNoChartMappings,
+  mockNarrowDateRange,
 } from '../page/network/kpi_network/mock';
 import { mockGlobalState, apolloClientObservable } from '../../mock';
 import { State, createStore } from '../../store';
@@ -50,6 +51,7 @@ describe('Stat Items Component', () => {
             index={0}
             key="mock-keys"
             to={to}
+            narrowDateRange={mockNarrowDateRange}
           />
         </ReduxStoreProvider>
       ),
@@ -67,6 +69,7 @@ describe('Stat Items Component', () => {
             index={0}
             key="mock-keys"
             to={to}
+            narrowDateRange={mockNarrowDateRange}
           />
         </ReduxStoreProvider>
       ),
@@ -151,6 +154,7 @@ describe('Stat Items Component', () => {
       index: 0,
       key: 'mock-keys',
       to,
+      narrowDateRange: mockNarrowDateRange,
     };
     let wrapper: ReactWrapper;
     beforeAll(() => {
@@ -229,7 +233,8 @@ describe('useKpiMatrixStatus', () => {
       data,
       'statItem',
       from,
-      to
+      to,
+      mockNarrowDateRange
     );
 
     return (
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/index.tsx b/x-pack/legacy/plugins/siem/public/components/stat_items/index.tsx
index 3caee78ce6775..1bac959c7f688 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ScaleType, niceTimeFormatter } from '@elastic/charts';
+import { ScaleType, niceTimeFormatter, Rotation } from '@elastic/charts';
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -18,10 +18,11 @@ import { get, getOr } from 'lodash/fp';
 import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
 
+import { BrushEndListener, ElementClickListener } from '@elastic/charts/dist/state/chart_state';
 import { KpiHostsData, KpiNetworkData } from '../../graphql/types';
 import { AreaChart } from '../charts/areachart';
 import { BarChart } from '../charts/barchart';
-import { ChartConfigsData, ChartData, ChartSeriesConfigs } from '../charts/common';
+import { ChartConfigsData, ChartData, ChartSeriesConfigs, UpdateDateRange } from '../charts/common';
 import { getEmptyTagValue } from '../empty_value';
 
 import { InspectButton } from '../inspect';
@@ -62,22 +63,31 @@ export interface StatItemsProps extends StatItems {
   barChart?: ChartConfigsData[];
   from: number;
   id: string;
-
   to: number;
+  narrowDateRange: UpdateDateRange;
 }
 
 export const numberFormatter = (value: string | number): string => value.toLocaleString();
-export const areachartConfigs = (from: number, to: number) => ({
+const statItemBarchartRotation: Rotation = 90;
+
+export const areachartConfigs = (config?: {
+  xTickFormatter: (value: number) => string;
+  onBrushEnd?: BrushEndListener;
+}) => ({
   series: {
     xScaleType: ScaleType.Time,
     yScaleType: ScaleType.Linear,
   },
   axis: {
-    xTickFormatter: niceTimeFormatter([from, to]),
+    xTickFormatter: get('xTickFormatter', config),
     yTickFormatter: numberFormatter,
   },
+  settings: {
+    onBrushEnd: getOr(() => {}, 'onBrushEnd', config),
+  },
 });
-export const barchartConfigs = {
+
+export const barchartConfigs = (config?: { onElementClick?: ElementClickListener }) => ({
   series: {
     xScaleType: ScaleType.Ordinal,
     yScaleType: ScaleType.Linear,
@@ -85,7 +95,11 @@ export const barchartConfigs = {
   axis: {
     xTickFormatter: numberFormatter,
   },
-};
+  settings: {
+    onElementClick: getOr(() => {}, 'onElementClick', config),
+    rotation: statItemBarchartRotation,
+  },
+});
 
 export const addValueToFields = (
   fields: StatItem[],
@@ -137,7 +151,8 @@ export const useKpiMatrixStatus = (
   data: KpiHostsData | KpiNetworkData,
   id: string,
   from: number,
-  to: number
+  to: number,
+  narrowDateRange: UpdateDateRange
 ): StatItemsProps[] => {
   const [statItemsProps, setStatItemsProps] = useState(mappings as StatItemsProps[]);
 
@@ -153,6 +168,7 @@ export const useKpiMatrixStatus = (
           key: `kpi-summary-${stat.key}`,
           from,
           to,
+          narrowDateRange,
         };
       })
     );
@@ -174,6 +190,7 @@ export const StatItemsComponent = React.memo<StatItemsProps>(
     id,
     index,
     to,
+    narrowDateRange,
   }) => {
     const [isHover, setIsHover] = useState(false);
     const isBarChartDataAvailable =
@@ -235,13 +252,19 @@ export const StatItemsComponent = React.memo<StatItemsProps>(
           <EuiFlexGroup>
             {enableBarChart && (
               <FlexItem>
-                <BarChart barChart={barChart} configs={barchartConfigs} />
+                <BarChart barChart={barChart} configs={barchartConfigs()} />
               </FlexItem>
             )}
 
             {enableAreaChart && from != null && to != null && (
               <FlexItem>
-                <AreaChart areaChart={areaChart} configs={areachartConfigs(from, to)} />
+                <AreaChart
+                  areaChart={areaChart}
+                  configs={areachartConfigs({
+                    xTickFormatter: niceTimeFormatter([from, to]),
+                    onBrushEnd: narrowDateRange,
+                  })}
+                />
               </FlexItem>
             )}
           </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/host_details.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/host_details.tsx
index f6ad586a83b2b..271d490a003fd 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/host_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/host_details.tsx
@@ -151,6 +151,11 @@ const HostDetailsComponent = pure<HostDetailsComponentProps>(
                             refetch={refetch}
                             setQuery={setQuery}
                             to={to}
+                            narrowDateRange={(min: number, max: number) => {
+                              setTimeout(() => {
+                                setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+                              }, 500);
+                            }}
                           />
                         )}
                       </KpiHostDetailsQuery>
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
index 66352265c00e3..7040fd3dc609d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
@@ -96,6 +96,11 @@ const HostsComponent = pure<HostsComponentProps>(({ filterQuery, setAbsoluteRang
                             refetch={refetch}
                             setQuery={setQuery}
                             to={to}
+                            narrowDateRange={(min: number, max: number) => {
+                              setTimeout(() => {
+                                setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+                              }, 500);
+                            }}
                           />
                         )}
                       </KpiHostsQuery>
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/network.tsx b/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
index 3fa8cbe623d03..a0d7f6c1a444e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
@@ -85,6 +85,11 @@ const NetworkComponent = pure<NetworkComponentProps>(
                             loading={loading}
                             from={from}
                             to={to}
+                            narrowDateRange={(min: number, max: number) => {
+                              setTimeout(() => {
+                                setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+                              }, 500);
+                            }}
                           />
                         )}
                       </KpiNetworkQuery>
diff --git a/x-pack/package.json b/x-pack/package.json
index 3a0c51e881509..38d63b82672e7 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -173,7 +173,7 @@
     "@babel/runtime": "7.4.5",
     "@elastic/ctags-langserver": "^0.1.2",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "13.0.0",
+    "@elastic/eui": "13.1.1",
     "@elastic/javascript-typescript-langserver": "^0.2.1",
     "@elastic/lsp-extension": "^0.1.2",
     "@elastic/node-crypto": "^1.0.0",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 2aedea7610811..842935e9e36d7 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -481,11 +481,11 @@
     "common.ui.indexPattern.unableWriteLabel": "インデックスパターンを書き込めません！このインデックスパターンへの最新の変更を取得するにな、ページを更新してください。",
     "common.ui.indexPattern.unknownFieldErrorMessage": "インデックスパターン「{title}」のフィールド「{name}」が不明なフィールドタイプを使用しています。",
     "common.ui.indexPattern.unknownFieldHeader": "不明なフィールドタイプ {type}",
-    "common.ui.inspector.closeButton": "インスペクターを閉じる",
-    "common.ui.inspector.reqTimestampDescription": "リクエストの開始が記録された時刻です",
-    "common.ui.inspector.reqTimestampKey": "リクエストのタイムスタンプ",
-    "common.ui.inspector.title": "インスペクター",
-    "common.ui.inspector.view": "{viewName} を表示",
+    "inspector.closeButton": "インスペクターを閉じる",
+    "inspector.reqTimestampDescription": "リクエストの開始が記録された時刻です",
+    "inspector.reqTimestampKey": "リクエストのタイムスタンプ",
+    "inspector.title": "インスペクター",
+    "inspector.view": "{viewName} を表示",
     "common.ui.legacyBrowserMessage": "この Kibana インストレーションは、現在ご使用のブラウザが満たしていない厳格なセキュリティ要件が有効になっています。",
     "common.ui.legacyBrowserTitle": "ブラウザをアップグレードしてください",
     "common.ui.management.breadcrumb": "管理",
@@ -798,8 +798,8 @@
     "data.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) は、シンプルなクエリ構文とスクリプトフィールドのサポートを提供します。また、KQL はベーシックライセンス以上をご利用の場合、自動入力も提供します。KQL をオフにすると、Kibana は Lucene を使用します。",
     "data.query.queryBar.syntaxOptionsDescription.docsLinkText": "こちら",
     "data.query.queryBar.syntaxOptionsTitle": "構文オプション",
-    "kibana_react.search.searchBar.filtersButtonClickToHideTitle": "選択して表示",
-    "kibana_react.search.searchBar.filtersButtonClickToShowTitle": "選択して非表示",
+    "data.search.searchBar.searchBar.filtersButtonClickToHideTitle": "選択して表示",
+    "data.search.searchBar.searchBar.filtersButtonClickToShowTitle": "選択して非表示",
     "embeddableApi.actionPanel.title": "オプション",
     "embeddableApi.actions.applyFilterActionTitle": "現在のビューにフィルターを適用",
     "embeddableApi.addPanel.createNew": "新規 {factoryName} を作成",
@@ -1568,7 +1568,6 @@
     "kbn.docTable.tableHeader.removeColumnButtonTooltip": "列を削除",
     "kbn.docTable.tableHeader.sortByColumnAscendingAriaLabel": "{columnName} を昇順に並べ替える",
     "kbn.docTable.tableHeader.sortByColumnDescendingAriaLabel": "{columnName} を降順に並べ替える",
-    "kbn.docTable.tableHeader.sortByColumnTooltip": "{columnName} で並べ替えます",
     "kbn.docTable.tableRow.detailHeading": "拡張ドキュメント",
     "kbn.docTable.tableRow.filterForValueButtonAriaLabel": "値でフィルタリング",
     "kbn.docTable.tableRow.filterForValueButtonTooltip": "値でフィルタリング",
@@ -5248,7 +5247,6 @@
     "xpack.infra.sourceConfiguration.noLogColumnsTitle": "列がありません",
     "xpack.infra.sourceConfiguration.podFieldDescription": "Kubernetes ポッドの識別に使用されるフィールドです。推奨値は {defaultValue} です。",
     "xpack.infra.sourceConfiguration.podFieldLabel": "ポッド ID",
-    "xpack.infra.sourceConfiguration.removeLogColumnButtonLabel": "この列を削除",
     "xpack.infra.sourceConfiguration.sourceConfigurationButtonLabel": "構成",
     "xpack.infra.sourceConfiguration.sourceConfigurationIndicesTabTitle": "インデックスとフィールド",
     "xpack.infra.sourceConfiguration.sourceConfigurationLogColumnsTabTitle": "ログ列",
@@ -5995,7 +5993,7 @@
     "xpack.ml.dataframe.stepCreateForm.transformListCardTitle": "データフレームジョブ",
     "xpack.ml.dataframe.stepCreateForm.progressErrorMessage": "進捗パーセンテージの取得中にエラーが発生しました: {error}",
     "xpack.ml.dataframe.stepCreateForm.progressTitle": "進捗",
-    "xpack.ml.dataframe.stepCreateForm.reateIndexPatternSuccessMessage": "Kibana インデックスパターン {indexPatternName} が作成されました",
+    "xpack.ml.dataframe.stepCreateForm.createIndexPatternSuccessMessage": "Kibana インデックスパターン {indexPatternName} が作成されました",
     "xpack.ml.dataframe.stepCreateForm.startDataFrameButton": "開始",
     "xpack.ml.dataframe.stepCreateForm.startDataFrameDescription": "データフレームジョブを開始します。データフレームジョブは、クラスターの検索とインデックスによる負荷を増やします。過剰な負荷が生じた場合はジョブを停止してください。ジョブの開始後、データフレームジョブの閲覧を続けるオプションが提供されます。",
     "xpack.ml.dataframe.stepCreateForm.startTransformErrorMessage": "データフレームジョブ {transformId} の開始中にエラーが発生しました: {error}",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 2f43aeabcd5f2..0deb7cc87f56b 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -481,11 +481,11 @@
     "common.ui.indexPattern.unableWriteLabel": "无法写入索引模式！请刷新页面以获取此索引模式的最新更改。",
     "common.ui.indexPattern.unknownFieldErrorMessage": "indexPattern “{title}” 中的字段 “{name}” 使用未知字段类型。",
     "common.ui.indexPattern.unknownFieldHeader": "未知字段类型 {type}",
-    "common.ui.inspector.closeButton": "关闭检查器",
-    "common.ui.inspector.reqTimestampDescription": "记录请求启动的时间",
-    "common.ui.inspector.reqTimestampKey": "请求时间戳",
-    "common.ui.inspector.title": "检查器",
-    "common.ui.inspector.view": "视图：{viewName}",
+    "inspector.closeButton": "关闭检查器",
+    "inspector.reqTimestampDescription": "记录请求启动的时间",
+    "inspector.reqTimestampKey": "请求时间戳",
+    "inspector.title": "检查器",
+    "inspector.view": "视图：{viewName}",
     "common.ui.legacyBrowserMessage": "此 Kibana 安装启用了当前浏览器未满足的严格安全要求。",
     "common.ui.legacyBrowserTitle": "请升级您的浏览器",
     "common.ui.management.breadcrumb": "管理",
@@ -798,8 +798,8 @@
     "data.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) 提供简化查询语法并支持脚本字段。如果您具有基本许可或更高级别的许可，KQL 还提供自动填充功能。如果关闭 KQL，Kibana 将使用 Lucene。",
     "data.query.queryBar.syntaxOptionsDescription.docsLinkText": "此处",
     "data.query.queryBar.syntaxOptionsTitle": "语法选项",
-    "kibana_react.search.searchBar.filtersButtonClickToHideTitle": "选择以显示",
-    "kibana_react.search.searchBar.filtersButtonClickToShowTitle": "选择以隐藏",
+    "data.search.searchBar.searchBar.filtersButtonClickToHideTitle": "选择以显示",
+    "data.search.searchBar.searchBar.filtersButtonClickToShowTitle": "选择以隐藏",
     "embeddableApi.actionPanel.title": "选项",
     "embeddableApi.actions.applyFilterActionTitle": "将筛选应用于当前视图",
     "embeddableApi.addPanel.createNew": "创建新的{factoryName}",
@@ -1568,7 +1568,6 @@
     "kbn.docTable.tableHeader.removeColumnButtonTooltip": "删除列",
     "kbn.docTable.tableHeader.sortByColumnAscendingAriaLabel": "升序排序 {columnName}",
     "kbn.docTable.tableHeader.sortByColumnDescendingAriaLabel": "降序排序 {columnName}",
-    "kbn.docTable.tableHeader.sortByColumnTooltip": "按“{columnName}”排序",
     "kbn.docTable.tableRow.detailHeading": "已展开文档",
     "kbn.docTable.tableRow.filterForValueButtonAriaLabel": "筛留值",
     "kbn.docTable.tableRow.filterForValueButtonTooltip": "筛留值",
@@ -5390,7 +5389,6 @@
     "xpack.infra.sourceConfiguration.noLogColumnsTitle": "无列",
     "xpack.infra.sourceConfiguration.podFieldDescription": "用于标识 Kubernetes Pod 的字段。推荐值为 {defaultValue}。",
     "xpack.infra.sourceConfiguration.podFieldLabel": "Pod ID",
-    "xpack.infra.sourceConfiguration.removeLogColumnButtonLabel": "移除此列",
     "xpack.infra.sourceConfiguration.sourceConfigurationButtonLabel": "配置",
     "xpack.infra.sourceConfiguration.sourceConfigurationIndicesTabTitle": "索引和字段",
     "xpack.infra.sourceConfiguration.sourceConfigurationLogColumnsTabTitle": "日志列",
@@ -6137,7 +6135,7 @@
     "xpack.ml.dataframe.stepCreateForm.transformListCardTitle": "数据帧作业",
     "xpack.ml.dataframe.stepCreateForm.progressErrorMessage": "获取进度百分比时出错：{error}",
     "xpack.ml.dataframe.stepCreateForm.progressTitle": "进度",
-    "xpack.ml.dataframe.stepCreateForm.reateIndexPatternSuccessMessage": "Kibana 索引模式 {indexPatternName} 成功创建。",
+    "xpack.ml.dataframe.stepCreateForm.createIndexPatternSuccessMessage": "Kibana 索引模式 {indexPatternName} 成功创建。",
     "xpack.ml.dataframe.stepCreateForm.startDataFrameButton": "开始",
     "xpack.ml.dataframe.stepCreateForm.startDataFrameDescription": "启动数据帧作业。数据帧作业将增加集群的搜索和索引负荷。如果负荷超载，请停止作业。作业启动后，系统将为您提供继续浏览数据帧作业的选项。",
     "xpack.ml.dataframe.stepCreateForm.startTransformErrorMessage": "启动数据帧作业 {transformId} 时发生错误：{error}",
diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts
index 0b389a40a8b27..7eefbe46175b2 100644
--- a/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts
+++ b/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function emailTest({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function emailTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -23,15 +22,15 @@ export default function emailTest({ getService }: KibanaFunctionalTestDefaultPro
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'An email action',
-            actionTypeId: '.email',
-            actionTypeConfig: {
-              service: '__json',
-              user: 'bob',
-              password: 'supersecret',
-              from: 'bob@example.com',
-            },
+          description: 'An email action',
+          actionTypeId: '.email',
+          config: {
+            service: '__json',
+            from: 'bob@example.com',
+          },
+          secrets: {
+            user: 'bob',
+            password: 'supersecret',
           },
         })
         .expect(200);
@@ -48,22 +47,16 @@ export default function emailTest({ getService }: KibanaFunctionalTestDefaultPro
         .expect(200);
 
       expect(fetchedAction).to.eql({
-        type: 'action',
         id: fetchedAction.id,
-        attributes: {
-          description: 'An email action',
-          actionTypeId: '.email',
-          actionTypeConfig: {
-            from: 'bob@example.com',
-            service: '__json',
-            host: null,
-            port: null,
-            secure: null,
-          },
+        description: 'An email action',
+        actionTypeId: '.email',
+        config: {
+          from: 'bob@example.com',
+          service: '__json',
+          host: null,
+          port: null,
+          secure: null,
         },
-        references: [],
-        updated_at: fetchedAction.updated_at,
-        version: fetchedAction.version,
       });
     });
 
@@ -136,11 +129,9 @@ export default function emailTest({ getService }: KibanaFunctionalTestDefaultPro
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'An email action',
-            actionTypeId: '.email',
-            actionTypeConfig: {},
-          },
+          description: 'An email action',
+          actionTypeId: '.email',
+          config: {},
         })
         .expect(400)
         .then((resp: any) => {
@@ -148,7 +139,7 @@ export default function emailTest({ getService }: KibanaFunctionalTestDefaultPro
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'The actionTypeConfig is invalid: [user]: expected value of type [string] but got [undefined]',
+              'error validating action type config: [from]: expected value of type [string] but got [undefined]',
           });
         });
     });
diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/es_index.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/es_index.ts
index afb52d21311c7..86fe8222678a0 100644
--- a/x-pack/test/api_integration/apis/actions/builtin_action_types/es_index.ts
+++ b/x-pack/test/api_integration/apis/actions/builtin_action_types/es_index.ts
@@ -6,12 +6,11 @@
 
 import expect from '@kbn/expect';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const ES_TEST_INDEX_NAME = 'functional-test-actions-index';
 
-// eslint-disable-next-line import/no-default-export
-export default function indexTest({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function indexTest({ getService }: FtrProviderContext) {
   const es = getService('es');
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
@@ -29,11 +28,10 @@ export default function indexTest({ getService }: KibanaFunctionalTestDefaultPro
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'An index action',
-            actionTypeId: '.index',
-            actionTypeConfig: {},
-          },
+          description: 'An index action',
+          actionTypeId: '.index',
+          config: {},
+          secrets: {},
         })
         .expect(200);
 
@@ -46,16 +44,10 @@ export default function indexTest({ getService }: KibanaFunctionalTestDefaultPro
         .expect(200);
 
       expect(fetchedAction).to.eql({
-        type: 'action',
         id: fetchedAction.id,
-        attributes: {
-          description: 'An index action',
-          actionTypeId: '.index',
-          actionTypeConfig: { index: null },
-        },
-        references: [],
-        updated_at: fetchedAction.updated_at,
-        version: fetchedAction.version,
+        description: 'An index action',
+        actionTypeId: '.index',
+        config: { index: null },
       });
 
       // create action with index config
@@ -63,12 +55,10 @@ export default function indexTest({ getService }: KibanaFunctionalTestDefaultPro
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'An index action with index config',
-            actionTypeId: '.index',
-            actionTypeConfig: {
-              index: ES_TEST_INDEX_NAME,
-            },
+          description: 'An index action with index config',
+          actionTypeId: '.index',
+          config: {
+            index: ES_TEST_INDEX_NAME,
           },
         })
         .expect(200);
@@ -82,18 +72,12 @@ export default function indexTest({ getService }: KibanaFunctionalTestDefaultPro
         .expect(200);
 
       expect(fetchedActionWithIndex).to.eql({
-        type: 'action',
         id: fetchedActionWithIndex.id,
-        attributes: {
-          description: 'An index action with index config',
-          actionTypeId: '.index',
-          actionTypeConfig: {
-            index: ES_TEST_INDEX_NAME,
-          },
+        description: 'An index action with index config',
+        actionTypeId: '.index',
+        config: {
+          index: ES_TEST_INDEX_NAME,
         },
-        references: [],
-        updated_at: fetchedActionWithIndex.updated_at,
-        version: fetchedActionWithIndex.version,
       });
     });
 
@@ -102,11 +86,9 @@ export default function indexTest({ getService }: KibanaFunctionalTestDefaultPro
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'An index action',
-            actionTypeId: '.index',
-            actionTypeConfig: { index: 666 },
-          },
+          description: 'An index action',
+          actionTypeId: '.index',
+          config: { index: 666 },
         })
         .expect(400)
         .then((resp: any) => {
@@ -114,7 +96,7 @@ export default function indexTest({ getService }: KibanaFunctionalTestDefaultPro
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'The actionTypeConfig is invalid: [index]: types that failed validation:\n- [index.0]: expected value of type [string] but got [number]\n- [index.1]: expected value to equal [null] but got [666]',
+              'error validating action type config: [index]: types that failed validation:\n- [index.0]: expected value of type [string] but got [number]\n- [index.1]: expected value to equal [null] but got [666]',
           });
         });
     });
@@ -222,7 +204,7 @@ export default function indexTest({ getService }: KibanaFunctionalTestDefaultPro
       result = response.body;
       expect(result.status).to.equal('error');
       expect(result.message).to.eql(
-        'The actionParams is invalid: [indeX]: definition for this key is missing'
+        'error validating action params: [indeX]: definition for this key is missing'
       );
 
       response = await supertest
diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/server_log.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/server_log.ts
index 9c50e0ab3ca1c..6f2e1c46d2968 100644
--- a/x-pack/test/api_integration/apis/actions/builtin_action_types/server_log.ts
+++ b/x-pack/test/api_integration/apis/actions/builtin_action_types/server_log.ts
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function serverLogTest({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function serverLogTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -23,11 +22,8 @@ export default function serverLogTest({ getService }: KibanaFunctionalTestDefaul
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'A server.log action',
-            actionTypeId: '.server-log',
-            actionTypeConfig: {},
-          },
+          description: 'A server.log action',
+          actionTypeId: '.server-log',
         })
         .expect(200);
 
@@ -43,16 +39,10 @@ export default function serverLogTest({ getService }: KibanaFunctionalTestDefaul
         .expect(200);
 
       expect(fetchedAction).to.eql({
-        type: 'action',
         id: fetchedAction.id,
-        attributes: {
-          description: 'A server.log action',
-          actionTypeId: '.server-log',
-          actionTypeConfig: {},
-        },
-        references: [],
-        updated_at: fetchedAction.updated_at,
-        version: fetchedAction.version,
+        description: 'A server.log action',
+        actionTypeId: '.server-log',
+        config: {},
       });
     });
 
diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts
index 89a3990617efa..4eea6adb67589 100644
--- a/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts
+++ b/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts
@@ -6,12 +6,11 @@
 
 import expect from '@kbn/expect';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 import { SLACK_ACTION_SIMULATOR_URI } from '../../../fixtures/plugins/actions';
 
-// eslint-disable-next-line import/no-default-export
-export default function slackTest({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function slackTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -33,12 +32,10 @@ export default function slackTest({ getService }: KibanaFunctionalTestDefaultPro
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'A slack action',
-            actionTypeId: '.slack',
-            actionTypeConfig: {
-              webhookUrl: 'http://example.com',
-            },
+          description: 'A slack action',
+          actionTypeId: '.slack',
+          secrets: {
+            webhookUrl: 'http://example.com',
           },
         })
         .expect(200);
@@ -54,16 +51,10 @@ export default function slackTest({ getService }: KibanaFunctionalTestDefaultPro
         .expect(200);
 
       expect(fetchedAction).to.eql({
-        type: 'action',
         id: fetchedAction.id,
-        attributes: {
-          description: 'A slack action',
-          actionTypeId: '.slack',
-          actionTypeConfig: {},
-        },
-        references: [],
-        updated_at: fetchedAction.updated_at,
-        version: fetchedAction.version,
+        description: 'A slack action',
+        actionTypeId: '.slack',
+        config: {},
       });
     });
 
@@ -72,11 +63,9 @@ export default function slackTest({ getService }: KibanaFunctionalTestDefaultPro
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'A slack action',
-            actionTypeId: '.slack',
-            actionTypeConfig: {},
-          },
+          description: 'A slack action',
+          actionTypeId: '.slack',
+          secrets: {},
         })
         .expect(400)
         .then((resp: any) => {
@@ -84,7 +73,7 @@ export default function slackTest({ getService }: KibanaFunctionalTestDefaultPro
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'The actionTypeConfig is invalid: [webhookUrl]: expected value of type [string] but got [undefined]',
+              'error validating action type secrets: [webhookUrl]: expected value of type [string] but got [undefined]',
           });
         });
     });
@@ -94,12 +83,10 @@ export default function slackTest({ getService }: KibanaFunctionalTestDefaultPro
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'A slack simulator',
-            actionTypeId: '.slack',
-            actionTypeConfig: {
-              webhookUrl: slackSimulatorURL,
-            },
+          description: 'A slack simulator',
+          actionTypeId: '.slack',
+          secrets: {
+            webhookUrl: slackSimulatorURL,
           },
         })
         .expect(200);
diff --git a/x-pack/test/api_integration/apis/actions/constants.ts b/x-pack/test/api_integration/apis/actions/constants.ts
index d73977c26ca94..b7c391507dcc2 100644
--- a/x-pack/test/api_integration/apis/actions/constants.ts
+++ b/x-pack/test/api_integration/apis/actions/constants.ts
@@ -4,4 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const ES_ARCHIVER_ACTION_ID = '19cfba7c-711a-4170-8590-9a99a281e85c';
+export const ES_ARCHIVER_ACTION_ID = '60071910-1ef1-4a72-9a68-b94af6a836a7';
+export const SPACE_1_ES_ARCHIVER_ACTION_ID = '6c7d0f6b-2fb5-4821-b182-624fc3ccc7a3';
diff --git a/x-pack/test/api_integration/apis/actions/create.ts b/x-pack/test/api_integration/apis/actions/create.ts
index 2d37682e57c7c..a443cab072c5b 100644
--- a/x-pack/test/api_integration/apis/actions/create.ts
+++ b/x-pack/test/api_integration/apis/actions/create.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function createActionTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function createActionTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -20,13 +19,13 @@ export default function createActionTests({ getService }: KibanaFunctionalTestDe
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'My action',
-            actionTypeId: 'test.index-record',
-            actionTypeConfig: {
-              unencrypted: `This value shouldn't get encrypted`,
-              encrypted: 'This value should be encrypted',
-            },
+          description: 'My action',
+          actionTypeId: 'test.index-record',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 'This value should be encrypted',
           },
         })
         .expect(200)
@@ -38,83 +37,77 @@ export default function createActionTests({ getService }: KibanaFunctionalTestDe
         });
     });
 
-    it(`should return 400 when action type isn't registered`, async () => {
-      await supertest
-        .post('/api/action')
+    it('should return 200 when creating an action inside a space and to not be accessible from another space', async () => {
+      const { body: createdAction } = await supertest
+        .post('/s/space_1/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'My action',
-            actionTypeId: 'test.unregistered-action-type',
-            actionTypeConfig: {},
+          description: 'My action',
+          actionTypeId: 'test.index-record',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 'This value should be encrypted',
           },
         })
-        .expect(400)
-        .then((resp: any) => {
-          expect(resp.body).to.eql({
-            statusCode: 400,
-            error: 'Bad Request',
-            message: 'Action type "test.unregistered-action-type" is not registered.',
-          });
-        });
+        .expect(200);
+      expect(createdAction).to.eql({
+        id: createdAction.id,
+      });
+      expect(typeof createdAction.id).to.be('string');
+      await supertest.get(`/s/space_1/api/action/${createdAction.id}`).expect(200);
+      await supertest.get(`/api/action/${createdAction.id}`).expect(404);
     });
 
-    it('should return 400 when payload is empty and invalid', async () => {
+    it(`should return 400 when action type isn't registered`, async () => {
       await supertest
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
-        .send({})
+        .send({
+          description: 'My action',
+          actionTypeId: 'test.unregistered-action-type',
+          config: {},
+        })
         .expect(400)
         .then((resp: any) => {
           expect(resp.body).to.eql({
             statusCode: 400,
             error: 'Bad Request',
-            message: 'child "attributes" fails because ["attributes" is required]',
-            validation: {
-              source: 'payload',
-              keys: ['attributes'],
-            },
+            message: 'Action type "test.unregistered-action-type" is not registered.',
           });
         });
     });
 
-    it('should return 400 when payload attributes are empty and invalid', async () => {
+    it('should return 400 when payload is empty and invalid', async () => {
       await supertest
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
-        .send({
-          attributes: {},
-        })
+        .send({})
         .expect(400)
         .then((resp: any) => {
           expect(resp.body).to.eql({
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'child "attributes" fails because [child "description" fails because ["description" is required], child "actionTypeId" fails because ["actionTypeId" is required], child "actionTypeConfig" fails because ["actionTypeConfig" is required]]',
+              'child "description" fails because ["description" is required]. child "actionTypeId" fails because ["actionTypeId" is required]',
             validation: {
               source: 'payload',
-              keys: [
-                'attributes.description',
-                'attributes.actionTypeId',
-                'attributes.actionTypeConfig',
-              ],
+              keys: ['description', 'actionTypeId'],
             },
           });
         });
     });
 
-    it(`should return 400 when actionTypeConfig isn't valid`, async () => {
+    it(`should return 400 when config isn't valid`, async () => {
       await supertest
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'my description',
-            actionTypeId: 'test.index-record',
-            actionTypeConfig: {
-              unencrypted: 'my unencrypted text',
-            },
+          description: 'my description',
+          actionTypeId: 'test.index-record',
+          config: {
+            unencrypted: 'my unencrypted text',
           },
         })
         .expect(400)
@@ -123,7 +116,7 @@ export default function createActionTests({ getService }: KibanaFunctionalTestDe
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'The actionTypeConfig is invalid: [encrypted]: expected value of type [string] but got [undefined]',
+              'error validating action type secrets: [encrypted]: expected value of type [string] but got [undefined]',
           });
         });
     });
diff --git a/x-pack/test/api_integration/apis/actions/delete.ts b/x-pack/test/api_integration/apis/actions/delete.ts
index 92e513ea6f2b6..25d6c06ace2af 100644
--- a/x-pack/test/api_integration/apis/actions/delete.ts
+++ b/x-pack/test/api_integration/apis/actions/delete.ts
@@ -6,11 +6,10 @@
 
 import expect from '@kbn/expect';
 
-import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function deleteActionTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function deleteActionTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -25,6 +24,20 @@ export default function deleteActionTests({ getService }: KibanaFunctionalTestDe
         .expect(204, '');
     });
 
+    it('should return 204 when deleting an action in a space', async () => {
+      await supertest
+        .delete(`/s/space_1/api/action/${SPACE_1_ES_ARCHIVER_ACTION_ID}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204, '');
+    });
+
+    it('should return 404 when deleting an action in another space', async () => {
+      await supertest
+        .delete(`/api/action/${SPACE_1_ES_ARCHIVER_ACTION_ID}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(404);
+    });
+
     it(`should return 404 when action doesn't exist`, async () => {
       await supertest
         .delete('/api/action/2')
diff --git a/x-pack/test/api_integration/apis/actions/find.ts b/x-pack/test/api_integration/apis/actions/find.ts
index 04cef99a642f7..dafb9d1eaeaf1 100644
--- a/x-pack/test/api_integration/apis/actions/find.ts
+++ b/x-pack/test/api_integration/apis/actions/find.ts
@@ -5,11 +5,10 @@
  */
 
 import expect from '@kbn/expect';
-import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function findActionTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function findActionTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -26,17 +25,33 @@ export default function findActionTests({ getService }: KibanaFunctionalTestDefa
         .then((resp: any) => {
           expect(resp.body).to.eql({
             page: 1,
-            per_page: 20,
+            perPage: 20,
             total: 1,
-            saved_objects: [
+            data: [
               {
                 id: ES_ARCHIVER_ACTION_ID,
-                type: 'action',
-                version: resp.body.saved_objects[0].version,
-                references: [],
-                attributes: {
-                  description: 'My action',
-                },
+                description: 'My action',
+              },
+            ],
+          });
+        });
+    });
+
+    it('should return 200 with individual responses in a space', async () => {
+      await supertest
+        .get(
+          '/s/space_1/api/action/_find?search=test.index-record&search_fields=actionTypeId&fields=description'
+        )
+        .expect(200)
+        .then((resp: any) => {
+          expect(resp.body).to.eql({
+            page: 1,
+            perPage: 20,
+            total: 1,
+            data: [
+              {
+                id: SPACE_1_ES_ARCHIVER_ACTION_ID,
+                description: 'My action',
               },
             ],
           });
@@ -50,20 +65,15 @@ export default function findActionTests({ getService }: KibanaFunctionalTestDefa
         .then((resp: any) => {
           expect(resp.body).to.eql({
             page: 1,
-            per_page: 20,
+            perPage: 20,
             total: 1,
-            saved_objects: [
+            data: [
               {
                 id: ES_ARCHIVER_ACTION_ID,
-                type: 'action',
-                version: resp.body.saved_objects[0].version,
-                references: [],
-                attributes: {
-                  description: 'My action',
-                  actionTypeId: 'test.index-record',
-                  actionTypeConfig: {
-                    unencrypted: `This value shouldn't get encrypted`,
-                  },
+                description: 'My action',
+                actionTypeId: 'test.index-record',
+                config: {
+                  unencrypted: `This value shouldn't get encrypted`,
                 },
               },
             ],
diff --git a/x-pack/test/api_integration/apis/actions/fire.ts b/x-pack/test/api_integration/apis/actions/fire.ts
index da92f6c2d7f64..8bdf0abd9fe1e 100644
--- a/x-pack/test/api_integration/apis/actions/fire.ts
+++ b/x-pack/test/api_integration/apis/actions/fire.ts
@@ -5,11 +5,10 @@
  */
 
 import expect from '@kbn/expect';
-import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
@@ -53,7 +52,7 @@ export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
     });
     after(() => es.indices.delete({ index: esTestIndexName }));
 
-    it('decrypts attributes and joins on actionTypeConfig when calling fire API', async () => {
+    it('decrypts attributes when calling fire API', async () => {
       await supertest
         .post(`/api/action/${ES_ARCHIVER_ACTION_ID}/_fire`)
         .set('kbn-xsrf', 'foo')
@@ -101,6 +100,8 @@ export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
         },
         config: {
           unencrypted: `This value shouldn't get encrypted`,
+        },
+        secrets: {
           encrypted: 'This value should be encrypted',
         },
         reference: 'actions-fire-1',
@@ -108,17 +109,88 @@ export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
       });
     });
 
+    it(`can't fire from another space`, async () => {
+      await supertest
+        .post(`/api/action/${SPACE_1_ES_ARCHIVER_ACTION_ID}/_fire`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          params: {
+            index: esTestIndexName,
+            reference: 'actions-fire-2',
+            message: 'Testing 123',
+          },
+        })
+        .expect(404);
+    });
+
+    it('fire works in a space', async () => {
+      await supertest
+        .post(`/s/space_1/api/action/${SPACE_1_ES_ARCHIVER_ACTION_ID}/_fire`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          params: {
+            index: esTestIndexName,
+            reference: 'actions-fire-3',
+            message: 'Testing 123',
+          },
+        })
+        .expect(200)
+        .then((resp: any) => {
+          expect(resp.body).to.be.an('object');
+        });
+      const indexedRecord = await retry.tryForTime(15000, async () => {
+        const searchResult = await es.search({
+          index: esTestIndexName,
+          body: {
+            query: {
+              bool: {
+                must: [
+                  {
+                    term: {
+                      source: 'action:test.index-record',
+                    },
+                  },
+                  {
+                    term: {
+                      reference: 'actions-fire-3',
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        });
+        expect(searchResult.hits.total.value).to.eql(1);
+        return searchResult.hits.hits[0];
+      });
+      expect(indexedRecord._source).to.eql({
+        params: {
+          index: esTestIndexName,
+          reference: 'actions-fire-3',
+          message: 'Testing 123',
+        },
+        config: {
+          unencrypted: `This value shouldn't get encrypted`,
+        },
+        secrets: {
+          encrypted: 'This value should be encrypted',
+        },
+        reference: 'actions-fire-3',
+        source: 'action:test.index-record',
+      });
+    });
+
     it('fire still works with encrypted attributes after updating an action', async () => {
       const { body: updatedAction } = await supertest
         .put(`/api/action/${ES_ARCHIVER_ACTION_ID}`)
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'My action updated',
-            actionTypeConfig: {
-              unencrypted: `This value shouldn't get encrypted`,
-              encrypted: 'This value should be encrypted',
-            },
+          description: 'My action updated',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 'This value should be encrypted',
           },
         })
         .expect(200);
@@ -131,7 +203,7 @@ export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
         .send({
           params: {
             index: esTestIndexName,
-            reference: 'actions-fire-2',
+            reference: 'actions-fire-4',
             message: 'Testing 123',
           },
         })
@@ -153,7 +225,7 @@ export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
                   },
                   {
                     term: {
-                      reference: 'actions-fire-2',
+                      reference: 'actions-fire-4',
                     },
                   },
                 ],
@@ -167,14 +239,16 @@ export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
       expect(indexedRecord._source).to.eql({
         params: {
           index: esTestIndexName,
-          reference: 'actions-fire-2',
+          reference: 'actions-fire-4',
           message: 'Testing 123',
         },
         config: {
           unencrypted: `This value shouldn't get encrypted`,
+        },
+        secrets: {
           encrypted: 'This value should be encrypted',
         },
-        reference: 'actions-fire-2',
+        reference: 'actions-fire-4',
         source: 'action:test.index-record',
       });
     });
diff --git a/x-pack/test/api_integration/apis/actions/get.ts b/x-pack/test/api_integration/apis/actions/get.ts
index 001c52a6c5294..be8df1fe076ea 100644
--- a/x-pack/test/api_integration/apis/actions/get.ts
+++ b/x-pack/test/api_integration/apis/actions/get.ts
@@ -5,11 +5,10 @@
  */
 
 import expect from '@kbn/expect';
-import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function getActionTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function getActionTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -24,15 +23,30 @@ export default function getActionTests({ getService }: KibanaFunctionalTestDefau
         .then((resp: any) => {
           expect(resp.body).to.eql({
             id: ES_ARCHIVER_ACTION_ID,
-            type: 'action',
-            references: [],
-            version: resp.body.version,
-            attributes: {
-              actionTypeId: 'test.index-record',
-              description: 'My action',
-              actionTypeConfig: {
-                unencrypted: `This value shouldn't get encrypted`,
-              },
+            actionTypeId: 'test.index-record',
+            description: 'My action',
+            config: {
+              unencrypted: `This value shouldn't get encrypted`,
+            },
+          });
+        });
+    });
+
+    it('should return 404 when finding a record in another space', async () => {
+      await supertest.get(`/api/action/${SPACE_1_ES_ARCHIVER_ACTION_ID}`).expect(404);
+    });
+
+    it('should return 200 when finding a record in a space', async () => {
+      await supertest
+        .get(`/s/space_1/api/action/${SPACE_1_ES_ARCHIVER_ACTION_ID}`)
+        .expect(200)
+        .then((resp: any) => {
+          expect(resp.body).to.eql({
+            id: SPACE_1_ES_ARCHIVER_ACTION_ID,
+            actionTypeId: 'test.index-record',
+            description: 'My action',
+            config: {
+              unencrypted: `This value shouldn't get encrypted`,
             },
           });
         });
diff --git a/x-pack/test/api_integration/apis/actions/index.ts b/x-pack/test/api_integration/apis/actions/index.ts
index 7f1f646ab041c..9a1a21cf29676 100644
--- a/x-pack/test/api_integration/apis/actions/index.ts
+++ b/x-pack/test/api_integration/apis/actions/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function actionsTests({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function actionsTests({ loadTestFile }: FtrProviderContext) {
   describe('Actions', () => {
     loadTestFile(require.resolve('./create'));
     loadTestFile(require.resolve('./delete'));
diff --git a/x-pack/test/api_integration/apis/actions/list_action_types.ts b/x-pack/test/api_integration/apis/actions/list_action_types.ts
index b1ce39d788c24..b9b04975138b5 100644
--- a/x-pack/test/api_integration/apis/actions/list_action_types.ts
+++ b/x-pack/test/api_integration/apis/actions/list_action_types.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function listActionTypesTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function listActionTypesTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('list_action_types', () => {
diff --git a/x-pack/test/api_integration/apis/actions/manual/pr_40694.js b/x-pack/test/api_integration/apis/actions/manual/pr_40694.js
index bf788eff65c71..79bd8f7c5b201 100755
--- a/x-pack/test/api_integration/apis/actions/manual/pr_40694.js
+++ b/x-pack/test/api_integration/apis/actions/manual/pr_40694.js
@@ -16,17 +16,17 @@ async function main() {
   let response;
 
   response = await httpPost('api/action', {
-    attributes: {
-      actionTypeId: '.email',
-      description: 'an email action',
-      actionTypeConfig: {
-        user: 'elastic',
-        password: 'changeme',
-        from: 'patrick.mueller@elastic.co',
-        host: 'localhost',
-        port: 80,
-        secure: false,
-      }
+    actionTypeId: '.email',
+    description: 'an email action',
+    config: {
+      from: 'patrick.mueller@elastic.co',
+      host: 'localhost',
+      port: 80,
+      secure: false,
+    },
+    secrets: {
+      user: 'elastic',
+      password: 'changeme',
     }
   });
   console.log(`result of create: ${JSON.stringify(response, null, 4)}`);
@@ -37,15 +37,15 @@ async function main() {
   console.log(`action after create: ${JSON.stringify(response, null, 4)}`);
 
   response = await httpPut(`api/action/${actionId}`, {
-    attributes: {
-      description: 'an email action',
-      actionTypeConfig: {
-        user: 'elastic',
-        password: 'changeme',
-        from: 'patrick.mueller@elastic.co',
-        service: '__json',
-      }
-    }
+    description: 'an email action',
+    config: {
+      from: 'patrick.mueller@elastic.co',
+      service: '__json',
+    },
+    secrets: {
+      user: 'elastic',
+      password: 'changeme',
+    },
   });
 
   console.log(`response from update: ${JSON.stringify(response, null, 4)}`);
diff --git a/x-pack/test/api_integration/apis/actions/update.ts b/x-pack/test/api_integration/apis/actions/update.ts
index 165dc35d69504..b077ca57ef015 100644
--- a/x-pack/test/api_integration/apis/actions/update.ts
+++ b/x-pack/test/api_integration/apis/actions/update.ts
@@ -5,11 +5,10 @@
  */
 
 import expect from '@kbn/expect';
-import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function updateActionTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function updateActionTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -22,12 +21,12 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
         .put(`/api/action/${ES_ARCHIVER_ACTION_ID}`)
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'My action updated',
-            actionTypeConfig: {
-              unencrypted: `This value shouldn't get encrypted`,
-              encrypted: 'This value should be encrypted',
-            },
+          description: 'My action updated',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 'This value should be encrypted',
           },
         })
         .expect(200)
@@ -38,26 +37,58 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
         });
     });
 
-    it('should not be able to pass null to actionTypeConfig', async () => {
+    it('should return 200 when updating a document in a space', async () => {
       await supertest
-        .put(`/api/action/${ES_ARCHIVER_ACTION_ID}`)
+        .put(`/s/space_1/api/action/${SPACE_1_ES_ARCHIVER_ACTION_ID}`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          description: 'My action updated',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 'This value should be encrypted',
+          },
+        })
+        .expect(200)
+        .then((resp: any) => {
+          expect(resp.body).to.eql({
+            id: SPACE_1_ES_ARCHIVER_ACTION_ID,
+          });
+        });
+    });
+
+    it('should return 404 when updating a document in another space', async () => {
+      await supertest
+        .put(`/api/action/${SPACE_1_ES_ARCHIVER_ACTION_ID}`)
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'My action updated',
-            actionTypeConfig: null,
+          description: 'My action updated',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+            encrypted: 'This value should be encrypted',
           },
         })
+        .expect(404);
+    });
+
+    it('should not be able to pass null config', async () => {
+      await supertest
+        .put(`/api/action/${ES_ARCHIVER_ACTION_ID}`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          description: 'My action updated',
+          config: null,
+        })
         .expect(400)
         .then((resp: any) => {
           expect(resp.body).to.eql({
             statusCode: 400,
             error: 'Bad Request',
-            message:
-              'child "attributes" fails because [child "actionTypeConfig" fails because ["actionTypeConfig" must be an object]]',
+            message: 'child "config" fails because ["config" must be an object]',
             validation: {
               source: 'payload',
-              keys: ['attributes.actionTypeConfig'],
+              keys: ['config'],
             },
           });
         });
@@ -68,12 +99,12 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
         .put(`/api/action/${ES_ARCHIVER_ACTION_ID}`)
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'My action updated',
-            actionTypeConfig: {
-              unencrypted: `This value shouldn't get encrypted`,
-              encrypted: 'This value should be encrypted',
-            },
+          description: 'My action updated',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 'This value should be encrypted',
           },
         })
         .expect(200);
@@ -85,16 +116,10 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
         .expect(200);
       expect(fetchedAction).to.eql({
         id: ES_ARCHIVER_ACTION_ID,
-        type: 'action',
-        references: [],
-        version: fetchedAction.version,
-        updated_at: fetchedAction.updated_at,
-        attributes: {
-          actionTypeId: 'test.index-record',
-          description: 'My action updated',
-          actionTypeConfig: {
-            unencrypted: `This value shouldn't get encrypted`,
-          },
+        actionTypeId: 'test.index-record',
+        description: 'My action updated',
+        config: {
+          unencrypted: `This value shouldn't get encrypted`,
         },
       });
     });
@@ -104,12 +129,12 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
         .put('/api/action/2')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'My action updated',
-            actionTypeConfig: {
-              unencrypted: `This value shouldn't get encrypted`,
-              encrypted: 'This value should be encrypted',
-            },
+          description: 'My action updated',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 'This value should be encrypted',
           },
         })
         .expect(404)
@@ -132,44 +157,23 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
           expect(resp.body).to.eql({
             statusCode: 400,
             error: 'Bad Request',
-            message: 'child "attributes" fails because ["attributes" is required]',
-            validation: { source: 'payload', keys: ['attributes'] },
-          });
-        });
-    });
-
-    it('should return 400 when payload attributes are empty and invalid', async () => {
-      await supertest
-        .put(`/api/action/${ES_ARCHIVER_ACTION_ID}`)
-        .set('kbn-xsrf', 'foo')
-        .send({
-          attributes: {},
-        })
-        .expect(400)
-        .then((resp: any) => {
-          expect(resp.body).to.eql({
-            statusCode: 400,
-            error: 'Bad Request',
-            message:
-              'child "attributes" fails because [child "description" fails because ["description" is required], child "actionTypeConfig" fails because ["actionTypeConfig" is required]]',
-            validation: {
-              source: 'payload',
-              keys: ['attributes.description', 'attributes.actionTypeConfig'],
-            },
+            message: 'child "description" fails because ["description" is required]',
+            validation: { source: 'payload', keys: ['description'] },
           });
         });
     });
 
-    it(`should return 400 when actionTypeConfig isn't valid`, async () => {
+    it(`should return 400 when secrets are not valid`, async () => {
       await supertest
         .put(`/api/action/${ES_ARCHIVER_ACTION_ID}`)
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'My action updated',
-            actionTypeConfig: {
-              unencrypted: `This value shouldn't get encrypted`,
-            },
+          description: 'My action updated',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 42,
           },
         })
         .expect(400)
@@ -178,7 +182,7 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'The actionTypeConfig is invalid: [encrypted]: expected value of type [string] but got [undefined]',
+              'error validating action type secrets: [encrypted]: expected value of type [string] but got [number]',
           });
         });
     });
@@ -191,16 +195,16 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
         .post('/api/action')
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'test email action',
-            actionTypeId: '.email',
-            actionTypeConfig: {
-              user: 'email-user',
-              password: 'email-password',
-              from: 'email-from@example.com',
-              host: 'host-is-ignored-here.example.com',
-              port: 666,
-            },
+          description: 'test email action',
+          actionTypeId: '.email',
+          config: {
+            from: 'email-from@example.com',
+            host: 'host-is-ignored-here.example.com',
+            port: 666,
+          },
+          secrets: {
+            user: 'email-user',
+            password: 'email-password',
           },
         })
         .expect(200)
@@ -213,14 +217,14 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
         .put(`/api/action/${emailActionId}`)
         .set('kbn-xsrf', 'foo')
         .send({
-          attributes: {
-            description: 'a test email action 2',
-            actionTypeConfig: {
-              user: 'email-user',
-              password: 'email-password',
-              from: 'email-from@example.com',
-              service: '__json',
-            },
+          description: 'a test email action 2',
+          config: {
+            from: 'email-from@example.com',
+            service: '__json',
+          },
+          secrets: {
+            user: 'email-user',
+            password: 'email-password',
           },
         })
         .expect(200);
diff --git a/x-pack/test/api_integration/apis/alerting/alerts.ts b/x-pack/test/api_integration/apis/alerting/alerts.ts
index 2e62602970736..6f1582eff42b6 100644
--- a/x-pack/test/api_integration/apis/alerting/alerts.ts
+++ b/x-pack/test/api_integration/apis/alerting/alerts.ts
@@ -6,11 +6,10 @@
 
 import expect from '@kbn/expect';
 import { getTestAlertData, setupEsTestIndex, destroyEsTestIndex } from './utils';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
-import { ES_ARCHIVER_ACTION_ID } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants';
 
-// eslint-disable-next-line import/no-default-export
-export default function alertTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function alertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
@@ -18,7 +17,7 @@ export default function alertTests({ getService }: KibanaFunctionalTestDefaultPr
 
   describe('alerts', () => {
     let esTestIndexName: string;
-    const createdAlertIds: string[] = [];
+    const createdAlertIds: Array<{ space: string; id: string }> = [];
 
     before(async () => {
       await destroyEsTestIndex(es);
@@ -27,9 +26,10 @@ export default function alertTests({ getService }: KibanaFunctionalTestDefaultPr
     });
     after(async () => {
       await Promise.all(
-        createdAlertIds.map(id => {
+        createdAlertIds.map(({ space, id }) => {
+          const urlPrefix = space !== 'default' ? `/s/${space}` : '';
           return supertest
-            .delete(`/api/alert/${id}`)
+            .delete(`${urlPrefix}/api/alert/${id}`)
             .set('kbn-xsrf', 'foo')
             .expect(204, '');
         })
@@ -66,7 +66,7 @@ export default function alertTests({ getService }: KibanaFunctionalTestDefaultPr
         )
         .expect(200)
         .then((resp: any) => {
-          createdAlertIds.push(resp.body.id);
+          createdAlertIds.push({ space: 'default', id: resp.body.id });
         });
       const alertTestRecord = await retry.tryForTime(15000, async () => {
         const searchResult = await es.search({
@@ -129,9 +129,11 @@ export default function alertTests({ getService }: KibanaFunctionalTestDefaultPr
       });
       expect(actionTestRecord._source).to.eql({
         config: {
-          encrypted: 'This value should be encrypted',
           unencrypted: `This value shouldn't get encrypted`,
         },
+        secrets: {
+          encrypted: 'This value should be encrypted',
+        },
         params: {
           index: esTestIndexName,
           reference: 'create-test-1',
@@ -142,6 +144,111 @@ export default function alertTests({ getService }: KibanaFunctionalTestDefaultPr
       });
     });
 
+    it('should schedule task, run alert and fire actions in a space', async () => {
+      const { body: createdAlert } = await supertest
+        .post('/s/space_1/api/alert')
+        .set('kbn-xsrf', 'foo')
+        .send(
+          getTestAlertData({
+            interval: '1s',
+            alertTypeId: 'test.always-firing',
+            alertTypeParams: {
+              index: esTestIndexName,
+              reference: 'create-test-2',
+            },
+            actions: [
+              {
+                group: 'default',
+                id: SPACE_1_ES_ARCHIVER_ACTION_ID,
+                params: {
+                  index: esTestIndexName,
+                  reference: 'create-test-2',
+                  message:
+                    'instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
+                },
+              },
+            ],
+          })
+        )
+        .expect(200);
+      createdAlertIds.push({ space: 'space_1', id: createdAlert.id });
+
+      const alertTestRecord = await retry.tryForTime(15000, async () => {
+        const searchResult = await es.search({
+          index: esTestIndexName,
+          body: {
+            query: {
+              bool: {
+                must: [
+                  {
+                    term: {
+                      source: 'alert:test.always-firing',
+                    },
+                  },
+                  {
+                    term: {
+                      reference: 'create-test-2',
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        });
+        expect(searchResult.hits.total.value).to.eql(1);
+        return searchResult.hits.hits[0];
+      });
+      expect(alertTestRecord._source).to.eql({
+        source: 'alert:test.always-firing',
+        reference: 'create-test-2',
+        state: {},
+        params: {
+          index: esTestIndexName,
+          reference: 'create-test-2',
+        },
+      });
+      const actionTestRecord = await retry.tryForTime(15000, async () => {
+        const searchResult = await es.search({
+          index: esTestIndexName,
+          body: {
+            query: {
+              bool: {
+                must: [
+                  {
+                    term: {
+                      source: 'action:test.index-record',
+                    },
+                  },
+                  {
+                    term: {
+                      reference: 'create-test-2',
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        });
+        expect(searchResult.hits.total.value).to.eql(1);
+        return searchResult.hits.hits[0];
+      });
+      expect(actionTestRecord._source).to.eql({
+        config: {
+          unencrypted: `This value shouldn't get encrypted`,
+        },
+        secrets: {
+          encrypted: 'This value should be encrypted',
+        },
+        params: {
+          index: esTestIndexName,
+          reference: 'create-test-2',
+          message: 'instanceContextValue: true, instanceStateValue: true',
+        },
+        reference: 'create-test-2',
+        source: 'action:test.index-record',
+      });
+    });
+
     it('should handle custom retry logic', async () => {
       // We'll use this start time to query tasks created after this point
       const testStart = new Date();
@@ -173,7 +280,7 @@ export default function alertTests({ getService }: KibanaFunctionalTestDefaultPr
           })
         )
         .expect(200);
-      createdAlertIds.push(createdAlert.id);
+      createdAlertIds.push({ space: 'default', id: createdAlert.id });
 
       const scheduledActionTask = await retry.tryForTime(15000, async () => {
         const searchResult = await es.search({
diff --git a/x-pack/test/api_integration/apis/alerting/constants.ts b/x-pack/test/api_integration/apis/alerting/constants.ts
index d946111ae8bbb..8289111072b38 100644
--- a/x-pack/test/api_integration/apis/alerting/constants.ts
+++ b/x-pack/test/api_integration/apis/alerting/constants.ts
@@ -4,6 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ES_ARCHIVER_ACTION_ID as ActionArchiverActionId } from '../actions/constants';
+import {
+  ES_ARCHIVER_ACTION_ID as ActionArchiverActionId,
+  SPACE_1_ES_ARCHIVER_ACTION_ID as ActionArchiverSpace1ActionId,
+} from '../actions/constants';
 
 export const ES_ARCHIVER_ACTION_ID = ActionArchiverActionId;
+export const SPACE_1_ES_ARCHIVER_ACTION_ID = ActionArchiverSpace1ActionId;
diff --git a/x-pack/test/api_integration/apis/alerting/create.ts b/x-pack/test/api_integration/apis/alerting/create.ts
index 4d9bceaee0d29..356501f425dff 100644
--- a/x-pack/test/api_integration/apis/alerting/create.ts
+++ b/x-pack/test/api_integration/apis/alerting/create.ts
@@ -7,23 +7,23 @@
 import expect from '@kbn/expect';
 import { getTestAlertData } from './utils';
 import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function createAlertTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function createAlertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
 
   describe('create', () => {
-    const createdAlertIds: string[] = [];
+    const createdAlertIds: Array<{ space: string; id: string }> = [];
 
     before(() => esArchiver.load('actions/basic'));
     after(async () => {
       await Promise.all(
-        createdAlertIds.map(id => {
+        createdAlertIds.map(({ space, id }) => {
+          const urlPrefix = space !== 'default' ? `/s/${space}` : '';
           return supertest
-            .delete(`/api/alert/${id}`)
+            .delete(`${urlPrefix}/api/alert/${id}`)
             .set('kbn-xsrf', 'foo')
             .expect(204, '');
         })
@@ -45,7 +45,7 @@ export default function createAlertTests({ getService }: KibanaFunctionalTestDef
         .send(getTestAlertData())
         .expect(200)
         .then(async (resp: any) => {
-          createdAlertIds.push(resp.body.id);
+          createdAlertIds.push({ space: 'default', id: resp.body.id });
           expect(resp.body).to.eql({
             id: resp.body.id,
             actions: [
@@ -70,11 +70,46 @@ export default function createAlertTests({ getService }: KibanaFunctionalTestDef
           expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
           expect(JSON.parse(taskRecord.task.params)).to.eql({
             alertId: resp.body.id,
-            basePath: '',
+            spaceId: 'default',
           });
         });
     });
 
+    it('should return 200 when creating an alert in a space', async () => {
+      const { body: createdAlert } = await supertest
+        .post('/s/space_1/api/alert')
+        .set('kbn-xsrf', 'foo')
+        .send(getTestAlertData())
+        .expect(200);
+      createdAlertIds.push({ space: 'space_1', id: createdAlert.id });
+      expect(createdAlert).to.eql({
+        id: createdAlert.id,
+        actions: [
+          {
+            group: 'default',
+            id: ES_ARCHIVER_ACTION_ID,
+            params: {
+              message:
+                'instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
+            },
+          },
+        ],
+        enabled: true,
+        alertTypeId: 'test.noop',
+        alertTypeParams: {},
+        interval: '10s',
+        scheduledTaskId: createdAlert.scheduledTaskId,
+      });
+      expect(typeof createdAlert.scheduledTaskId).to.be('string');
+      const { _source: taskRecord } = await getScheduledTask(createdAlert.scheduledTaskId);
+      expect(taskRecord.type).to.eql('task');
+      expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
+      expect(JSON.parse(taskRecord.task.params)).to.eql({
+        alertId: createdAlert.id,
+        spaceId: 'space_1',
+      });
+    });
+
     it('should not schedule a task when creating a disabled alert', async () => {
       const { body: createdAlert } = await supertest
         .post('/api/alert')
diff --git a/x-pack/test/api_integration/apis/alerting/delete.ts b/x-pack/test/api_integration/apis/alerting/delete.ts
index a287d75c85d4c..ec661cac55543 100644
--- a/x-pack/test/api_integration/apis/alerting/delete.ts
+++ b/x-pack/test/api_integration/apis/alerting/delete.ts
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 import { getTestAlertData } from './utils';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function createDeleteTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function createDeleteTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
@@ -17,6 +16,8 @@ export default function createDeleteTests({ getService }: KibanaFunctionalTestDe
   describe('delete', () => {
     let alertId: string;
     let scheduledTaskId: string;
+    let space1AlertId: string;
+    let space1ScheduledTaskId: string;
 
     before(async () => {
       await esArchiver.load('actions/basic');
@@ -29,6 +30,15 @@ export default function createDeleteTests({ getService }: KibanaFunctionalTestDe
           alertId = resp.body.id;
           scheduledTaskId = resp.body.scheduledTaskId;
         });
+      await supertest
+        .post('/s/space_1/api/alert')
+        .set('kbn-xsrf', 'foo')
+        .send(getTestAlertData())
+        .expect(200)
+        .then((resp: any) => {
+          space1AlertId = resp.body.id;
+          space1ScheduledTaskId = resp.body.scheduledTaskId;
+        });
     });
     after(() => esArchiver.unload('actions/basic'));
 
@@ -53,5 +63,27 @@ export default function createDeleteTests({ getService }: KibanaFunctionalTestDe
       }
       expect(hasThrownError).to.eql(true);
     });
+
+    it('should return 404 when deleting an alert from another space', async () => {
+      await supertest
+        .delete(`/api/alert/${space1AlertId}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(404);
+    });
+
+    it('should return 204 when deleting an alert in a space', async () => {
+      await supertest
+        .delete(`/s/space_1/api/alert/${space1AlertId}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204, '');
+      let hasThrownError = false;
+      try {
+        await getScheduledTask(space1ScheduledTaskId);
+      } catch (e) {
+        hasThrownError = true;
+        expect(e.status).to.eql(404);
+      }
+      expect(hasThrownError).to.eql(true);
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/alerting/disable.ts b/x-pack/test/api_integration/apis/alerting/disable.ts
index 44e49f3c2d1b6..f73398674bb87 100644
--- a/x-pack/test/api_integration/apis/alerting/disable.ts
+++ b/x-pack/test/api_integration/apis/alerting/disable.ts
@@ -5,17 +5,15 @@
  */
 
 import { getTestAlertData } from './utils';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function createDisableAlertTests({
-  getService,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function createDisableAlertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
   describe('disable', () => {
-    let createdAlert: any;
+    let alertId: string;
+    let space1AlertId: string;
 
     before(async () => {
       await esArchiver.load('actions/basic');
@@ -25,13 +23,25 @@ export default function createDisableAlertTests({
         .send(getTestAlertData({ enabled: true }))
         .expect(200)
         .then((resp: any) => {
-          createdAlert = resp.body;
+          alertId = resp.body.id;
+        });
+      await supertest
+        .post('/s/space_1/api/alert')
+        .set('kbn-xsrf', 'foo')
+        .send(getTestAlertData({ enabled: true }))
+        .expect(200)
+        .then((resp: any) => {
+          space1AlertId = resp.body.id;
         });
     });
 
     after(async () => {
       await supertest
-        .delete(`/api/alert/${createdAlert.id}`)
+        .delete(`/api/alert/${alertId}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204, '');
+      await supertest
+        .delete(`/s/space_1/api/alert/${space1AlertId}`)
         .set('kbn-xsrf', 'foo')
         .expect(204, '');
       await esArchiver.unload('actions/basic');
@@ -39,7 +49,21 @@ export default function createDisableAlertTests({
 
     it('should return 204 when disabling an alert', async () => {
       await supertest
-        .post(`/api/alert/${createdAlert.id}/_disable`)
+        .post(`/api/alert/${alertId}/_disable`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204);
+    });
+
+    it('should return 404 when disabling an alert from another space', async () => {
+      await supertest
+        .post(`/api/alert/${space1AlertId}/_disable`)
+        .set('kbn-xsrf', 'foo')
+        .expect(404);
+    });
+
+    it('should return 204 when disabling an alert in a space', async () => {
+      await supertest
+        .post(`/s/space_1/api/alert/${space1AlertId}/_disable`)
         .set('kbn-xsrf', 'foo')
         .expect(204);
     });
diff --git a/x-pack/test/api_integration/apis/alerting/enable.ts b/x-pack/test/api_integration/apis/alerting/enable.ts
index 5222ea14b28e7..da58080499c66 100644
--- a/x-pack/test/api_integration/apis/alerting/enable.ts
+++ b/x-pack/test/api_integration/apis/alerting/enable.ts
@@ -5,17 +5,15 @@
  */
 
 import { getTestAlertData } from './utils';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function createEnableAlertTests({
-  getService,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function createEnableAlertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
   describe('enable', () => {
-    let createdAlert: any;
+    let alertId: string;
+    let space1AlertId: string;
 
     before(async () => {
       await esArchiver.load('actions/basic');
@@ -25,13 +23,25 @@ export default function createEnableAlertTests({
         .send(getTestAlertData({ enabled: false }))
         .expect(200)
         .then((resp: any) => {
-          createdAlert = resp.body;
+          alertId = resp.body.id;
+        });
+      await supertest
+        .post('/s/space_1/api/alert')
+        .set('kbn-xsrf', 'foo')
+        .send(getTestAlertData({ enabled: false }))
+        .expect(200)
+        .then((resp: any) => {
+          space1AlertId = resp.body.id;
         });
     });
 
     after(async () => {
       await supertest
-        .delete(`/api/alert/${createdAlert.id}`)
+        .delete(`/api/alert/${alertId}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204, '');
+      await supertest
+        .delete(`/s/space_1/api/alert/${space1AlertId}`)
         .set('kbn-xsrf', 'foo')
         .expect(204, '');
       await esArchiver.unload('actions/basic');
@@ -39,7 +49,21 @@ export default function createEnableAlertTests({
 
     it('should return 204 when enabling an alert', async () => {
       await supertest
-        .post(`/api/alert/${createdAlert.id}/_enable`)
+        .post(`/api/alert/${alertId}/_enable`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204);
+    });
+
+    it('should return 404 when enabling an alert from another space', async () => {
+      await supertest
+        .post(`/api/alert/${space1AlertId}/_enable`)
+        .set('kbn-xsrf', 'foo')
+        .expect(404);
+    });
+
+    it('should return 204 when enabling an alert in a space', async () => {
+      await supertest
+        .post(`/s/space_1/api/alert/${space1AlertId}/_enable`)
         .set('kbn-xsrf', 'foo')
         .expect(204);
     });
diff --git a/x-pack/test/api_integration/apis/alerting/find.ts b/x-pack/test/api_integration/apis/alerting/find.ts
index f01b9900e2e13..59b9a42490fe5 100644
--- a/x-pack/test/api_integration/apis/alerting/find.ts
+++ b/x-pack/test/api_integration/apis/alerting/find.ts
@@ -7,15 +7,15 @@
 import expect from '@kbn/expect';
 import { getTestAlertData } from './utils';
 import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function createFindTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function createFindTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
   describe('find', () => {
     let alertId: string;
+    let space1AlertId: string;
 
     before(async () => {
       await esArchiver.load('actions/basic');
@@ -27,12 +27,24 @@ export default function createFindTests({ getService }: KibanaFunctionalTestDefa
         .then((resp: any) => {
           alertId = resp.body.id;
         });
+      await supertest
+        .post('/s/space_1/api/alert')
+        .set('kbn-xsrf', 'foo')
+        .send(getTestAlertData())
+        .expect(200)
+        .then((resp: any) => {
+          space1AlertId = resp.body.id;
+        });
     });
     after(async () => {
       await supertest
         .delete(`/api/alert/${alertId}`)
         .set('kbn-xsrf', 'foo')
         .expect(204, '');
+      await supertest
+        .delete(`/s/space_1/api/alert/${space1AlertId}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204, '');
       await esArchiver.unload('actions/basic');
     });
 
@@ -41,7 +53,11 @@ export default function createFindTests({ getService }: KibanaFunctionalTestDefa
         .get('/api/alert/_find')
         .expect(200)
         .then((resp: any) => {
-          const match = resp.body.find((obj: any) => obj.id === alertId);
+          const body = resp.body;
+          expect(body.page).to.equal(1);
+          expect(body.perPage).to.be.greaterThan(0);
+          expect(body.total).to.be.greaterThan(0);
+          const match = body.data.find((obj: any) => obj.id === alertId);
           expect(match).to.eql({
             id: alertId,
             alertTypeId: 'test.noop',
@@ -62,5 +78,32 @@ export default function createFindTests({ getService }: KibanaFunctionalTestDefa
           });
         });
     });
+
+    it('should return 200 when finding alerts in a space', async () => {
+      await supertest
+        .get('/s/space_1/api/alert/_find')
+        .expect(200)
+        .then((resp: any) => {
+          const match = resp.body.data.find((obj: any) => obj.id === space1AlertId);
+          expect(match).to.eql({
+            id: space1AlertId,
+            alertTypeId: 'test.noop',
+            interval: '10s',
+            enabled: true,
+            actions: [
+              {
+                group: 'default',
+                id: ES_ARCHIVER_ACTION_ID,
+                params: {
+                  message:
+                    'instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
+                },
+              },
+            ],
+            alertTypeParams: {},
+            scheduledTaskId: match.scheduledTaskId,
+          });
+        });
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/alerting/get.ts b/x-pack/test/api_integration/apis/alerting/get.ts
index d201307949f57..8f2dffe37e335 100644
--- a/x-pack/test/api_integration/apis/alerting/get.ts
+++ b/x-pack/test/api_integration/apis/alerting/get.ts
@@ -7,15 +7,15 @@
 import expect from '@kbn/expect';
 import { getTestAlertData } from './utils';
 import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function createGetTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function createGetTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
   describe('get', () => {
     let alertId: string;
+    let space1AlertId: string;
 
     before(async () => {
       await esArchiver.load('actions/basic');
@@ -27,12 +27,24 @@ export default function createGetTests({ getService }: KibanaFunctionalTestDefau
         .then((resp: any) => {
           alertId = resp.body.id;
         });
+      await supertest
+        .post('/s/space_1/api/alert')
+        .set('kbn-xsrf', 'foo')
+        .send(getTestAlertData())
+        .expect(200)
+        .then((resp: any) => {
+          space1AlertId = resp.body.id;
+        });
     });
     after(async () => {
       await supertest
         .delete(`/api/alert/${alertId}`)
         .set('kbn-xsrf', 'foo')
         .expect(204, '');
+      await supertest
+        .delete(`/s/space_1/api/alert/${space1AlertId}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204, '');
       await esArchiver.unload('actions/basic');
     });
 
@@ -61,5 +73,35 @@ export default function createGetTests({ getService }: KibanaFunctionalTestDefau
           });
         });
     });
+
+    it('should return 404 when gettin an alert in another space', async () => {
+      await supertest.get(`/api/alert/${space1AlertId}`).expect(404);
+    });
+
+    it('should return 200 when getting an alert in a space', async () => {
+      await supertest
+        .get(`/s/space_1/api/alert/${space1AlertId}`)
+        .expect(200)
+        .then((resp: any) => {
+          expect(resp.body).to.eql({
+            id: space1AlertId,
+            alertTypeId: 'test.noop',
+            interval: '10s',
+            enabled: true,
+            actions: [
+              {
+                group: 'default',
+                id: ES_ARCHIVER_ACTION_ID,
+                params: {
+                  message:
+                    'instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
+                },
+              },
+            ],
+            alertTypeParams: {},
+            scheduledTaskId: resp.body.scheduledTaskId,
+          });
+        });
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/alerting/index.ts b/x-pack/test/api_integration/apis/alerting/index.ts
index baa284777680c..b613edca8a115 100644
--- a/x-pack/test/api_integration/apis/alerting/index.ts
+++ b/x-pack/test/api_integration/apis/alerting/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function alertingTests({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function alertingTests({ loadTestFile }: FtrProviderContext) {
   describe('Alerting', () => {
     loadTestFile(require.resolve('./create'));
     loadTestFile(require.resolve('./delete'));
diff --git a/x-pack/test/api_integration/apis/alerting/list_alert_types.ts b/x-pack/test/api_integration/apis/alerting/list_alert_types.ts
index 033f0ec66cf8e..85c3664303e1a 100644
--- a/x-pack/test/api_integration/apis/alerting/list_alert_types.ts
+++ b/x-pack/test/api_integration/apis/alerting/list_alert_types.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function listAlertTypes({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function listAlertTypes({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('list_alert_types', () => {
diff --git a/x-pack/test/api_integration/apis/alerting/update.ts b/x-pack/test/api_integration/apis/alerting/update.ts
index 4c50f48244133..9ab30bbdc33e0 100644
--- a/x-pack/test/api_integration/apis/alerting/update.ts
+++ b/x-pack/test/api_integration/apis/alerting/update.ts
@@ -6,16 +6,16 @@
 
 import expect from '@kbn/expect';
 import { getTestAlertData } from './utils';
-import { ES_ARCHIVER_ACTION_ID } from './constants';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { ES_ARCHIVER_ACTION_ID, SPACE_1_ES_ARCHIVER_ACTION_ID } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function createUpdateTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function createUpdateTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
   describe('update', () => {
-    let createdAlert: any;
+    let alertId: string;
+    let space1AlertId: string;
 
     before(async () => {
       await esArchiver.load('actions/basic');
@@ -25,20 +25,62 @@ export default function createUpdateTests({ getService }: KibanaFunctionalTestDe
         .send(getTestAlertData())
         .expect(200)
         .then((resp: any) => {
-          createdAlert = resp.body;
+          alertId = resp.body.id;
+        });
+      await supertest
+        .post('/s/space_1/api/alert')
+        .set('kbn-xsrf', 'foo')
+        .send(getTestAlertData())
+        .expect(200)
+        .then((resp: any) => {
+          space1AlertId = resp.body.id;
         });
     });
     after(async () => {
       await supertest
-        .delete(`/api/alert/${createdAlert.id}`)
+        .delete(`/api/alert/${alertId}`)
+        .set('kbn-xsrf', 'foo')
+        .expect(204, '');
+      await supertest
+        .delete(`/s/space_1/api/alert/${space1AlertId}`)
         .set('kbn-xsrf', 'foo')
         .expect(204, '');
       await esArchiver.unload('actions/basic');
     });
 
     it('should return 200 when updating an alert', async () => {
+      const alert = {
+        alertTypeParams: {
+          foo: true,
+        },
+        interval: '12s',
+        actions: [
+          {
+            group: 'default',
+            id: ES_ARCHIVER_ACTION_ID,
+            params: {
+              message:
+                'UPDATED: instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
+            },
+          },
+        ],
+      };
       await supertest
-        .put(`/api/alert/${createdAlert.id}`)
+        .put(`/api/alert/${alertId}`)
+        .set('kbn-xsrf', 'foo')
+        .send(alert)
+        .expect(200)
+        .then((resp: any) => {
+          expect(resp.body).to.eql({
+            ...alert,
+            id: alertId,
+          });
+        });
+    });
+
+    it('should return 404 when updating an alert from another space', async () => {
+      await supertest
+        .put(`/api/alert/${space1AlertId}`)
         .set('kbn-xsrf', 'foo')
         .send({
           alertTypeParams: {
@@ -56,31 +98,42 @@ export default function createUpdateTests({ getService }: KibanaFunctionalTestDe
             },
           ],
         })
+        .expect(404);
+    });
+
+    it('should return 200 when updating an alert in a space', async () => {
+      const alert = {
+        alertTypeParams: {
+          foo: true,
+        },
+        interval: '12s',
+        actions: [
+          {
+            group: 'default',
+            id: SPACE_1_ES_ARCHIVER_ACTION_ID,
+            params: {
+              message:
+                'UPDATED: instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
+            },
+          },
+        ],
+      };
+      await supertest
+        .put(`/s/space_1/api/alert/${space1AlertId}`)
+        .set('kbn-xsrf', 'foo')
+        .send(alert)
         .expect(200)
         .then((resp: any) => {
           expect(resp.body).to.eql({
-            id: createdAlert.id,
-            alertTypeParams: {
-              foo: true,
-            },
-            interval: '12s',
-            actions: [
-              {
-                group: 'default',
-                id: ES_ARCHIVER_ACTION_ID,
-                params: {
-                  message:
-                    'UPDATED: instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
-                },
-              },
-            ],
+            ...alert,
+            id: space1AlertId,
           });
         });
     });
 
     it('should return 400 when attempting to change alert type', async () => {
       await supertest
-        .put(`/api/alert/${createdAlert.id}`)
+        .put(`/api/alert/${alertId}`)
         .set('kbn-xsrf', 'foo')
         .send({
           alertTypeId: '1',
@@ -115,7 +168,7 @@ export default function createUpdateTests({ getService }: KibanaFunctionalTestDe
 
     it('should return 400 when payload is empty and invalid', async () => {
       await supertest
-        .put(`/api/alert/${createdAlert.id}`)
+        .put(`/api/alert/${alertId}`)
         .set('kbn-xsrf', 'foo')
         .send({})
         .expect(400)
@@ -167,7 +220,7 @@ export default function createUpdateTests({ getService }: KibanaFunctionalTestDe
 
     it(`should return 400 when interval is wrong syntax`, async () => {
       const { body: error } = await supertest
-        .put(`/api/alert/${createdAlert.id}`)
+        .put(`/api/alert/${alertId}`)
         .set('kbn-xsrf', 'foo')
         .send(getTestAlertData({ interval: '10x', enabled: undefined }))
         .expect(400);
diff --git a/x-pack/test/api_integration/apis/apm/feature_controls.ts b/x-pack/test/api_integration/apis/apm/feature_controls.ts
index d2a0f9f4ba334..23cbd0ec54c3b 100644
--- a/x-pack/test/api_integration/apis/apm/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/apm/feature_controls.ts
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 import { SecurityService, SpacesService } from '../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const security: SecurityService = getService('security');
   const spaces: SpacesService = getService('spaces');
diff --git a/x-pack/test/api_integration/apis/apm/index.ts b/x-pack/test/api_integration/apis/apm/index.ts
index b51432f10d1e9..6364c7304118f 100644
--- a/x-pack/test/api_integration/apis/apm/index.ts
+++ b/x-pack/test/api_integration/apis/apm/index.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function apmApiIntegrationTests({
-  loadTestFile,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function apmApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('APM', () => {
     loadTestFile(require.resolve('./feature_controls'));
   });
diff --git a/x-pack/test/api_integration/apis/code/feature_controls.ts b/x-pack/test/api_integration/apis/code/feature_controls.ts
index 7cb41fefb2529..0b5c7984f8cc5 100644
--- a/x-pack/test/api_integration/apis/code/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/code/feature_controls.ts
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 import { SecurityService, SpacesService } from '../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const security: SecurityService = getService('security');
   const spaces: SpacesService = getService('spaces');
diff --git a/x-pack/test/api_integration/apis/code/index.ts b/x-pack/test/api_integration/apis/code/index.ts
index 551b64bab64c4..68f15c318a72d 100644
--- a/x-pack/test/api_integration/apis/code/index.ts
+++ b/x-pack/test/api_integration/apis/code/index.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function apmApiIntegrationTests({
-  loadTestFile,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function apmApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('Code', () => {
     loadTestFile(require.resolve('./feature_controls'));
     loadTestFile(require.resolve('./repo_status'));
diff --git a/x-pack/test/api_integration/apis/code/repo_status.ts b/x-pack/test/api_integration/apis/code/repo_status.ts
index 3af1595ecc1a4..9f3addf86aca4 100644
--- a/x-pack/test/api_integration/apis/code/repo_status.ts
+++ b/x-pack/test/api_integration/apis/code/repo_status.ts
@@ -5,14 +5,13 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   RepoFileStatus,
   StatusReport,
 } from '../../../../legacy/plugins/code/common/repo_file_status';
 
-// eslint-disable-next-line import/no-default-export
-export default function repoStatusTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function repoStatusTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const retry = getService('retry');
   const log = getService('log');
diff --git a/x-pack/test/api_integration/apis/console/feature_controls.ts b/x-pack/test/api_integration/apis/console/feature_controls.ts
index 615883d1fbbdd..bf3aa43958aa4 100644
--- a/x-pack/test/api_integration/apis/console/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/console/feature_controls.ts
@@ -5,10 +5,9 @@
  */
 
 import { SecurityService, SpacesService } from '../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function securityTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function securityTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const security: SecurityService = getService('security');
   const spaces: SpacesService = getService('spaces');
diff --git a/x-pack/test/api_integration/apis/console/index.ts b/x-pack/test/api_integration/apis/console/index.ts
index 512852a367bea..fb92cbedf3787 100644
--- a/x-pack/test/api_integration/apis/console/index.ts
+++ b/x-pack/test/api_integration/apis/console/index.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function consoleApiIntegrationTests({
-  loadTestFile,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function consoleApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('console', () => {
     loadTestFile(require.resolve('./feature_controls'));
   });
diff --git a/x-pack/test/api_integration/apis/infra/constants.ts b/x-pack/test/api_integration/apis/infra/constants.ts
index 6f47406398491..eb91cdb888eb2 100644
--- a/x-pack/test/api_integration/apis/infra/constants.ts
+++ b/x-pack/test/api_integration/apis/infra/constants.ts
@@ -22,5 +22,9 @@ export const DATES = {
       min: 1562786660845,
       max: 1562786716965,
     },
+    logs_and_metrics_with_aws: {
+      min: 1564083185000,
+      max: 1564083493080,
+    },
   },
 };
diff --git a/x-pack/test/api_integration/apis/infra/feature_controls.ts b/x-pack/test/api_integration/apis/infra/feature_controls.ts
index 4f4899e86a01b..44477b09986b9 100644
--- a/x-pack/test/api_integration/apis/infra/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/infra/feature_controls.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 import gql from 'graphql-tag';
 import { SecurityService, SpacesService } from '../../../common/services';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const introspectionQuery = gql`
   query Schema {
@@ -19,7 +19,7 @@ const introspectionQuery = gql`
   }
 `;
 
-const featureControlsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const security: SecurityService = getService('security');
   const spaces: SpacesService = getService('spaces');
@@ -291,7 +291,4 @@ const featureControlsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default featureControlsTests;
+}
diff --git a/x-pack/test/api_integration/apis/infra/ip_to_hostname.ts b/x-pack/test/api_integration/apis/infra/ip_to_hostname.ts
index 29fdd0fd48231..5d1a519efb5b9 100644
--- a/x-pack/test/api_integration/apis/infra/ip_to_hostname.ts
+++ b/x-pack/test/api_integration/apis/infra/ip_to_hostname.ts
@@ -5,10 +5,10 @@
  */
 
 import expect from '@kbn/expect';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { IpToHostResponse } from '../../../../legacy/plugins/infra/server/routes/ip_to_hostname';
 
-const ipToHostNameTest: KbnTestProvider = ({ getService }) => {
+export default function ipToHostNameTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -43,7 +43,4 @@ const ipToHostNameTest: KbnTestProvider = ({ getService }) => {
         .expect(404);
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default ipToHostNameTest;
+}
diff --git a/x-pack/test/api_integration/apis/infra/log_entries.ts b/x-pack/test/api_integration/apis/infra/log_entries.ts
index b3b49c416b9c5..4020acc00c618 100644
--- a/x-pack/test/api_integration/apis/infra/log_entries.ts
+++ b/x-pack/test/api_integration/apis/infra/log_entries.ts
@@ -11,7 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared';
 import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const KEY_WITHIN_DATA_RANGE = {
   time: new Date('2018-10-17T19:50:00.000Z').valueOf(),
@@ -88,7 +88,7 @@ const logEntriesBetweenQuery = gql`
   ${sharedFragments.InfraLogEntryFields}
 `;
 
-const logEntriesTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
   const sourceConfigurationService = getService('infraOpsSourceConfiguration');
@@ -333,10 +333,7 @@ const logEntriesTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default logEntriesTests;
+}
 
 const isSorted = <Value>(comparator: (first: Value, second: Value) => number) => (
   values: Value[]
diff --git a/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts b/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
index 4ffdb838aa93d..efc1173f9fb90 100644
--- a/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
+++ b/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
@@ -8,9 +8,9 @@ import expect from '@kbn/expect';
 import { ascending, pairs } from 'd3-array';
 import gql from 'graphql-tag';
 
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared';
 import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types';
-import { KbnTestProvider } from './types';
 
 const KEY_BEFORE_START = {
   time: new Date('2000-01-01T00:00:00.000Z').valueOf(),
@@ -29,7 +29,7 @@ const KEY_AFTER_END = {
   tiebreaker: 0,
 };
 
-const logEntryHighlightsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
 
@@ -238,7 +238,7 @@ const logEntryHighlightsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
+}
 
 const logEntryHighlightsQuery = gql`
   query LogEntryHighlightsQuery(
@@ -273,9 +273,6 @@ const logEntryHighlightsQuery = gql`
   ${sharedFragments.InfraLogEntryHighlightFields}
 `;
 
-// eslint-disable-next-line import/no-default-export
-export default logEntryHighlightsTests;
-
 const isSorted = <Value>(comparator: (first: Value, second: Value) => number) => (
   values: Value[]
 ) => pairs(values, comparator).every(order => order <= 0);
diff --git a/x-pack/test/api_integration/apis/infra/log_item.ts b/x-pack/test/api_integration/apis/infra/log_item.ts
index 191081c88a2ff..2c1fc73de9595 100644
--- a/x-pack/test/api_integration/apis/infra/log_item.ts
+++ b/x-pack/test/api_integration/apis/infra/log_item.ts
@@ -7,9 +7,9 @@
 import expect from '@kbn/expect';
 import { flyoutItemQuery } from '../../../../legacy/plugins/infra/public/containers/logs/flyout_item.gql_query';
 import { FlyoutItemQuery } from '../../../../legacy/plugins/infra/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const logItemTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
   describe('Log Item GraphQL Endpoint', () => {
@@ -169,7 +169,4 @@ const logItemTests: KbnTestProvider = ({ getService }) => {
         });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default logItemTests;
+}
diff --git a/x-pack/test/api_integration/apis/infra/log_summary.ts b/x-pack/test/api_integration/apis/infra/log_summary.ts
index 8731ec78bc3dc..da8c89f674202 100644
--- a/x-pack/test/api_integration/apis/infra/log_summary.ts
+++ b/x-pack/test/api_integration/apis/infra/log_summary.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 import { pairs } from 'd3-array';
 import gql from 'graphql-tag';
 
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const EARLIEST_TIME_WITH_DATA = new Date('2018-10-17T19:42:22.000Z').valueOf();
 const LATEST_TIME_WITH_DATA = new Date('2018-10-17T19:57:21.611Z').valueOf();
@@ -41,7 +41,7 @@ const logSummaryBetweenQuery = gql`
   }
 `;
 
-const logSummaryTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
 
@@ -80,7 +80,4 @@ const logSummaryTests: KbnTestProvider = ({ getService }) => {
       ).to.equal(true);
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default logSummaryTests;
+}
diff --git a/x-pack/test/api_integration/apis/infra/logs_without_millis.ts b/x-pack/test/api_integration/apis/infra/logs_without_millis.ts
index 9c33a6f1aed56..9cddca4c08a14 100644
--- a/x-pack/test/api_integration/apis/infra/logs_without_millis.ts
+++ b/x-pack/test/api_integration/apis/infra/logs_without_millis.ts
@@ -8,9 +8,9 @@ import expect from '@kbn/expect';
 import { ascending, pairs } from 'd3-array';
 import gql from 'graphql-tag';
 
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared';
 import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types';
-import { KbnTestProvider } from './types';
 
 const KEY_WITHIN_DATA_RANGE = {
   time: new Date('2019-01-06T00:00:00.000Z').valueOf(),
@@ -25,7 +25,7 @@ const LATEST_KEY_WITH_DATA = {
   tiebreaker: 2,
 };
 
-const logsWithoutMillisTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
 
@@ -97,10 +97,7 @@ const logsWithoutMillisTests: KbnTestProvider = ({ getService }) => {
       ).to.have.length(2);
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default logsWithoutMillisTests;
+}
 
 const logEntriesAroundQuery = gql`
   query LogEntriesAroundQuery(
diff --git a/x-pack/test/api_integration/apis/infra/metadata.ts b/x-pack/test/api_integration/apis/infra/metadata.ts
index 9e7802be6b066..546403b8b1934 100644
--- a/x-pack/test/api_integration/apis/infra/metadata.ts
+++ b/x-pack/test/api_integration/apis/infra/metadata.ts
@@ -5,39 +5,42 @@
  */
 
 import expect from '@kbn/expect';
+import { InfraNodeType } from '../../../../legacy/plugins/infra/server/graphql/types';
+import {
+  InfraMetadata,
+  InfraMetadataRequest,
+} from '../../../../legacy/plugins/infra/common/http_api/metadata_api';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-import { metadataQuery } from '../../../../legacy/plugins/infra/public/containers/metadata/metadata.gql_query';
-import { MetadataQuery } from '../../../../legacy/plugins/infra/public/graphql/types';
-import { KbnTestProvider } from './types';
-
-const metadataTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
-  const client = getService('infraOpsGraphQLClient');
+  const supertest = getService('supertest');
+  const fetchMetadata = async (body: InfraMetadataRequest): Promise<InfraMetadata | undefined> => {
+    const response = await supertest
+      .post('/api/infra/metadata')
+      .set('kbn-xsrf', 'xxx')
+      .send(body)
+      .expect(200);
+    return response.body;
+  };
 
   describe('metadata', () => {
     describe('7.0.0', () => {
       before(() => esArchiver.load('infra/7.0.0/hosts'));
       after(() => esArchiver.unload('infra/7.0.0/hosts'));
 
-      it('hosts', () => {
-        return client
-          .query<MetadataQuery.Query>({
-            query: metadataQuery,
-            variables: {
-              sourceId: 'default',
-              nodeId: 'demo-stack-mysql-01',
-              nodeType: 'host',
-            },
-          })
-          .then(resp => {
-            const metadata = resp.data.source.metadataByNode;
-            if (metadata) {
-              expect(metadata.features.length).to.be(12);
-              expect(metadata.name).to.equal('demo-stack-mysql-01');
-            } else {
-              throw new Error('Metadata should never be empty');
-            }
-          });
+      it('hosts', async () => {
+        const metadata = await fetchMetadata({
+          sourceId: 'default',
+          nodeId: 'demo-stack-mysql-01',
+          nodeType: InfraNodeType.host,
+        });
+        if (metadata) {
+          expect(metadata.features.length).to.be(12);
+          expect(metadata.name).to.equal('demo-stack-mysql-01');
+        } else {
+          throw new Error('Metadata should never be empty');
+        }
       });
     });
 
@@ -45,29 +48,197 @@ const metadataTests: KbnTestProvider = ({ getService }) => {
       before(() => esArchiver.load('infra/6.6.0/docker'));
       after(() => esArchiver.unload('infra/6.6.0/docker'));
 
-      it('docker', () => {
-        return client
-          .query<MetadataQuery.Query>({
-            query: metadataQuery,
-            variables: {
-              sourceId: 'default',
-              nodeId: '631f36a845514442b93c3fdd2dc91bcd8feb680b8ac5832c7fb8fdc167bb938e',
-              nodeType: 'container',
+      it('docker', async () => {
+        const metadata = await fetchMetadata({
+          sourceId: 'default',
+          nodeId: '631f36a845514442b93c3fdd2dc91bcd8feb680b8ac5832c7fb8fdc167bb938e',
+          nodeType: InfraNodeType.container,
+        });
+        if (metadata) {
+          expect(metadata.features.length).to.be(10);
+          expect(metadata.name).to.equal('docker-autodiscovery_elasticsearch_1');
+        } else {
+          throw new Error('Metadata should never be empty');
+        }
+      });
+    });
+
+    describe('8.0.0', () => {
+      const archiveName = 'infra/8.0.0/logs_and_metrics_with_aws';
+      before(() => esArchiver.load(archiveName));
+      after(() => esArchiver.unload(archiveName));
+
+      it('host', async () => {
+        const metadata = await fetchMetadata({
+          sourceId: 'default',
+          nodeId: 'gke-observability-8--observability-8--bc1afd95-f0zc',
+          nodeType: InfraNodeType.host,
+        });
+        if (metadata) {
+          expect(metadata.features.length).to.be(58);
+          expect(metadata.name).to.equal('gke-observability-8--observability-8--bc1afd95-f0zc');
+          expect(metadata.info).to.eql({
+            cloud: {
+              availability_zone: 'europe-west1-c',
+              instance: {
+                name: 'gke-observability-8--observability-8--bc1afd95-f0zc',
+                id: '6200309808276807579',
+              },
+              provider: 'gcp',
+              machine: { type: 'n1-standard-4' },
+              project: { id: 'elastic-observability' },
+            },
+            host: {
+              hostname: 'gke-observability-8--observability-8--bc1afd95-f0zc',
+              os: {
+                kernel: '4.14.127+',
+                codename: 'Core',
+                name: 'CentOS Linux',
+                family: 'redhat',
+                version: '7 (Core)',
+                platform: 'centos',
+              },
+              containerized: false,
+              name: 'gke-observability-8--observability-8--bc1afd95-f0zc',
+              architecture: 'x86_64',
+            },
+          });
+        } else {
+          throw new Error('Metadata should never be empty');
+        }
+      });
+
+      it('host with aws', async () => {
+        const metadata = await fetchMetadata({
+          sourceId: 'default',
+          nodeId: 'ip-172-31-47-9.us-east-2.compute.internal',
+          nodeType: InfraNodeType.host,
+        });
+        if (metadata) {
+          expect(metadata.features.length).to.be(19);
+          expect(metadata.features.some(f => f.name === 'aws.ec2')).to.be(true);
+          expect(metadata.name).to.equal('ip-172-31-47-9.us-east-2.compute.internal');
+          expect(metadata.info).to.eql({
+            cloud: {
+              availability_zone: 'us-east-2c',
+              image: { id: 'ami-0d8f6eb4f641ef691' },
+              instance: { id: 'i-011454f72559c510b' },
+              provider: 'aws',
+              machine: { type: 't2.micro' },
+              region: 'us-east-2',
+              account: { id: '015351775590' },
+            },
+            host: {
+              hostname: 'ip-172-31-47-9.us-east-2.compute.internal',
+              os: {
+                kernel: '4.14.123-111.109.amzn2.x86_64',
+                codename: 'Karoo',
+                name: 'Amazon Linux',
+                family: 'redhat',
+                version: '2',
+                platform: 'amzn',
+              },
+              containerized: false,
+              name: 'ip-172-31-47-9.us-east-2.compute.internal',
+              id: 'ded64cbff86f478990a3dfbb63a8d238',
+              architecture: 'x86_64',
+            },
+          });
+        } else {
+          throw new Error('Metadata should never be empty');
+        }
+      });
+
+      it('pod', async () => {
+        const metadata = await fetchMetadata({
+          sourceId: 'default',
+          nodeId: '14887487-99f8-11e9-9a96-42010a84004d',
+          nodeType: InfraNodeType.pod,
+        });
+        if (metadata) {
+          expect(metadata.features.length).to.be(29);
+          // With this data set the `kubernetes.pod.name` fields have been removed.
+          expect(metadata.name).to.equal('fluentd-gcp-v3.2.0-np7vw');
+          expect(metadata.info).to.eql({
+            cloud: {
+              instance: {
+                id: '6613144177892233360',
+                name: 'gke-observability-8--observability-8--bc1afd95-ngmh',
+              },
+              provider: 'gcp',
+              availability_zone: 'europe-west1-c',
+              machine: {
+                type: 'n1-standard-4',
+              },
+              project: {
+                id: 'elastic-observability',
+              },
+            },
+            host: {
+              hostname: 'gke-observability-8--observability-8--bc1afd95-ngmh',
+              name: 'gke-observability-8--observability-8--bc1afd95-ngmh',
+              os: {
+                codename: 'Core',
+                family: 'redhat',
+                kernel: '4.14.127+',
+                name: 'CentOS Linux',
+                platform: 'centos',
+                version: '7 (Core)',
+              },
+              architecture: 'x86_64',
+              containerized: false,
             },
-          })
-          .then(resp => {
-            const metadata = resp.data.source.metadataByNode;
-            if (metadata) {
-              expect(metadata.features.length).to.be(10);
-              expect(metadata.name).to.equal('docker-autodiscovery_elasticsearch_1');
-            } else {
-              throw new Error('Metadata should never be empty');
-            }
           });
+        } else {
+          throw new Error('Metadata should never be empty');
+        }
+      });
+
+      it('container', async () => {
+        const metadata = await fetchMetadata({
+          sourceId: 'default',
+          nodeId: 'c74b04834c6d7cc1800c3afbe31d0c8c0c267f06e9eb45c2b0c2df3e6cee40c5',
+          nodeType: InfraNodeType.container,
+        });
+        if (metadata) {
+          expect(metadata.features.length).to.be(26);
+          expect(metadata.name).to.equal(
+            'k8s_prometheus-to-sd-exporter_fluentd-gcp-v3.2.0-w68r5_kube-system_26950cde-9aed-11e9-9a96-42010a84004d_0'
+          );
+          expect(metadata.info).to.eql({
+            cloud: {
+              instance: {
+                id: '4039094952262994102',
+                name: 'gke-observability-8--observability-8--bc1afd95-nhhw',
+              },
+              provider: 'gcp',
+              availability_zone: 'europe-west1-c',
+              machine: {
+                type: 'n1-standard-4',
+              },
+              project: {
+                id: 'elastic-observability',
+              },
+            },
+            host: {
+              hostname: 'gke-observability-8--observability-8--bc1afd95-nhhw',
+              name: 'gke-observability-8--observability-8--bc1afd95-nhhw',
+              os: {
+                codename: 'Core',
+                family: 'redhat',
+                kernel: '4.14.127+',
+                name: 'CentOS Linux',
+                platform: 'centos',
+                version: '7 (Core)',
+              },
+              architecture: 'x86_64',
+              containerized: false,
+            },
+          });
+        } else {
+          throw new Error('Metadata should never be empty');
+        }
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default metadataTests;
+}
diff --git a/x-pack/test/api_integration/apis/infra/metrics.ts b/x-pack/test/api_integration/apis/infra/metrics.ts
index 985af588eca35..d40359edc5ff2 100644
--- a/x-pack/test/api_integration/apis/infra/metrics.ts
+++ b/x-pack/test/api_integration/apis/infra/metrics.ts
@@ -9,12 +9,12 @@ import { first, last } from 'lodash';
 
 import { metricsQuery } from '../../../../legacy/plugins/infra/public/containers/metrics/metrics.gql_query';
 import { MetricsQuery } from '../../../../legacy/plugins/infra/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 import { DATES } from './constants';
 const { min, max } = DATES['7.0.0'].hosts;
 
-const metricTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
 
@@ -75,7 +75,4 @@ const metricTests: KbnTestProvider = ({ getService }) => {
         });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default metricTests;
+}
diff --git a/x-pack/test/api_integration/apis/infra/metrics_explorer.ts b/x-pack/test/api_integration/apis/infra/metrics_explorer.ts
index 8c4922518d042..ee81b665adbe6 100644
--- a/x-pack/test/api_integration/apis/infra/metrics_explorer.ts
+++ b/x-pack/test/api_integration/apis/infra/metrics_explorer.ts
@@ -9,11 +9,11 @@ import { first } from 'lodash';
 import moment from 'moment';
 import { DATES } from './constants';
 import { MetricsExplorerResponse } from '../../../../legacy/plugins/infra/server/routes/metrics_explorer/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const { min, max } = DATES['7.0.0'].hosts;
 
-const metricsExplorerTest: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
@@ -259,7 +259,4 @@ const metricsExplorerTest: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default metricsExplorerTest;
+}
diff --git a/x-pack/test/api_integration/apis/infra/sources.ts b/x-pack/test/api_integration/apis/infra/sources.ts
index c553e2f5c7bc7..8e51610d208be 100644
--- a/x-pack/test/api_integration/apis/infra/sources.ts
+++ b/x-pack/test/api_integration/apis/infra/sources.ts
@@ -13,10 +13,10 @@ import {
   sourceStatusFieldsFragment,
 } from '../../../../legacy/plugins/infra/public/containers/source/source_fields_fragment.gql_query';
 import { SourceQuery } from '../../../../legacy/plugins/infra/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared';
 
-const sourcesTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
 
@@ -383,10 +383,7 @@ const sourcesTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default sourcesTests;
+}
 
 const createSourceMutation = gql`
   mutation createSource($sourceId: ID!, $sourceProperties: UpdateSourceInput!) {
diff --git a/x-pack/test/api_integration/apis/infra/types.ts b/x-pack/test/api_integration/apis/infra/types.ts
deleted file mode 100644
index 0011feb201da3..0000000000000
--- a/x-pack/test/api_integration/apis/infra/types.ts
+++ /dev/null
@@ -1,43 +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 { InMemoryCache } from 'apollo-cache-inmemory';
-import { ApolloClient } from 'apollo-client';
-
-import {
-  UpdateSourceInput,
-  UpdateSourceResult,
-} from '../../../../legacy/plugins/infra/public/graphql/types';
-
-export interface EsArchiver {
-  load(name: string): void;
-  unload(name: string): void;
-}
-
-interface InfraOpsGraphQLClientFactoryOptions {
-  username: string;
-  password: string;
-  basePath: string;
-}
-
-interface InfraOpsSourceConfigurationService {
-  createConfiguration(
-    sourceId: string,
-    sourceProperties: UpdateSourceInput
-  ): UpdateSourceResult['source']['version'];
-}
-
-export interface KbnTestProviderOptions {
-  getService(name: string): any;
-  getService(name: 'esArchiver'): EsArchiver;
-  getService(name: 'infraOpsGraphQLClient'): ApolloClient<InMemoryCache>;
-  getService(
-    name: 'infraOpsGraphQLClientFactory'
-  ): (options: InfraOpsGraphQLClientFactoryOptions) => ApolloClient<InMemoryCache>;
-  getService(name: 'infraOpsSourceConfiguration'): InfraOpsSourceConfigurationService;
-}
-
-export type KbnTestProvider = (options: KbnTestProviderOptions) => void;
diff --git a/x-pack/test/api_integration/apis/infra/waffle.ts b/x-pack/test/api_integration/apis/infra/waffle.ts
index 055fbf91e9f3b..b7ccce1d6df09 100644
--- a/x-pack/test/api_integration/apis/infra/waffle.ts
+++ b/x-pack/test/api_integration/apis/infra/waffle.ts
@@ -9,11 +9,11 @@ import { first, last } from 'lodash';
 
 import { waffleNodesQuery } from '../../../../legacy/plugins/infra/public/containers/waffle/waffle_nodes.gql_query';
 import { WaffleNodesQuery } from '../../../../legacy/plugins/infra/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 import { DATES } from './constants';
 
-const waffleTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
 
@@ -308,7 +308,4 @@ const waffleTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default waffleTests;
+}
diff --git a/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts b/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
index 51bd28aaf2343..699a658dc5558 100644
--- a/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
@@ -7,10 +7,9 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import { SecurityService, SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest: SuperTest<any> = getService('supertestWithoutAuth');
   const security: SecurityService = getService('security');
   const spaces: SpacesService = getService('spaces');
diff --git a/x-pack/test/api_integration/apis/management/advanced_settings/index.ts b/x-pack/test/api_integration/apis/management/advanced_settings/index.ts
index d8722305933ac..d22ba8fc81fca 100644
--- a/x-pack/test/api_integration/apis/management/advanced_settings/index.ts
+++ b/x-pack/test/api_integration/apis/management/advanced_settings/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('advanced settings', () => {
     loadTestFile(require.resolve('./feature_controls'));
   });
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail_advanced.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail_advanced.json
index a0e3cae496db3..f84d0c73bed07 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail_advanced.json
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail_advanced.json
@@ -16,6 +16,7 @@
     "documents": 24830,
     "dataSize": 52847579,
     "freeSpace": 186755088384,
+    "totalSpace": 499065712640,
     "usedHeap": 29,
     "status": "Online",
     "isOnline": true
diff --git a/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts b/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts
index 2b0c8c5bc5996..cf22394a08616 100644
--- a/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts
+++ b/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect/expect.js';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('Builtin ES Privileges', () => {
diff --git a/x-pack/test/api_integration/apis/security/index_fields.ts b/x-pack/test/api_integration/apis/security/index_fields.ts
index 41741a79760b0..60c6e800c40b2 100644
--- a/x-pack/test/api_integration/apis/security/index_fields.ts
+++ b/x-pack/test/api_integration/apis/security/index_fields.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect/expect.js';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('Index Fields', () => {
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index 9bdec4b97b96e..843c1b22f0ad8 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   let version: string;
diff --git a/x-pack/test/api_integration/apis/short_urls/feature_controls.ts b/x-pack/test/api_integration/apis/short_urls/feature_controls.ts
index bac06e875a5ec..7e1b9e7bd9712 100644
--- a/x-pack/test/api_integration/apis/short_urls/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/short_urls/feature_controls.ts
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const security: SecurityService = getService('security');
 
diff --git a/x-pack/test/api_integration/apis/short_urls/index.ts b/x-pack/test/api_integration/apis/short_urls/index.ts
index 8f12c6f2953be..fdfd31a1901b3 100644
--- a/x-pack/test/api_integration/apis/short_urls/index.ts
+++ b/x-pack/test/api_integration/apis/short_urls/index.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function shortUrlsApiIntegrationTests({
-  loadTestFile,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function shortUrlsApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('Short URLs', () => {
     loadTestFile(require.resolve('./feature_controls'));
   });
diff --git a/x-pack/test/api_integration/apis/siem/authentications.ts b/x-pack/test/api_integration/apis/siem/authentications.ts
index 1ac36d31e43bd..cf9d8d8c9a515 100644
--- a/x-pack/test/api_integration/apis/siem/authentications.ts
+++ b/x-pack/test/api_integration/apis/siem/authentications.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { authenticationsQuery } from '../../../../legacy/plugins/siem/public/containers/authentications/index.gql_query';
 import { GetAuthenticationsQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf();
 const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
@@ -18,7 +18,7 @@ const HOST_NAME = 'zeek-newyork-sha-aa8df15';
 const TOTAL_COUNT = 3;
 const EDGE_LENGTH = 1;
 
-const authenticationsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -84,7 +84,4 @@ const authenticationsTests: KbnTestProvider = ({ getService }) => {
         });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default authenticationsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/domains.ts b/x-pack/test/api_integration/apis/siem/domains.ts
index 571f2685cf38d..7965feb0e30f4 100644
--- a/x-pack/test/api_integration/apis/siem/domains.ts
+++ b/x-pack/test/api_integration/apis/siem/domains.ts
@@ -13,13 +13,13 @@ import {
   FlowTarget,
   GetDomainsQuery,
 } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf();
 const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
 const IP = '10.100.7.196';
 
-const domainsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Domains', () => {
@@ -138,7 +138,4 @@ const domainsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default domainsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/events.ts b/x-pack/test/api_integration/apis/siem/events.ts
index 9a4084a66d1c6..57780f825df87 100644
--- a/x-pack/test/api_integration/apis/siem/events.ts
+++ b/x-pack/test/api_integration/apis/siem/events.ts
@@ -14,7 +14,7 @@ import {
   GetEventsQuery,
   GetLastEventTimeQuery,
 } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf();
 const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
@@ -24,7 +24,7 @@ const HOST_NAME = 'suricata-sensor-amsterdam';
 const TOTAL_COUNT = 1751;
 const EDGE_LENGTH = 2;
 
-const eventsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('events API', () => {
@@ -344,7 +344,4 @@ const eventsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default eventsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/feature_controls.ts b/x-pack/test/api_integration/apis/siem/feature_controls.ts
index 1956fa5e562d6..836c35386b332 100644
--- a/x-pack/test/api_integration/apis/siem/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/siem/feature_controls.ts
@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 import gql from 'graphql-tag';
 import { SecurityService, SpacesService } from '../../../common/services';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const introspectionQuery = gql`
   query Schema {
@@ -19,7 +19,7 @@ const introspectionQuery = gql`
   }
 `;
 
-const featureControlsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const security: SecurityService = getService('security');
   const spaces: SpacesService = getService('spaces');
@@ -237,7 +237,4 @@ const featureControlsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default featureControlsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/hosts.ts b/x-pack/test/api_integration/apis/siem/hosts.ts
index 95f05516f0aa0..f9cdb1935a78a 100644
--- a/x-pack/test/api_integration/apis/siem/hosts.ts
+++ b/x-pack/test/api_integration/apis/siem/hosts.ts
@@ -16,7 +16,7 @@ import {
 import { HostOverviewQuery } from '../../../../legacy/plugins/siem/public/containers/hosts/overview/host_overview.gql_query';
 import { HostFirstLastSeenGqlQuery } from './../../../../legacy/plugins/siem/public/containers/hosts/first_last_seen/first_last_seen.gql_query';
 import { HostsTableQuery } from './../../../../legacy/plugins/siem/public/containers/hosts/hosts_table.gql_query';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf();
 const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
@@ -27,7 +27,7 @@ const TOTAL_COUNT = 7;
 const EDGE_LENGTH = 1;
 const CURSOR_ID = '2ab45fc1c41e4c84bbd02202a7e5761f';
 
-const hostsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -178,7 +178,4 @@ const hostsTests: KbnTestProvider = ({ getService }) => {
         });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default hostsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/ip_overview.ts b/x-pack/test/api_integration/apis/siem/ip_overview.ts
index 875cc078a8a64..bec31a018cac8 100644
--- a/x-pack/test/api_integration/apis/siem/ip_overview.ts
+++ b/x-pack/test/api_integration/apis/siem/ip_overview.ts
@@ -7,9 +7,9 @@
 import expect from '@kbn/expect';
 import { ipOverviewQuery } from '../../../../legacy/plugins/siem/public/containers/ip_overview/index.gql_query';
 import { GetIpOverviewQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const ipOverviewTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('IP Overview', () => {
@@ -64,7 +64,4 @@ const ipOverviewTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default ipOverviewTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/kpi_host_details.ts b/x-pack/test/api_integration/apis/siem/kpi_host_details.ts
index e6090f9678f6a..02152c0b71ca9 100644
--- a/x-pack/test/api_integration/apis/siem/kpi_host_details.ts
+++ b/x-pack/test/api_integration/apis/siem/kpi_host_details.ts
@@ -7,9 +7,9 @@
 import expect from '@kbn/expect';
 import { kpiHostDetailsQuery } from '../../../../legacy/plugins/siem/public/containers/kpi_host_details/index.gql_query';
 import { GetKpiHostDetailsQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const kpiHostsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Kpi Host Details', () => {
@@ -178,6 +178,4 @@ const kpiHostsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-// eslint-disable-next-line import/no-default-export
-export default kpiHostsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/kpi_hosts.ts b/x-pack/test/api_integration/apis/siem/kpi_hosts.ts
index 32053c8394640..9e43405b324fa 100644
--- a/x-pack/test/api_integration/apis/siem/kpi_hosts.ts
+++ b/x-pack/test/api_integration/apis/siem/kpi_hosts.ts
@@ -7,9 +7,9 @@
 import expect from '@kbn/expect';
 import { kpiHostsQuery } from '../../../../legacy/plugins/siem/public/containers/kpi_hosts/index.gql_query';
 import { GetKpiHostsQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const kpiHostsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Kpi Hosts', () => {
@@ -222,6 +222,4 @@ const kpiHostsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-// eslint-disable-next-line import/no-default-export
-export default kpiHostsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/kpi_network.ts b/x-pack/test/api_integration/apis/siem/kpi_network.ts
index 7b007c30a7ead..28cd89a2cc9b8 100644
--- a/x-pack/test/api_integration/apis/siem/kpi_network.ts
+++ b/x-pack/test/api_integration/apis/siem/kpi_network.ts
@@ -7,9 +7,9 @@
 import expect from '@kbn/expect';
 import { kpiNetworkQuery } from '../../../../legacy/plugins/siem/public/containers/kpi_network/index.gql_query';
 import { GetKpiNetworkQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const kpiNetworkTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Kpi Network', () => {
@@ -176,7 +176,4 @@ const kpiNetworkTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default kpiNetworkTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/network_dns.ts b/x-pack/test/api_integration/apis/siem/network_dns.ts
index 1851c23aa3492..db22da59257d6 100644
--- a/x-pack/test/api_integration/apis/siem/network_dns.ts
+++ b/x-pack/test/api_integration/apis/siem/network_dns.ts
@@ -11,9 +11,9 @@ import {
   GetNetworkDnsQuery,
   NetworkDnsFields,
 } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const networkDnsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Network DNS', () => {
@@ -93,7 +93,4 @@ const networkDnsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default networkDnsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts b/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts
index eedcd986b0899..2aa86dab1a8a8 100644
--- a/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts
+++ b/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts
@@ -13,11 +13,11 @@ import {
   GetNetworkTopNFlowQuery,
   NetworkTopNFlowFields,
 } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const EDGE_LENGTH = 10;
 
-const networkTopNFlowTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Network Top N Flow', () => {
@@ -307,7 +307,4 @@ const networkTopNFlowTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default networkTopNFlowTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/overview_host.ts b/x-pack/test/api_integration/apis/siem/overview_host.ts
index da0f20772a177..ef960534f6ce4 100644
--- a/x-pack/test/api_integration/apis/siem/overview_host.ts
+++ b/x-pack/test/api_integration/apis/siem/overview_host.ts
@@ -7,9 +7,9 @@
 import expect from '@kbn/expect';
 import { overviewHostQuery } from '../../../../legacy/plugins/siem/public/containers/overview/overview_host/index.gql_query';
 import { GetOverviewHostQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const overviewHostTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Overview Host', () => {
@@ -53,7 +53,4 @@ const overviewHostTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default overviewHostTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/overview_network.ts b/x-pack/test/api_integration/apis/siem/overview_network.ts
index 24ef870b826e6..ce2f8d4a0b5e5 100644
--- a/x-pack/test/api_integration/apis/siem/overview_network.ts
+++ b/x-pack/test/api_integration/apis/siem/overview_network.ts
@@ -7,9 +7,9 @@
 import expect from '@kbn/expect';
 import { overviewNetworkQuery } from '../../../../legacy/plugins/siem/public/containers/overview/overview_network/index.gql_query';
 import { GetOverviewNetworkQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const overviewNetworkTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Overview Network', () => {
@@ -137,7 +137,4 @@ const overviewNetworkTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default overviewNetworkTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts b/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts
index f29043c957b76..5aa7a10e07c2a 100644
--- a/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts
+++ b/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts
@@ -7,11 +7,10 @@
 import expect from '@kbn/expect';
 import gql from 'graphql-tag';
 
+import { FtrProviderContext } from '../../../ftr_provider_context';
 import { persistTimelineNoteMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/notes/persist.gql_query';
 
-import { KbnTestProvider } from '../types';
-
-const notesPersistenceTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -94,10 +93,7 @@ const notesPersistenceTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default notesPersistenceTests;
+}
 
 const deleteNoteMutation = gql`
   mutation DeleteNoteMutation($id: [ID!]!) {
diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts b/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts
index e0921ed6c8416..f1e926b3ede42 100644
--- a/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts
+++ b/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts
@@ -6,11 +6,10 @@
 
 import expect from '@kbn/expect';
 
+import { FtrProviderContext } from '../../../ftr_provider_context';
 import { persistTimelinePinnedEventMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/pinned_event/persist.gql_query';
 
-import { KbnTestProvider } from '../types';
-
-const pinnedEventsPersistenceTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -62,7 +61,4 @@ const pinnedEventsPersistenceTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default pinnedEventsPersistenceTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts b/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts
index d5062eb022a6d..a6ced270e2132 100644
--- a/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts
+++ b/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts
@@ -12,16 +12,15 @@
 
 import expect from '@kbn/expect';
 import ApolloClient from 'apollo-client';
-import { InMemoryCache } from 'apollo-cache-inmemory';
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 import { deleteTimelineMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/delete/persist.gql_query';
 import { persistTimelineFavoriteMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/favorite/persist.gql_query';
 import { persistTimelineMutation } from '../../../../../legacy/plugins/siem/public/containers/timeline/persist.gql_query';
 import { TimelineResult } from '../../../../../legacy/plugins/siem/public/graphql/types';
 
-import { KbnTestProvider } from '../types';
-
-const timelinePersistenceTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -296,10 +295,7 @@ const timelinePersistenceTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default timelinePersistenceTests;
+}
 
 const omitTypename = (key: string, value: keyof TimelineResult) =>
   key === '__typename' ? undefined : value;
@@ -307,7 +303,7 @@ const omitTypename = (key: string, value: keyof TimelineResult) =>
 const omitTypenameInTimeline = (timeline: TimelineResult) =>
   JSON.parse(JSON.stringify(timeline), omitTypename);
 
-const createBasicTimeline = async (client: ApolloClient<InMemoryCache>, titleToSaved: string) =>
+const createBasicTimeline = async (client: ApolloClient<any>, titleToSaved: string) =>
   await client.mutate<any>({
     mutation: persistTimelineMutation,
     variables: {
diff --git a/x-pack/test/api_integration/apis/siem/sources.ts b/x-pack/test/api_integration/apis/siem/sources.ts
index ffad618da4ec5..e96aaefee3ea5 100644
--- a/x-pack/test/api_integration/apis/siem/sources.ts
+++ b/x-pack/test/api_integration/apis/siem/sources.ts
@@ -8,9 +8,9 @@ import expect from '@kbn/expect';
 import { sourceQuery } from '../../../../legacy/plugins/siem/public/containers/source/index.gql_query';
 import { SourceQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
 
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-const sourcesTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -35,7 +35,4 @@ const sourcesTests: KbnTestProvider = ({ getService }) => {
         });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default sourcesTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/timeline.ts b/x-pack/test/api_integration/apis/siem/timeline.ts
index 8ee55ebeb9adb..a6ab4493448f3 100644
--- a/x-pack/test/api_integration/apis/siem/timeline.ts
+++ b/x-pack/test/api_integration/apis/siem/timeline.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { timelineQuery } from '../../../../legacy/plugins/siem/public/containers/timeline/index.gql_query';
 import { Direction, GetTimelineQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const LTE = new Date('3000-01-01T00:00:00.000Z').valueOf();
 const GTE = new Date('2000-01-01T00:00:00.000Z').valueOf();
@@ -51,7 +51,7 @@ const FILTER_VALUE = {
   },
 };
 
-const timelineTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -119,7 +119,4 @@ const timelineTests: KbnTestProvider = ({ getService }) => {
         });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default timelineTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/timeline_details.ts b/x-pack/test/api_integration/apis/siem/timeline_details.ts
index d59c45c338c8c..b702adfc1d35e 100644
--- a/x-pack/test/api_integration/apis/siem/timeline_details.ts
+++ b/x-pack/test/api_integration/apis/siem/timeline_details.ts
@@ -12,7 +12,7 @@ import {
   DetailItem,
   GetTimelineDetailsQuery,
 } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 type DetailsData = Array<
   Pick<DetailItem, 'field' | 'values' | 'originalValue'> & {
@@ -298,7 +298,7 @@ const EXPECTED_DATA: DetailItem[] = [
   { field: '_score', values: ['1'], originalValue: 1 },
 ];
 
-const timelineDetailsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -329,7 +329,4 @@ const timelineDetailsTests: KbnTestProvider = ({ getService }) => {
         });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default timelineDetailsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/tls.ts b/x-pack/test/api_integration/apis/siem/tls.ts
index bd7a9dfd28bae..aec10cf1f9689 100644
--- a/x-pack/test/api_integration/apis/siem/tls.ts
+++ b/x-pack/test/api_integration/apis/siem/tls.ts
@@ -12,7 +12,7 @@ import {
   FlowTarget,
   GetTlsQuery,
 } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf();
 const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
@@ -29,7 +29,7 @@ const expectedResult = {
   notAfter: ['2019-05-22T12:00:00.000Z'],
 };
 
-const tlsTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Tls Test', () => {
@@ -102,7 +102,4 @@ const tlsTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default tlsTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/types.ts b/x-pack/test/api_integration/apis/siem/types.ts
deleted file mode 100644
index 042d24a24be44..0000000000000
--- a/x-pack/test/api_integration/apis/siem/types.ts
+++ /dev/null
@@ -1,21 +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 { InMemoryCache } from 'apollo-cache-inmemory';
-import { ApolloClient } from 'apollo-client';
-
-export interface EsArchiver {
-  load(name: string): void;
-  unload(name: string): void;
-}
-
-export interface KbnTestProviderOptions {
-  getService(name: string): any;
-  getService(name: 'esArchiver'): EsArchiver;
-  getService(name: 'siemGraphQLClient'): ApolloClient<InMemoryCache>;
-}
-
-export type KbnTestProvider = (options: KbnTestProviderOptions) => void;
diff --git a/x-pack/test/api_integration/apis/siem/uncommon_processes.ts b/x-pack/test/api_integration/apis/siem/uncommon_processes.ts
index 0e1ac30634895..6e384ee9c20d5 100644
--- a/x-pack/test/api_integration/apis/siem/uncommon_processes.ts
+++ b/x-pack/test/api_integration/apis/siem/uncommon_processes.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 import { uncommonProcessesQuery } from '../../../../legacy/plugins/siem/public/containers/uncommon_processes/index.gql_query';
 import { GetUncommonProcessesQuery } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf();
 const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
@@ -16,7 +16,7 @@ const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
 // typical values that have to change after an update from "scripts/es_archiver"
 const TOTAL_COUNT = 80;
 
-const uncommonProcessesTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
 
@@ -160,7 +160,4 @@ const uncommonProcessesTests: KbnTestProvider = ({ getService }) => {
       expect(UncommonProcesses.edges[0].node).to.eql(expected);
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default uncommonProcessesTests;
+}
diff --git a/x-pack/test/api_integration/apis/siem/users.ts b/x-pack/test/api_integration/apis/siem/users.ts
index 25ff30c5803a9..f1869d40fbf1d 100644
--- a/x-pack/test/api_integration/apis/siem/users.ts
+++ b/x-pack/test/api_integration/apis/siem/users.ts
@@ -12,13 +12,13 @@ import {
   FlowTarget,
   GetUsersQuery,
 } from '../../../../legacy/plugins/siem/public/graphql/types';
-import { KbnTestProvider } from './types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf();
 const TO = new Date('3000-01-01T00:00:00.000Z').valueOf();
 const IP = '0.0.0.0';
 
-const usersTests: KbnTestProvider = ({ getService }) => {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('siemGraphQLClient');
   describe('Users', () => {
@@ -63,7 +63,4 @@ const usersTests: KbnTestProvider = ({ getService }) => {
       });
     });
   });
-};
-
-// eslint-disable-next-line import/no-default-export
-export default usersTests;
+}
diff --git a/x-pack/test/api_integration/apis/spaces/index.ts b/x-pack/test/api_integration/apis/spaces/index.ts
index 1a4df65b0856e..5aa35a10159f0 100644
--- a/x-pack/test/api_integration/apis/spaces/index.ts
+++ b/x-pack/test/api_integration/apis/spaces/index.ts
@@ -3,9 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: Record<string, any>) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('spaces', function() {
     this.tags('ciGroup6');
 
diff --git a/x-pack/test/api_integration/apis/spaces/saved_objects.ts b/x-pack/test/api_integration/apis/spaces/saved_objects.ts
index b08d435627e10..05f14a50f2170 100644
--- a/x-pack/test/api_integration/apis/spaces/saved_objects.ts
+++ b/x-pack/test/api_integration/apis/spaces/saved_objects.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect/expect.js';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('`space` saved object type', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/feature_controls.ts b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
index fb875dbe04813..1dd9d5ff798c4 100644
--- a/x-pack/test/api_integration/apis/uptime/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
@@ -7,11 +7,10 @@
 import expect from '@kbn/expect';
 import { docCountQueryString } from '../../../../legacy/plugins/uptime/public/queries';
 import { SecurityService, SpacesService } from '../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { PINGS_DATE_RANGE_END, PINGS_DATE_RANGE_START } from './constants';
 
-// eslint-disable-next-line import/no-default-export
-export default function featureControlsTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const security: SecurityService = getService('security');
   const spaces: SpacesService = getService('spaces');
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts b/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts
index 5c7f617922872..3273661b6c2ab 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts
@@ -7,9 +7,9 @@
 import expect from '@kbn/expect';
 import { monitorPageTitleQueryString } from '../../../../../legacy/plugins/uptime/public/queries/monitor_page_title_query';
 import monitorPageTitle from './fixtures/monitor_page_title.json';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: { getService: any }) {
+export default function({ getService }: FtrProviderContext) {
   describe('monitorPageTitle', () => {
     const supertest = getService('supertest');
 
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
index 9102afad19bc7..7e38939673df9 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
@@ -6,9 +6,9 @@
 
 import { monitorStatesQueryString } from '../../../../../legacy/plugins/uptime/public/queries/monitor_states_query';
 import { expectFixtureEql } from './expect_fixture_eql';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: { getService: any }) {
+export default function({ getService }: FtrProviderContext) {
   describe('monitorStates', () => {
     const supertest = getService('supertest');
 
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts b/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts
index 8014d6d815b75..413511bf4a23b 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts
@@ -6,9 +6,9 @@
 
 import { snapshotHistogramQueryString } from '../../../../../legacy/plugins/uptime/public/queries/snapshot_histogram_query';
 import { expectFixtureEql } from './expect_fixture_eql';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: { getService: any }) {
+export default function({ getService }: FtrProviderContext) {
   describe('snapshotHistogram', () => {
     const supertest = getService('supertest');
 
diff --git a/x-pack/test/api_integration/apis/xpack_main/features/features.ts b/x-pack/test/api_integration/apis/xpack_main/features/features.ts
index a3e77fd151e25..4a65088681596 100644
--- a/x-pack/test/api_integration/apis/xpack_main/features/features.ts
+++ b/x-pack/test/api_integration/apis/xpack_main/features/features.ts
@@ -7,10 +7,9 @@
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../../common/services';
 import { Feature } from '../../../../../legacy/plugins/xpack_main/types';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   const supertestWithoutAuth = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/xpack_main/features/index.ts b/x-pack/test/api_integration/apis/xpack_main/features/index.ts
index fdf7abc9cb622..885f4aad12fca 100644
--- a/x-pack/test/api_integration/apis/xpack_main/features/index.ts
+++ b/x-pack/test/api_integration/apis/xpack_main/features/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('Features', () => {
     loadTestFile(require.resolve('./features'));
   });
diff --git a/x-pack/test/api_integration/config.js b/x-pack/test/api_integration/config.js
index 92015be3f0e0c..cf11f6953b588 100644
--- a/x-pack/test/api_integration/config.js
+++ b/x-pack/test/api_integration/config.js
@@ -5,53 +5,17 @@
  */
 
 import path from 'path';
-import {
-  EsProvider,
-  EsSupertestWithoutAuthProvider,
-  SupertestWithoutAuthProvider,
-  UsageAPIProvider,
-  InfraOpsGraphQLClientProvider,
-  InfraOpsGraphQLClientFactoryProvider,
-  SiemGraphQLClientProvider,
-  SiemGraphQLClientFactoryProvider,
-  InfraOpsSourceConfigurationProvider,
-} from './services';
-
-import {
-  SecurityServiceProvider,
-  SpacesServiceProvider,
-} from '../common/services';
+import { services } from './services';
 
 import { SLACK_ACTION_SIMULATOR_URI } from './fixtures/plugins/actions';
 
 export async function getApiIntegrationConfig({ readConfigFile }) {
-
-  const kibanaAPITestsConfig = await readConfigFile(require.resolve('../../../test/api_integration/config.js'));
   const xPackFunctionalTestsConfig = await readConfigFile(require.resolve('../functional/config.js'));
-  const kibanaCommonConfig = await readConfigFile(require.resolve('../../../test/common/config.js'));
 
   return {
     testFiles: [require.resolve('./apis')],
+    services,
     servers: xPackFunctionalTestsConfig.get('servers'),
-    services: {
-      supertest: kibanaAPITestsConfig.get('services.supertest'),
-      esSupertest: kibanaAPITestsConfig.get('services.esSupertest'),
-      supertestWithoutAuth: SupertestWithoutAuthProvider,
-      esSupertestWithoutAuth: EsSupertestWithoutAuthProvider,
-      infraOpsGraphQLClient: InfraOpsGraphQLClientProvider,
-      infraOpsGraphQLClientFactory: InfraOpsGraphQLClientFactoryProvider,
-      siemGraphQLClientFactory: SiemGraphQLClientFactoryProvider,
-      siemGraphQLClient: SiemGraphQLClientProvider,
-      infraOpsSourceConfiguration: InfraOpsSourceConfigurationProvider,
-      es: EsProvider,
-      esArchiver: kibanaCommonConfig.get('services.esArchiver'),
-      usageAPI: UsageAPIProvider,
-      kibanaServer: kibanaCommonConfig.get('services.kibanaServer'),
-      chance: kibanaAPITestsConfig.get('services.chance'),
-      security: SecurityServiceProvider,
-      spaces: SpacesServiceProvider,
-      retry: xPackFunctionalTestsConfig.get('services.retry'),
-    },
     esArchiver: xPackFunctionalTestsConfig.get('esArchiver'),
     junit: {
       reportName: 'X-Pack API Integration Tests',
diff --git a/x-pack/test/api_integration/fixtures/plugins/alerts/index.ts b/x-pack/test/api_integration/fixtures/plugins/alerts/index.ts
index 4bd6894c7d508..b0e03f3958217 100644
--- a/x-pack/test/api_integration/fixtures/plugins/alerts/index.ts
+++ b/x-pack/test/api_integration/fixtures/plugins/alerts/index.ts
@@ -18,7 +18,6 @@ export default function(kibana: any) {
       const indexRecordActionType: ActionType = {
         id: 'test.index-record',
         name: 'Test: Index Record',
-        unencryptedAttributes: ['unencrypted'],
         validate: {
           params: schema.object({
             index: schema.string(),
@@ -26,17 +25,20 @@ export default function(kibana: any) {
             message: schema.string(),
           }),
           config: schema.object({
-            encrypted: schema.string(),
             unencrypted: schema.string(),
           }),
+          secrets: schema.object({
+            encrypted: schema.string(),
+          }),
         },
-        async executor({ config, params, services }: ActionTypeExecutorOptions) {
+        async executor({ config, secrets, params, services }: ActionTypeExecutorOptions) {
           return await services.callCluster('index', {
             index: params.index,
             refresh: 'wait_for',
             body: {
               params,
               config,
+              secrets,
               reference: params.reference,
               source: 'action:test.index-record',
             },
@@ -46,20 +48,20 @@ export default function(kibana: any) {
       const failingActionType: ActionType = {
         id: 'test.failing',
         name: 'Test: Failing',
-        unencryptedAttributes: [],
         validate: {
           params: schema.object({
             index: schema.string(),
             reference: schema.string(),
           }),
         },
-        async executor({ config, params, services }: ActionTypeExecutorOptions) {
+        async executor({ config, secrets, params, services }: ActionTypeExecutorOptions) {
           await services.callCluster('index', {
             index: params.index,
             refresh: 'wait_for',
             body: {
               params,
               config,
+              secrets,
               reference: params.reference,
               source: 'action:test.failing',
             },
@@ -70,7 +72,6 @@ export default function(kibana: any) {
       const rateLimitedActionType: ActionType = {
         id: 'test.rate-limit',
         name: 'Test: Rate Limit',
-        unencryptedAttributes: [],
         maxAttempts: 2,
         validate: {
           params: schema.object({
diff --git a/x-pack/test/api_integration/ftr_provider_context.d.ts b/x-pack/test/api_integration/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..e3add3748f56d
--- /dev/null
+++ b/x-pack/test/api_integration/ftr_provider_context.d.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 { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
diff --git a/x-pack/test/api_integration/services/index.js b/x-pack/test/api_integration/services/index.js
deleted file mode 100644
index 35ebd9206600d..0000000000000
--- a/x-pack/test/api_integration/services/index.js
+++ /dev/null
@@ -1,13 +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.
- */
-
-export { EsProvider } from './es';
-export { EsSupertestWithoutAuthProvider } from './es_supertest_without_auth';
-export { SupertestWithoutAuthProvider } from './supertest_without_auth';
-export { UsageAPIProvider } from './usage_api';
-export { InfraOpsGraphQLClientProvider, InfraOpsGraphQLClientFactoryProvider } from './infraops_graphql_client';
-export { SiemGraphQLClientProvider, SiemGraphQLClientFactoryProvider } from './siem_graphql_client';
-export { InfraOpsSourceConfigurationProvider } from './infraops_source_configuration';
diff --git a/x-pack/test/api_integration/services/index.ts b/x-pack/test/api_integration/services/index.ts
new file mode 100644
index 0000000000000..a8d3e2f9de337
--- /dev/null
+++ b/x-pack/test/api_integration/services/index.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { services as kibanaApiIntegrationServices } from '../../../../test/api_integration/services';
+import { services as kibanaCommonServices } from '../../../../test/common/services';
+
+import { SecurityServiceProvider, SpacesServiceProvider } from '../../common/services';
+
+// @ts-ignore not ts yet
+import { EsProvider } from './es';
+// @ts-ignore not ts yet
+import { EsSupertestWithoutAuthProvider } from './es_supertest_without_auth';
+// @ts-ignore not ts yet
+import { SupertestWithoutAuthProvider } from './supertest_without_auth';
+// @ts-ignore not ts yet
+import { UsageAPIProvider } from './usage_api';
+import {
+  InfraOpsGraphQLClientProvider,
+  InfraOpsGraphQLClientFactoryProvider,
+} from './infraops_graphql_client';
+import { SiemGraphQLClientProvider, SiemGraphQLClientFactoryProvider } from './siem_graphql_client';
+import { InfraOpsSourceConfigurationProvider } from './infraops_source_configuration';
+
+export const services = {
+  chance: kibanaApiIntegrationServices.chance,
+  esSupertest: kibanaApiIntegrationServices.esSupertest,
+  supertest: kibanaApiIntegrationServices.supertest,
+
+  esArchiver: kibanaCommonServices.esArchiver,
+  kibanaServer: kibanaCommonServices.kibanaServer,
+  retry: kibanaCommonServices.retry,
+
+  es: EsProvider,
+  esSupertestWithoutAuth: EsSupertestWithoutAuthProvider,
+  infraOpsGraphQLClient: InfraOpsGraphQLClientProvider,
+  infraOpsGraphQLClientFactory: InfraOpsGraphQLClientFactoryProvider,
+  infraOpsSourceConfiguration: InfraOpsSourceConfigurationProvider,
+  security: SecurityServiceProvider,
+  siemGraphQLClient: SiemGraphQLClientProvider,
+  siemGraphQLClientFactory: SiemGraphQLClientFactoryProvider,
+  spaces: SpacesServiceProvider,
+  supertestWithoutAuth: SupertestWithoutAuthProvider,
+  usageAPI: UsageAPIProvider,
+};
diff --git a/x-pack/test/api_integration/services/infraops_graphql_client.js b/x-pack/test/api_integration/services/infraops_graphql_client.ts
similarity index 64%
rename from x-pack/test/api_integration/services/infraops_graphql_client.js
rename to x-pack/test/api_integration/services/infraops_graphql_client.ts
index 65c17300687c2..33d1a59575c17 100644
--- a/x-pack/test/api_integration/services/infraops_graphql_client.js
+++ b/x-pack/test/api_integration/services/infraops_graphql_client.ts
@@ -10,22 +10,33 @@ import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemo
 import { ApolloClient } from 'apollo-client';
 import { HttpLink } from 'apollo-link-http';
 
+import { FtrProviderContext } from '../ftr_provider_context';
+
 import introspectionQueryResultData from '../../../legacy/plugins/infra/public/graphql/introspection.json';
 
-export function InfraOpsGraphQLClientProvider({ getService }) {
-  return new InfraOpsGraphQLClientFactoryProvider({ getService })();
+export function InfraOpsGraphQLClientProvider(context: FtrProviderContext) {
+  return InfraOpsGraphQLClientFactoryProvider(context)();
+}
+
+interface InfraOpsGraphQLClientFactoryOptions {
+  username?: string;
+  password?: string;
+  basePath?: string;
 }
 
-export function InfraOpsGraphQLClientFactoryProvider({ getService }) {
+export function InfraOpsGraphQLClientFactoryProvider({ getService }: FtrProviderContext) {
   const config = getService('config');
-  const [superUsername, superPassword] = config.get('servers.elasticsearch.auth').split(':');
+  const superAuth: string = config.get('servers.elasticsearch.auth');
+  const [superUsername, superPassword] = superAuth.split(':');
+
+  return function(options?: InfraOpsGraphQLClientFactoryOptions) {
+    const { username = superUsername, password = superPassword, basePath = null } = options || {};
 
-  return function ({ username = superUsername, password = superPassword, basePath = null } = {}) {
     const kbnURLWithoutAuth = formatUrl({ ...config.get('servers.kibana'), auth: false });
 
     const httpLink = new HttpLink({
       credentials: 'same-origin',
-      fetch,
+      fetch: fetch as any,
       headers: {
         'kbn-xsrf': 'xxx',
         authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
@@ -41,14 +52,14 @@ export function InfraOpsGraphQLClientFactoryProvider({ getService }) {
       }),
       defaultOptions: {
         query: {
-          fetchPolicy: 'no-cache'
+          fetchPolicy: 'no-cache',
         },
         watchQuery: {
-          fetchPolicy: 'no-cache'
+          fetchPolicy: 'no-cache',
         },
         mutate: {
-          fetchPolicy: 'no-cache'
-        },
+          fetchPolicy: 'no-cache',
+        } as any,
       },
       link: httpLink,
     });
diff --git a/x-pack/test/api_integration/services/infraops_source_configuration.js b/x-pack/test/api_integration/services/infraops_source_configuration.ts
similarity index 71%
rename from x-pack/test/api_integration/services/infraops_source_configuration.js
rename to x-pack/test/api_integration/services/infraops_source_configuration.ts
index cb558e3a93e15..facfe485ab88a 100644
--- a/x-pack/test/api_integration/services/infraops_source_configuration.js
+++ b/x-pack/test/api_integration/services/infraops_source_configuration.ts
@@ -6,6 +6,12 @@
 
 import gql from 'graphql-tag';
 
+import { FtrProviderContext } from '../ftr_provider_context';
+import {
+  UpdateSourceInput,
+  UpdateSourceResult,
+} from '../../../legacy/plugins/infra/public/graphql/types';
+
 const createSourceMutation = gql`
   mutation createSource($sourceId: ID!, $sourceProperties: UpdateSourceInput!) {
     createSource(id: $sourceId, sourceProperties: $sourceProperties) {
@@ -38,13 +44,18 @@ const createSourceMutation = gql`
   }
 `;
 
-export function InfraOpsSourceConfigurationProvider({ getService }) {
+export function InfraOpsSourceConfigurationProvider({ getService }: FtrProviderContext) {
   const client = getService('infraOpsGraphQLClient');
   const log = getService('log');
 
   return {
-    async createConfiguration(sourceId, sourceProperties) {
-      log.debug(`Creating Infra UI source configuration "${sourceId}" with properties ${JSON.stringify(sourceProperties)}`);
+    async createConfiguration(sourceId: string, sourceProperties: UpdateSourceInput) {
+      log.debug(
+        `Creating Infra UI source configuration "${sourceId}" with properties ${JSON.stringify(
+          sourceProperties
+        )}`
+      );
+
       const response = await client.mutate({
         mutation: createSourceMutation,
         variables: {
@@ -53,7 +64,8 @@ export function InfraOpsSourceConfigurationProvider({ getService }) {
         },
       });
 
-      return response.data.createSource.source.version;
+      const result: UpdateSourceResult = response.data!.createSource;
+      return result.source.version;
     },
   };
 }
diff --git a/x-pack/test/api_integration/services/siem_graphql_client.js b/x-pack/test/api_integration/services/siem_graphql_client.ts
similarity index 63%
rename from x-pack/test/api_integration/services/siem_graphql_client.js
rename to x-pack/test/api_integration/services/siem_graphql_client.ts
index 4583283dae8b8..7d6aa5e8a9dd5 100644
--- a/x-pack/test/api_integration/services/siem_graphql_client.js
+++ b/x-pack/test/api_integration/services/siem_graphql_client.ts
@@ -10,22 +10,32 @@ import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemo
 import { ApolloClient } from 'apollo-client';
 import { HttpLink } from 'apollo-link-http';
 
+import { FtrProviderContext } from '../ftr_provider_context';
 import introspectionQueryResultData from '../../../legacy/plugins/siem/public/graphql/introspection.json';
 
-export function SiemGraphQLClientProvider({ getService }) {
-  return new SiemGraphQLClientFactoryProvider({ getService })();
+interface SiemGraphQLClientFactoryOptions {
+  username?: string;
+  password?: string;
+  basePath?: string;
 }
 
-export function SiemGraphQLClientFactoryProvider({ getService }) {
+export function SiemGraphQLClientProvider(context: FtrProviderContext) {
+  return SiemGraphQLClientFactoryProvider(context)();
+}
+
+export function SiemGraphQLClientFactoryProvider({ getService }: FtrProviderContext) {
   const config = getService('config');
-  const [superUsername, superPassword] = config.get('servers.elasticsearch.auth').split(':');
+  const superAuth: string = config.get('servers.elasticsearch.auth');
+  const [superUsername, superPassword] = superAuth.split(':');
+
+  return function(options?: SiemGraphQLClientFactoryOptions) {
+    const { username = superUsername, password = superPassword, basePath = null } = options || {};
 
-  return function ({ username = superUsername, password = superPassword, basePath = null } = {}) {
     const kbnURLWithoutAuth = formatUrl({ ...config.get('servers.kibana'), auth: false });
 
     const httpLink = new HttpLink({
       credentials: 'same-origin',
-      fetch,
+      fetch: fetch as any,
       headers: {
         'kbn-xsrf': 'xxx',
         authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
diff --git a/x-pack/test/common/services/security/index.ts b/x-pack/test/common/services/security/index.ts
index e5845098f2310..5e787aa593867 100644
--- a/x-pack/test/common/services/security/index.ts
+++ b/x-pack/test/common/services/security/index.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { format as formatUrl } from 'url';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
-import { LogService } from '../../../types/services';
+import { ToolingLog } from '@kbn/dev-utils';
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
 import { Role } from './role';
 import { User } from './user';
 
@@ -13,13 +13,13 @@ export class SecurityService {
   public role: Role;
   public user: User;
 
-  constructor(url: string, log: LogService) {
+  constructor(url: string, log: ToolingLog) {
     this.role = new Role(url, log);
     this.user = new User(url, log);
   }
 }
 
-export function SecurityServiceProvider({ getService }: KibanaFunctionalTestDefaultProviders) {
+export function SecurityServiceProvider({ getService }: GenericFtrProviderContext<{}, {}>) {
   const log = getService('log');
   const config = getService('config');
   const url = formatUrl(config.get('servers.kibana'));
diff --git a/x-pack/test/common/services/security/role.ts b/x-pack/test/common/services/security/role.ts
index e96f85c702337..341b7d0b877f1 100644
--- a/x-pack/test/common/services/security/role.ts
+++ b/x-pack/test/common/services/security/role.ts
@@ -5,13 +5,13 @@
  */
 import axios, { AxiosInstance } from 'axios';
 import util from 'util';
-import { LogService } from '../../../types/services';
+import { ToolingLog } from '@kbn/dev-utils';
 
 export class Role {
-  private log: LogService;
+  private log: ToolingLog;
   private axios: AxiosInstance;
 
-  constructor(url: string, log: LogService) {
+  constructor(url: string, log: ToolingLog) {
     this.log = log;
     this.axios = axios.create({
       headers: { 'kbn-xsrf': 'x-pack/ftr/services/security/role' },
diff --git a/x-pack/test/common/services/security/user.ts b/x-pack/test/common/services/security/user.ts
index 2685222150df9..d591e6a651582 100644
--- a/x-pack/test/common/services/security/user.ts
+++ b/x-pack/test/common/services/security/user.ts
@@ -5,13 +5,13 @@
  */
 import axios, { AxiosInstance } from 'axios';
 import util from 'util';
-import { LogService } from '../../../types/services';
+import { ToolingLog } from '@kbn/dev-utils';
 
 export class User {
-  private log: LogService;
+  private log: ToolingLog;
   private axios: AxiosInstance;
 
-  constructor(url: string, log: LogService) {
+  constructor(url: string, log: ToolingLog) {
     this.log = log;
     this.axios = axios.create({
       headers: { 'kbn-xsrf': 'x-pack/ftr/services/security/user' },
diff --git a/x-pack/test/common/services/spaces/index.ts b/x-pack/test/common/services/spaces/index.ts
index 08d7a676e7919..b6b1b09b02b6c 100644
--- a/x-pack/test/common/services/spaces/index.ts
+++ b/x-pack/test/common/services/spaces/index.ts
@@ -6,14 +6,14 @@
 import axios, { AxiosInstance } from 'axios';
 import { format as formatUrl } from 'url';
 import util from 'util';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
-import { LogService } from '../../../types/services';
+import { ToolingLog } from '@kbn/dev-utils';
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
 
 export class SpacesService {
-  private log: LogService;
+  private log: ToolingLog;
   private axios: AxiosInstance;
 
-  constructor(url: string, log: LogService) {
+  constructor(url: string, log: ToolingLog) {
     this.log = log;
     this.axios = axios.create({
       headers: { 'kbn-xsrf': 'x-pack/ftr/services/spaces/space' },
@@ -48,7 +48,7 @@ export class SpacesService {
   }
 }
 
-export function SpacesServiceProvider({ getService }: KibanaFunctionalTestDefaultProviders) {
+export function SpacesServiceProvider({ getService }: GenericFtrProviderContext<{}, {}>) {
   const log = getService('log');
   const config = getService('config');
   const url = formatUrl(config.get('servers.kibana'));
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 75a32f08a4469..0834ff11ced58 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
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const security = getService('security');
@@ -192,7 +191,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', {
+          timeout: 10000,
+        });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts
index 6b32bfd187479..649f3bad0ff15 100644
--- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts
+++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'settings', 'security', 'spaceSelector']);
@@ -83,7 +82,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', {
+          timeout: 10000,
+        });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/advanced_settings/index.ts b/x-pack/test/functional/apps/advanced_settings/index.ts
index 643a94b2fa456..d9fcc8a13c471 100644
--- a/x-pack/test/functional/apps/advanced_settings/index.ts
+++ b/x-pack/test/functional/apps/advanced_settings/index.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function advancedSettingsApp({
-  loadTestFile,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function advancedSettingsApp({ loadTestFile }: FtrProviderContext) {
   describe('Advanced Settings', function canvasAppTestSuite() {
     this.tags(['ciGroup2', 'skipFirefox']); // CI requires tags ヽ(゜Q。)ノ？
     loadTestFile(require.resolve('./feature_controls/advanced_settings_security'));
diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
index 1f0d09238fc6d..3478a829084d6 100644
--- a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
+++ b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security: SecurityService = getService('security');
   const PageObjects = getPageObjects(['common', 'error', 'security']);
@@ -70,7 +69,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it('can navigate to APM app', async () => {
         await PageObjects.common.navigateToApp('apm');
-        await testSubjects.existOrFail('apmMainContainer', 10000);
+        await testSubjects.existOrFail('apmMainContainer', {
+          timeout: 10000,
+        });
       });
 
       it(`doesn't show read-only badge`, async () => {
@@ -119,7 +120,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it('can navigate to APM app', async () => {
         await PageObjects.common.navigateToApp('apm');
-        await testSubjects.existOrFail('apmMainContainer', 10000);
+        await testSubjects.existOrFail('apmMainContainer', {
+          timeout: 10000,
+        });
       });
 
       it(`shows read-only badge`, async () => {
diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_spaces.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_spaces.ts
index ff32bcc5c6c86..6f6ea06f4ab02 100644
--- a/x-pack/test/functional/apps/apm/feature_controls/apm_spaces.ts
+++ b/x-pack/test/functional/apps/apm/feature_controls/apm_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'error', 'timePicker', 'security']);
   const testSubjects = getService('testSubjects');
@@ -40,7 +39,9 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it('can navigate to Uptime app', async () => {
         await PageObjects.common.navigateToApp('apm');
-        await testSubjects.existOrFail('apmMainContainer', 10000);
+        await testSubjects.existOrFail('apmMainContainer', {
+          timeout: 10000,
+        });
       });
     });
 
diff --git a/x-pack/test/functional/apps/apm/feature_controls/index.ts b/x-pack/test/functional/apps/apm/feature_controls/index.ts
index 1ca30e0faebdf..2c8db0c70c990 100644
--- a/x-pack/test/functional/apps/apm/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/apm/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags('skipFirefox');
     loadTestFile(require.resolve('./apm_security'));
diff --git a/x-pack/test/functional/apps/apm/index.ts b/x-pack/test/functional/apps/apm/index.ts
index d8f4177741113..945af09183f03 100644
--- a/x-pack/test/functional/apps/apm/index.ts
+++ b/x-pack/test/functional/apps/apm/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('APM', function() {
     this.tags('ciGroup6');
     loadTestFile(require.resolve('./feature_controls'));
diff --git a/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts b/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts
index 3ae5fa5e44022..a55ada12b4749 100644
--- a/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts
+++ b/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
   const PageObjects = getPageObjects(['common', 'canvas', 'security', 'spaceSelector']);
diff --git a/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts b/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts
index 6901dfa7352c1..5e03c0683e224 100644
--- a/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts
+++ b/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'canvas', 'security', 'spaceSelector']);
diff --git a/x-pack/test/functional/apps/code/code_intelligence.ts b/x-pack/test/functional/apps/code/code_intelligence.ts
index aede5ca8c7c4f..c2cfa3f420714 100644
--- a/x-pack/test/functional/apps/code/code_intelligence.ts
+++ b/x-pack/test/functional/apps/code/code_intelligence.ts
@@ -5,13 +5,12 @@
  */
 
 import expect from '@kbn/expect';
-import { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
 export default function codeIntelligenceFunctionalTests({
   getService,
   getPageObjects,
-}: TestInvoker) {
+}: FtrProviderContext) {
   // const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
diff --git a/x-pack/test/functional/apps/code/explore_repository.ts b/x-pack/test/functional/apps/code/explore_repository.ts
index 36a07a9ca15f7..3799d429d29cb 100644
--- a/x-pack/test/functional/apps/code/explore_repository.ts
+++ b/x-pack/test/functional/apps/code/explore_repository.ts
@@ -5,13 +5,12 @@
  */
 
 import expect from '@kbn/expect';
-import { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
 export default function exploreRepositoryFunctionalTests({
   getService,
   getPageObjects,
-}: TestInvoker) {
+}: FtrProviderContext) {
   // const esArchiver = getService('esArchiver');
   const browser = getService('browser');
   const testSubjects = getService('testSubjects');
diff --git a/x-pack/test/functional/apps/code/file_tree.ts b/x-pack/test/functional/apps/code/file_tree.ts
index b157efc5e555d..4dbeecedaca98 100644
--- a/x-pack/test/functional/apps/code/file_tree.ts
+++ b/x-pack/test/functional/apps/code/file_tree.ts
@@ -5,13 +5,12 @@
  */
 
 import expect from '@kbn/expect';
-import { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
 export default function exploreRepositoryFunctionalTests({
   getService,
   getPageObjects,
-}: TestInvoker) {
+}: FtrProviderContext) {
   // const esArchiver = getService('esArchiver');
   const browser = getService('browser');
   const testSubjects = getService('testSubjects');
diff --git a/x-pack/test/functional/apps/code/history.ts b/x-pack/test/functional/apps/code/history.ts
index 5a3dc4c040a13..697267009e8b1 100644
--- a/x-pack/test/functional/apps/code/history.ts
+++ b/x-pack/test/functional/apps/code/history.ts
@@ -5,13 +5,12 @@
  */
 
 import expect from '@kbn/expect';
-import { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
 export default function manageRepositoriesFunctionalTests({
   getService,
   getPageObjects,
-}: TestInvoker) {
+}: FtrProviderContext) {
   // const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
diff --git a/x-pack/test/functional/apps/code/index.ts b/x-pack/test/functional/apps/code/index.ts
index ccd621723bf7a..f96e5af7fdc59 100644
--- a/x-pack/test/functional/apps/code/index.ts
+++ b/x-pack/test/functional/apps/code/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function codeApp({ loadTestFile }: TestInvoker) {
+export default function codeApp({ loadTestFile }: FtrProviderContext) {
   describe('Code', function codeAppTestSuite() {
     this.tags('ciGroup2');
     loadTestFile(require.resolve('./manage_repositories'));
diff --git a/x-pack/test/functional/apps/code/lib/types.ts b/x-pack/test/functional/apps/code/lib/types.ts
deleted file mode 100644
index 2ed91406e5f48..0000000000000
--- a/x-pack/test/functional/apps/code/lib/types.ts
+++ /dev/null
@@ -1,27 +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.
- */
-
-export type DescribeFn = (text: string, fn: () => void) => void;
-
-export interface TestDefinitionAuthentication {
-  username?: string;
-  password?: string;
-}
-
-export type LoadTestFileFn = (path: string) => string;
-
-export type GetServiceFn = (service: string) => any;
-
-export type ReadConfigFileFn = (path: string) => any;
-
-export type GetPageObjectsFn = (pageObjects: string[]) => any;
-
-export interface TestInvoker {
-  getService: GetServiceFn;
-  getPageObjects: GetPageObjectsFn;
-  loadTestFile: LoadTestFileFn;
-  readConfigFile: ReadConfigFileFn;
-}
diff --git a/x-pack/test/functional/apps/code/manage_repositories.ts b/x-pack/test/functional/apps/code/manage_repositories.ts
index 4fc28d6a3130e..56a26c51813ae 100644
--- a/x-pack/test/functional/apps/code/manage_repositories.ts
+++ b/x-pack/test/functional/apps/code/manage_repositories.ts
@@ -5,13 +5,12 @@
  */
 
 import expect from '@kbn/expect';
-import { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
 export default function manageRepositoriesFunctionalTests({
   getService,
   getPageObjects,
-}: TestInvoker) {
+}: FtrProviderContext) {
   // const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
diff --git a/x-pack/test/functional/apps/code/search.ts b/x-pack/test/functional/apps/code/search.ts
index c10f6b4e142ac..1b910b4ffc5ee 100644
--- a/x-pack/test/functional/apps/code/search.ts
+++ b/x-pack/test/functional/apps/code/search.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function searchFunctonalTests({ getService, getPageObjects }: TestInvoker) {
+export default function searchFunctonalTests({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
diff --git a/x-pack/test/functional/apps/code/with_security.ts b/x-pack/test/functional/apps/code/with_security.ts
index 1578ef69fae55..7fcaa4b0964dc 100644
--- a/x-pack/test/functional/apps/code/with_security.ts
+++ b/x-pack/test/functional/apps/code/with_security.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function testWithSecurity({ getService, getPageObjects }: TestInvoker) {
+export default function testWithSecurity({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
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 54b504e0f3524..eef47ae0341c8 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
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'crossClusterReplication']);
   const log = getService('log');
 
diff --git a/x-pack/test/functional/apps/cross_cluster_replication/index.ts b/x-pack/test/functional/apps/cross_cluster_replication/index.ts
index 19e8012dd9b57..21fc1982edc42 100644
--- a/x-pack/test/functional/apps/cross_cluster_replication/index.ts
+++ b/x-pack/test/functional/apps/cross_cluster_replication/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ loadTestFile }: FtrProviderContext) => {
   describe('Cross Cluster Replication app', function() {
     this.tags('ciGroup4');
     loadTestFile(require.resolve('./home_page'));
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
index 84458d4c17223..5a43b15db56e2 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
@@ -10,10 +10,9 @@ import {
   DashboardConstants,
 } from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants';
 import { SecurityService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security: SecurityService = getService('security');
   const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'spaceSelector', 'share']);
@@ -91,7 +90,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('dashboardLandingPage', 10000);
+        await testSubjects.existOrFail('dashboardLandingPage', { timeout: 10000 });
         await testSubjects.existOrFail('newItemButton');
       });
 
@@ -108,7 +107,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('emptyDashboardAddPanelButton', 10000);
+        await testSubjects.existOrFail('emptyDashboardAddPanelButton', { timeout: 10000 });
       });
 
       it(`can view existing Dashboard`, async () => {
@@ -116,7 +115,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('embeddablePanelHeading-APie', 10000);
+        await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: 10000 });
       });
 
       it(`does not allow a visualization to be edited`, async () => {
@@ -242,7 +241,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('dashboardLandingPage', 10000);
+        await testSubjects.existOrFail('dashboardLandingPage', { timeout: 10000 });
         await testSubjects.missingOrFail('newItemButton');
       });
 
@@ -259,7 +258,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', 20000);
+        await testSubjects.existOrFail('homeApp', { timeout: 20000 });
       });
 
       it(`can view existing Dashboard`, async () => {
@@ -267,7 +266,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('embeddablePanelHeading-APie', 10000);
+        await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: 10000 });
       });
 
       it(`Permalinks doesn't show create short-url button`, async () => {
@@ -326,7 +325,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`create new dashboard redirects to the home page`, async () => {
@@ -338,7 +337,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', 20000);
+        await testSubjects.existOrFail('homeApp', { timeout: 20000 });
       });
 
       it(`edit dashboard for object which doesn't exist redirects to the home page`, async () => {
@@ -350,7 +349,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`edit dashboard for object which exists redirects to the home page`, async () => {
@@ -358,7 +357,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
index aa852d1ae8111..17cc9dd5cf942 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
@@ -10,10 +10,9 @@ import {
   DashboardConstants,
 } from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'spaceSelector']);
@@ -62,7 +61,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('dashboardLandingPage', 10000);
+        await testSubjects.existOrFail('dashboardLandingPage', { timeout: 10000 });
         await testSubjects.existOrFail('newItemButton');
       });
 
@@ -76,7 +75,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('emptyDashboardAddPanelButton', 10000);
+        await testSubjects.existOrFail('emptyDashboardAddPanelButton', { timeout: 10000 });
       });
 
       it(`can view existing Dashboard`, async () => {
@@ -85,7 +84,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('embeddablePanelHeading-APie', 10000);
+        await testSubjects.existOrFail('embeddablePanelHeading-APie', { timeout: 10000 });
       });
     });
 
@@ -126,7 +125,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`edit dashboard for object which doesn't exist redirects to the home page`, async () => {
@@ -139,7 +138,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`edit dashboard for object which exists redirects to the home page`, async () => {
@@ -148,7 +147,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/index.ts b/x-pack/test/functional/apps/dashboard/feature_controls/index.ts
index b860dd78dc367..b452a57081d7c 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags(['skipFirefox']);
     loadTestFile(require.resolve('./dashboard_security'));
diff --git a/x-pack/test/functional/apps/dashboard/index.ts b/x-pack/test/functional/apps/dashboard/index.ts
index 5cea2fda9644d..b596d7bcbb462 100644
--- a/x-pack/test/functional/apps/dashboard/index.ts
+++ b/x-pack/test/functional/apps/dashboard/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('dashboard', function() {
     this.tags('ciGroup3');
 
diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
index a92cb0a7c3d79..1a63a6ad3c9e4 100644
--- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
+++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security: SecurityService = getService('security');
   const PageObjects = getPageObjects(['common', 'console', 'security']);
@@ -239,21 +238,21 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
         await PageObjects.common.navigateToUrl('console', '', {
           ensureCurrentUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`navigating to search profiler redirect to homepage`, async () => {
         await PageObjects.common.navigateToUrl('searchProfiler', '', {
           ensureCurrentUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`navigating to grok debugger redirect to homepage`, async () => {
         await PageObjects.common.navigateToUrl('grokDebugger', '', {
           ensureCurrentUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts
index c4a16c18d3beb..666b9175da275 100644
--- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts
+++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'spaceSelector']);
@@ -91,21 +90,21 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
         await PageObjects.common.navigateToUrl('console', '', {
           ensureCurrentUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`navigating to search profiler redirect to homepage`, async () => {
         await PageObjects.common.navigateToUrl('searchProfiler', '', {
           ensureCurrentUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`navigating to grok debugger redirect to homepage`, async () => {
         await PageObjects.common.navigateToUrl('grokDebugger', '', {
           ensureCurrentUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/index.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/index.ts
index d0d92b74022c0..72f87c2898d58 100644
--- a/x-pack/test/functional/apps/dev_tools/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/dev_tools/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags('skipFirefox');
     loadTestFile(require.resolve('./dev_tools_security'));
diff --git a/x-pack/test/functional/apps/dev_tools/index.ts b/x-pack/test/functional/apps/dev_tools/index.ts
index 1d959575322af..73ff5d5749cb8 100644
--- a/x-pack/test/functional/apps/dev_tools/index.ts
+++ b/x-pack/test/functional/apps/dev_tools/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('console', function() {
     this.tags('ciGroup3');
 
diff --git a/x-pack/test/functional/apps/dev_tools/searchprofiler_editor.ts b/x-pack/test/functional/apps/dev_tools/searchprofiler_editor.ts
index 794b799662810..f8eea76026cc2 100644
--- a/x-pack/test/functional/apps/dev_tools/searchprofiler_editor.ts
+++ b/x-pack/test/functional/apps/dev_tools/searchprofiler_editor.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common']);
   const testSubjects = getService('testSubjects');
   const aceEditor = getService('aceEditor');
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
index 2e5f9a9f041b4..8712247ee7a24 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security: SecurityService = getService('security');
   const globalNav = getService('globalNav');
@@ -91,7 +90,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it('shows save button', async () => {
         await PageObjects.common.navigateToApp('discover');
-        await testSubjects.existOrFail('discoverSaveButton', 20000);
+        await testSubjects.existOrFail('discoverSaveButton', { timeout: 20000 });
       });
 
       it(`doesn't show read-only badge`, async () => {
@@ -149,7 +148,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it(`doesn't show save button`, async () => {
         await PageObjects.common.navigateToApp('discover');
-        await testSubjects.existOrFail('discoverNewButton', 10000);
+        await testSubjects.existOrFail('discoverNewButton', { timeout: 10000 });
         await testSubjects.missingOrFail('discoverSaveButton');
       });
 
@@ -255,7 +254,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
         await PageObjects.common.navigateToUrl('discover', '', {
           ensureCurrentUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
index 341e87c453c29..243d5a0b6b6d0 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects([
@@ -63,7 +62,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
         await PageObjects.common.navigateToApp('discover', {
           basePath: '/s/custom_space',
         });
-        await testSubjects.existOrFail('discoverSaveButton', 10000);
+        await testSubjects.existOrFail('discoverSaveButton', { timeout: 10000 });
       });
 
       it('shows "visualize" field button', async () => {
@@ -162,7 +161,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           basePath: '/s/custom_space',
           ensureCurrentUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/discover/feature_controls/index.ts b/x-pack/test/functional/apps/discover/feature_controls/index.ts
index 8ae212216fa91..5f9b9da86c8a6 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags('skipFirefox');
     loadTestFile(require.resolve('./discover_security'));
diff --git a/x-pack/test/functional/apps/discover/index.ts b/x-pack/test/functional/apps/discover/index.ts
index 575d485e6115a..e9ba3aa88d75e 100644
--- a/x-pack/test/functional/apps/discover/index.ts
+++ b/x-pack/test/functional/apps/discover/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('discover', function() {
     this.tags('ciGroup3');
 
diff --git a/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts b/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts
index 15aa75fcf97d8..05f6717106bad 100644
--- a/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts
+++ b/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security: SecurityService = getService('security');
   const PageObjects = getPageObjects(['common', 'graph', 'security', 'error']);
diff --git a/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts b/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts
index 976286fefc391..a0b81a8df702a 100644
--- a/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts
+++ b/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'graph', 'security', 'error']);
diff --git a/x-pack/test/functional/apps/graph/feature_controls/index.ts b/x-pack/test/functional/apps/graph/feature_controls/index.ts
index 582123b93e9a8..56754c0dc9f60 100644
--- a/x-pack/test/functional/apps/graph/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/graph/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags('skipFirefox');
     loadTestFile(require.resolve('./graph_security'));
diff --git a/x-pack/test/functional/apps/index_lifecycle_management/home_page.ts b/x-pack/test/functional/apps/index_lifecycle_management/home_page.ts
index 9b359171b0aa0..c7ad3f933ea64 100644
--- a/x-pack/test/functional/apps/index_lifecycle_management/home_page.ts
+++ b/x-pack/test/functional/apps/index_lifecycle_management/home_page.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'indexLifecycleManagement']);
   const log = getService('log');
 
diff --git a/x-pack/test/functional/apps/index_lifecycle_management/index.ts b/x-pack/test/functional/apps/index_lifecycle_management/index.ts
index 523c72905deb1..9078a9d681e7e 100644
--- a/x-pack/test/functional/apps/index_lifecycle_management/index.ts
+++ b/x-pack/test/functional/apps/index_lifecycle_management/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ loadTestFile }: FtrProviderContext) => {
   describe('Index Lifecycle Management app', function() {
     this.tags('ciGroup7');
     loadTestFile(require.resolve('./home_page'));
diff --git a/x-pack/test/functional/apps/index_management/home_page.ts b/x-pack/test/functional/apps/index_management/home_page.ts
index f04cc07ba79df..687b508df6105 100644
--- a/x-pack/test/functional/apps/index_management/home_page.ts
+++ b/x-pack/test/functional/apps/index_management/home_page.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'indexManagement']);
   const log = getService('log');
 
diff --git a/x-pack/test/functional/apps/index_management/index.ts b/x-pack/test/functional/apps/index_management/index.ts
index f4af1b40c803d..b816142a17039 100644
--- a/x-pack/test/functional/apps/index_management/index.ts
+++ b/x-pack/test/functional/apps/index_management/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ loadTestFile }: FtrProviderContext) => {
   describe('Index Management app', function() {
     this.tags('ciGroup3');
     loadTestFile(require.resolve('./home_page'));
diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index.ts
index aa402c6b993e7..3978292bff98d 100644
--- a/x-pack/test/functional/apps/index_patterns/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags('skipFirefox');
     loadTestFile(require.resolve('./index_patterns_security'));
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 63a90fb45a083..cce5ededf2cf3 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
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const security = getService('security');
@@ -197,7 +196,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts
index 9a3bd5694f76f..df086cf813c30 100644
--- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts
+++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'settings', 'security']);
@@ -78,7 +77,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/index_patterns/index.ts b/x-pack/test/functional/apps/index_patterns/index.ts
index ac5479e9c1c17..4b4c1c6cf1cce 100644
--- a/x-pack/test/functional/apps/index_patterns/index.ts
+++ b/x-pack/test/functional/apps/index_patterns/index.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function advancedSettingsApp({
-  loadTestFile,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function advancedSettingsApp({ loadTestFile }: FtrProviderContext) {
   describe('Index Patterns', function indexPatternsTestSuite() {
     this.tags('ciGroup2');
     loadTestFile(require.resolve('./feature_controls'));
diff --git a/x-pack/test/functional/apps/infra/feature_controls/index.ts b/x-pack/test/functional/apps/infra/feature_controls/index.ts
index 112c1ca137278..12e5984660c0d 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   // FLAKY: https://github.com/elastic/kibana/issues/35932
   describe.skip('feature controls', function() {
     this.tags('skipFirefox');
diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
index dcd6b2a82e6a8..64feb703a11d7 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
@@ -4,12 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 import { DATES } from '../constants';
 
 const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData;
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
   const PageObjects = getPageObjects(['common', 'infraHome', 'security']);
diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts
index 14a89fa6b2470..8a584b9ef5839 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts
@@ -5,13 +5,12 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 import { DATES } from '../constants';
 
 const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData;
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'infraHome', 'security', 'spaceSelector']);
diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
index c102cb0381e21..76222a24b38ba 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
   const PageObjects = getPageObjects(['common', 'infraHome', 'security']);
diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts
index 5cd94516e1adc..f336716167108 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'infraHome', 'security', 'spaceSelector']);
diff --git a/x-pack/test/functional/apps/infra/home_page.ts b/x-pack/test/functional/apps/infra/home_page.ts
index e93d3490fd993..0c1d57202b8eb 100644
--- a/x-pack/test/functional/apps/infra/home_page.ts
+++ b/x-pack/test/functional/apps/infra/home_page.ts
@@ -4,14 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
 const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData;
 const DATE_WITHOUT_DATA = DATES.metricsAndLogs.hosts.withoutData;
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const pageObjects = getPageObjects(['common', 'infraHome']);
 
diff --git a/x-pack/test/functional/apps/infra/index.ts b/x-pack/test/functional/apps/infra/index.ts
index d2f293fa83434..ac747dca23b4a 100644
--- a/x-pack/test/functional/apps/infra/index.ts
+++ b/x-pack/test/functional/apps/infra/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ loadTestFile }: FtrProviderContext) => {
   describe('InfraOps app', function() {
     this.tags('ciGroup7');
 
diff --git a/x-pack/test/functional/apps/infra/logs_source_configuration.ts b/x-pack/test/functional/apps/infra/logs_source_configuration.ts
index 235dd729072a4..27a950ef827ee 100644
--- a/x-pack/test/functional/apps/infra/logs_source_configuration.ts
+++ b/x-pack/test/functional/apps/infra/logs_source_configuration.ts
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const infraLogStream = getService('infraLogStream');
   const infraSourceConfigurationFlyout = getService('infraSourceConfigurationFlyout');
diff --git a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
index b6286d8ba8936..9b22c7ceffb33 100644
--- a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
+++ b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
@@ -4,13 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
 const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData;
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const infraSourceConfigurationFlyout = getService('infraSourceConfigurationFlyout');
   const pageObjects = getPageObjects(['common', 'infraHome']);
diff --git a/x-pack/test/functional/apps/license_management/home_page.ts b/x-pack/test/functional/apps/license_management/home_page.ts
index 96bea5cf462f4..222e5a4fd670c 100644
--- a/x-pack/test/functional/apps/license_management/home_page.ts
+++ b/x-pack/test/functional/apps/license_management/home_page.ts
@@ -5,14 +5,14 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'licenseManagement']);
   const log = getService('log');
 
   describe('Home page', function() {
+    this.tags(['skipCloud']);
     before(async () => {
       await pageObjects.common.navigateToApp('licenseManagement');
     });
diff --git a/x-pack/test/functional/apps/license_management/index.ts b/x-pack/test/functional/apps/license_management/index.ts
index dc541c7225571..7524d00a4b8dd 100644
--- a/x-pack/test/functional/apps/license_management/index.ts
+++ b/x-pack/test/functional/apps/license_management/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ loadTestFile }: FtrProviderContext) => {
   describe('License app', function() {
     this.tags('ciGroup7');
     loadTestFile(require.resolve('./home_page'));
diff --git a/x-pack/test/functional/apps/machine_learning/feature_controls/index.ts b/x-pack/test/functional/apps/machine_learning/feature_controls/index.ts
index 004a5c07ab9f4..ec7eb53fe83c2 100644
--- a/x-pack/test/functional/apps/machine_learning/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/machine_learning/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags('skipFirefox');
     loadTestFile(require.resolve('./ml_security'));
diff --git a/x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts b/x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts
index a6a7a48e8f368..a2b3270c98eb1 100644
--- a/x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts
+++ b/x-pack/test/functional/apps/machine_learning/feature_controls/ml_security.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security: SecurityService = getService('security');
   const appsMenu = getService('appsMenu');
diff --git a/x-pack/test/functional/apps/machine_learning/feature_controls/ml_spaces.ts b/x-pack/test/functional/apps/machine_learning/feature_controls/ml_spaces.ts
index 36ae88c759e12..ea3c10f16ca60 100644
--- a/x-pack/test/functional/apps/machine_learning/feature_controls/ml_spaces.ts
+++ b/x-pack/test/functional/apps/machine_learning/feature_controls/ml_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'error']);
diff --git a/x-pack/test/functional/apps/machine_learning/index.ts b/x-pack/test/functional/apps/machine_learning/index.ts
index a72b1dd3b6b73..3f0e6d0d58142 100644
--- a/x-pack/test/functional/apps/machine_learning/index.ts
+++ b/x-pack/test/functional/apps/machine_learning/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('machine learning', function() {
     this.tags('ciGroup3');
 
diff --git a/x-pack/test/functional/apps/machine_learning/pages.ts b/x-pack/test/functional/apps/machine_learning/pages.ts
index 05f618616aafa..4d6f6d6f94164 100644
--- a/x-pack/test/functional/apps/machine_learning/pages.ts
+++ b/x-pack/test/functional/apps/machine_learning/pages.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const ml = getService('ml');
 
diff --git a/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts b/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts
index 22f3c0fe64392..cfec4749f6847 100644
--- a/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts
+++ b/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
   const PageObjects = getPageObjects(['common', 'settings', 'security', 'maps']);
diff --git a/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts b/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
index b36865ef86d7e..5e0022745680c 100644
--- a/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
+++ b/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'maps', 'security']);
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
index 46fdd8d3921a3..eeaf214ded517 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
@@ -42,7 +42,7 @@ export default function ({ getService, getPageObjects }) {
         expect(await nodeDetail.getSummary()).to.eql({
           transportAddress: 'Transport Address\n127.0.0.1:9300',
           jvmHeap: 'JVM Heap\n29%',
-          freeDiskSpace: 'Free Disk Space\n173.9 GB',
+          freeDiskSpace: 'Free Disk Space\n173.9 GB (37.42%)',
           documentCount: 'Documents\n24.8k',
           dataSize: 'Data\n50.4 MB',
           indicesCount: 'Indices\n20',
@@ -58,7 +58,7 @@ export default function ({ getService, getPageObjects }) {
         expect(await nodeDetail.getSummary()).to.eql({
           transportAddress: 'Transport Address\n127.0.0.1:9302',
           jvmHeap: 'JVM Heap\n17%',
-          freeDiskSpace: 'Free Disk Space\n173.9 GB',
+          freeDiskSpace: 'Free Disk Space\n173.9 GB (37.42%)',
           documentCount: 'Documents\n240',
           dataSize: 'Data\n1.4 MB',
           indicesCount: 'Indices\n4',
@@ -93,7 +93,7 @@ export default function ({ getService, getPageObjects }) {
         expect(await nodeDetail.getSummary()).to.eql({
           transportAddress: 'Transport Address\n127.0.0.1:9302',
           jvmHeap: 'JVM Heap\nN/A',
-          freeDiskSpace: 'Free Disk Space\nN/A',
+          freeDiskSpace: 'Free Disk Space\nN/A (N/A)',
           documentCount: 'Documents\nN/A',
           dataSize: 'Data\nN/A',
           indicesCount: 'Indices\nN/A',
diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/index.ts b/x-pack/test/functional/apps/monitoring/feature_controls/index.ts
index a97d30b61eb9a..77e4cfd45db7a 100644
--- a/x-pack/test/functional/apps/monitoring/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/monitoring/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags('skipFirefox');
     loadTestFile(require.resolve('./monitoring_security'));
diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts
index 3e6e9cc67efae..2d645d161c134 100644
--- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts
+++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security: SecurityService = getService('security');
   const appsMenu = getService('appsMenu');
diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
index 58282269a5422..94714f7b0ca34 100644
--- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
+++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'dashboard', 'security', 'error']);
diff --git a/x-pack/test/functional/apps/remote_clusters/home_page.ts b/x-pack/test/functional/apps/remote_clusters/home_page.ts
index 476591e760875..879a0a11ede78 100644
--- a/x-pack/test/functional/apps/remote_clusters/home_page.ts
+++ b/x-pack/test/functional/apps/remote_clusters/home_page.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'remoteClusters']);
 
   describe('Home page', function() {
diff --git a/x-pack/test/functional/apps/remote_clusters/index.ts b/x-pack/test/functional/apps/remote_clusters/index.ts
index 9538f6a04cbfe..dc47bd9de3815 100644
--- a/x-pack/test/functional/apps/remote_clusters/index.ts
+++ b/x-pack/test/functional/apps/remote_clusters/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ loadTestFile }: FtrProviderContext) => {
   describe('Remote Clusters app', function() {
     this.tags('ciGroup4');
     loadTestFile(require.resolve('./home_page'));
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 85976c8227c75..692dc589cc157 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
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
   const testSubjects = getService('testSubjects');
diff --git a/x-pack/test/functional/apps/saved_objects_management/index.ts b/x-pack/test/functional/apps/saved_objects_management/index.ts
index b7780669990d7..ce550d3a5fa24 100644
--- a/x-pack/test/functional/apps/saved_objects_management/index.ts
+++ b/x-pack/test/functional/apps/saved_objects_management/index.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function savedObjectsManagementApp({
-  loadTestFile,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function savedObjectsManagementApp({ loadTestFile }: FtrProviderContext) {
   describe('Saved objects management', function savedObjectsManagementAppTestSuite() {
     this.tags(['ciGroup2', 'skipFirefox']);
     loadTestFile(require.resolve('./feature_controls/saved_objects_management_security'));
diff --git a/x-pack/test/functional/apps/snapshot_restore/home_page.ts b/x-pack/test/functional/apps/snapshot_restore/home_page.ts
index 5847987e0405b..99d3ea7834e6b 100644
--- a/x-pack/test/functional/apps/snapshot_restore/home_page.ts
+++ b/x-pack/test/functional/apps/snapshot_restore/home_page.ts
@@ -5,10 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'snapshotRestore']);
   const log = getService('log');
 
diff --git a/x-pack/test/functional/apps/snapshot_restore/index.ts b/x-pack/test/functional/apps/snapshot_restore/index.ts
index acde2b9a247d8..f589555fe876d 100644
--- a/x-pack/test/functional/apps/snapshot_restore/index.ts
+++ b/x-pack/test/functional/apps/snapshot_restore/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ loadTestFile }: FtrProviderContext) => {
   describe('Snapshots app', function() {
     this.tags('ciGroup1');
     loadTestFile(require.resolve('./home_page'));
diff --git a/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts b/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts
index 7ac616ce08962..1e74322d0676d 100644
--- a/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts
+++ b/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
   const PageObjects = getPageObjects(['common', 'settings', 'security']);
diff --git a/x-pack/test/functional/apps/spaces/index.ts b/x-pack/test/functional/apps/spaces/index.ts
index ccb7d28ae51b6..56e2d410678ff 100644
--- a/x-pack/test/functional/apps/spaces/index.ts
+++ b/x-pack/test/functional/apps/spaces/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function spacesApp({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function spacesApp({ loadTestFile }: FtrProviderContext) {
   describe('Spaces app', function spacesAppTestSuite() {
     this.tags('ciGroup4');
 
diff --git a/x-pack/test/functional/apps/spaces/spaces_selection.ts b/x-pack/test/functional/apps/spaces/spaces_selection.ts
index e7a265589f25c..9b4c99334dd67 100644
--- a/x-pack/test/functional/apps/spaces/spaces_selection.ts
+++ b/x-pack/test/functional/apps/spaces/spaces_selection.ts
@@ -3,13 +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 { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
 export default function spaceSelectorFunctonalTests({
   getService,
   getPageObjects,
-}: KibanaFunctionalTestDefaultProviders) {
+}: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects([
     'common',
diff --git a/x-pack/test/functional/apps/status_page/index.ts b/x-pack/test/functional/apps/status_page/index.ts
index 21880070e4c05..f078f0b8f3a44 100644
--- a/x-pack/test/functional/apps/status_page/index.ts
+++ b/x-pack/test/functional/apps/status_page/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function statusPage({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function statusPage({ loadTestFile }: FtrProviderContext) {
   describe('Status page', function statusPageTestSuite() {
     this.tags('ciGroup4');
 
diff --git a/x-pack/test/functional/apps/status_page/lib/types.ts b/x-pack/test/functional/apps/status_page/lib/types.ts
deleted file mode 100644
index 2ed91406e5f48..0000000000000
--- a/x-pack/test/functional/apps/status_page/lib/types.ts
+++ /dev/null
@@ -1,27 +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.
- */
-
-export type DescribeFn = (text: string, fn: () => void) => void;
-
-export interface TestDefinitionAuthentication {
-  username?: string;
-  password?: string;
-}
-
-export type LoadTestFileFn = (path: string) => string;
-
-export type GetServiceFn = (service: string) => any;
-
-export type ReadConfigFileFn = (path: string) => any;
-
-export type GetPageObjectsFn = (pageObjects: string[]) => any;
-
-export interface TestInvoker {
-  getService: GetServiceFn;
-  getPageObjects: GetPageObjectsFn;
-  loadTestFile: LoadTestFileFn;
-  readConfigFile: ReadConfigFileFn;
-}
diff --git a/x-pack/test/functional/apps/status_page/status_page.ts b/x-pack/test/functional/apps/status_page/status_page.ts
index 6df02589a9ce1..ffd87ff74588c 100644
--- a/x-pack/test/functional/apps/status_page/status_page.ts
+++ b/x-pack/test/functional/apps/status_page/status_page.ts
@@ -3,10 +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 { TestInvoker } from './lib/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function statusPageFunctonalTests({ getService, getPageObjects }: TestInvoker) {
+export default function statusPageFunctonalTests({
+  getService,
+  getPageObjects,
+}: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['security', 'statusPage', 'home']);
 
diff --git a/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts b/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts
index 77d50037ce98b..073d54b9088bb 100644
--- a/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts
+++ b/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
   const PageObjects = getPageObjects(['common', 'timelion', 'header', 'security', 'spaceSelector']);
diff --git a/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts b/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts
index 3871a7d5142d7..9c39e7efa35ac 100644
--- a/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts
+++ b/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'timelion', 'security', 'spaceSelector']);
diff --git a/x-pack/test/functional/apps/timelion/index.ts b/x-pack/test/functional/apps/timelion/index.ts
index 766d13c6629c9..ff90a906ecd30 100644
--- a/x-pack/test/functional/apps/timelion/index.ts
+++ b/x-pack/test/functional/apps/timelion/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function timelion({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function timelion({ loadTestFile }: FtrProviderContext) {
   describe('Timelion', function visualizeTestSuite() {
     this.tags(['ciGroup4', 'skipFirefox']);
 
diff --git a/x-pack/test/functional/apps/upgrade_assistant/index.ts b/x-pack/test/functional/apps/upgrade_assistant/index.ts
index 5a731355196f1..0e6c52f0812ee 100644
--- a/x-pack/test/functional/apps/upgrade_assistant/index.ts
+++ b/x-pack/test/functional/apps/upgrade_assistant/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function upgradeCheckup({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function upgradeCheckup({ loadTestFile }: FtrProviderContext) {
   describe('Upgrade checkup ', function upgradeAssistantTestSuite() {
     this.tags('ciGroup4');
 
diff --git a/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts b/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts
index a3b340d99cdfd..42118f4c63b1f 100644
--- a/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts
+++ b/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts
@@ -4,13 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
 export default function upgradeAssistantFunctionalTests({
   getService,
   getPageObjects,
-}: KibanaFunctionalTestDefaultProviders) {
+}: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['upgradeAssistant']);
 
diff --git a/x-pack/test/functional/apps/uptime/feature_controls/index.ts b/x-pack/test/functional/apps/uptime/feature_controls/index.ts
index fbc3442c6b856..839cc6487df48 100644
--- a/x-pack/test/functional/apps/uptime/feature_controls/index.ts
+++ b/x-pack/test/functional/apps/uptime/feature_controls/index.ts
@@ -3,10 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function() {
     this.tags('skipFirefox');
     loadTestFile(require.resolve('./uptime_security'));
diff --git a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
index f9b0e9a81566c..aa41cdc0af3d7 100644
--- a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
+++ b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SecurityService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security: SecurityService = getService('security');
   const PageObjects = getPageObjects(['common', 'error', 'timePicker', 'security']);
@@ -74,7 +73,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it('can navigate to Uptime app', async () => {
         await PageObjects.common.navigateToApp('uptime');
-        await testSubjects.existOrFail('uptimeApp', 10000);
+        await testSubjects.existOrFail('uptimeApp', { timeout: 10000 });
       });
 
       it(`doesn't show read-only badge`, async () => {
@@ -127,7 +126,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it('can navigate to Uptime app', async () => {
         await PageObjects.common.navigateToApp('uptime');
-        await testSubjects.existOrFail('uptimeApp', 10000);
+        await testSubjects.existOrFail('uptimeApp', { timeout: 10000 });
       });
 
       it(`shows read-only badge`, async () => {
diff --git a/x-pack/test/functional/apps/uptime/feature_controls/uptime_spaces.ts b/x-pack/test/functional/apps/uptime/feature_controls/uptime_spaces.ts
index cf23bff4be775..86e16f0eebd48 100644
--- a/x-pack/test/functional/apps/uptime/feature_controls/uptime_spaces.ts
+++ b/x-pack/test/functional/apps/uptime/feature_controls/uptime_spaces.ts
@@ -5,10 +5,9 @@
  */
 import expect from '@kbn/expect';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'error', 'timePicker', 'security']);
   const testSubjects = getService('testSubjects');
@@ -40,7 +39,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it('can navigate to Uptime app', async () => {
         await PageObjects.common.navigateToApp('uptime');
-        await testSubjects.existOrFail('uptimeApp', 10000);
+        await testSubjects.existOrFail('uptimeApp', { timeout: 10000 });
       });
     });
 
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index 7a53ce7d32aa1..c1bc8f856c467 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -4,12 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const ARCHIVE = 'uptime/full_heartbeat';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ loadTestFile, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
 
diff --git a/x-pack/test/functional/apps/uptime/monitor.ts b/x-pack/test/functional/apps/uptime/monitor.ts
index def84b57f06f7..27709af1a7982 100644
--- a/x-pack/test/functional/apps/uptime/monitor.ts
+++ b/x-pack/test/functional/apps/uptime/monitor.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const pageObjects = getPageObjects(['uptime']);
   const archive = 'uptime/full_heartbeat';
diff --git a/x-pack/test/functional/apps/uptime/overview.ts b/x-pack/test/functional/apps/uptime/overview.ts
index eb7db170d73be..120fb6100654a 100644
--- a/x-pack/test/functional/apps/uptime/overview.ts
+++ b/x-pack/test/functional/apps/uptime/overview.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects }: KibanaFunctionalTestDefaultProviders) => {
+export default ({ getPageObjects }: FtrProviderContext) => {
   // TODO: add UI functional tests
   const pageObjects = getPageObjects(['uptime']);
 
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 8447c2fffe6a7..a0f364964e7b7 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
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
   const PageObjects = getPageObjects([
@@ -81,7 +80,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it(`landing page shows "Create new Visualization" button`, async () => {
         await PageObjects.visualize.gotoVisualizationLandingPage();
-        await testSubjects.existOrFail('visualizeLandingPage', 10000);
+        await testSubjects.existOrFail('visualizeLandingPage', { timeout: 10000 });
         await testSubjects.existOrFail('newItemButton');
       });
 
@@ -94,7 +93,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('visualizationLoader', 10000);
+        await testSubjects.existOrFail('visualizationLoader', { timeout: 10000 });
       });
 
       it('can save existing Visualization', async () => {
@@ -102,7 +101,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('visualizeSaveButton', 10000);
+        await testSubjects.existOrFail('visualizeSaveButton', { timeout: 10000 });
       });
 
       it('Embed code shows create short-url button', async () => {
@@ -162,7 +161,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
 
       it(`landing page shows "Create new Visualization" button`, async () => {
         await PageObjects.visualize.gotoVisualizationLandingPage();
-        await testSubjects.existOrFail('visualizeLandingPage', 10000);
+        await testSubjects.existOrFail('visualizeLandingPage', { timeout: 10000 });
         await testSubjects.existOrFail('newItemButton');
       });
 
@@ -175,7 +174,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('visualizationLoader', 10000);
+        await testSubjects.existOrFail('visualizationLoader', { timeout: 10000 });
       });
 
       it(`can't save existing Visualization`, async () => {
@@ -183,8 +182,8 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('shareTopNavButton', 10000);
-        await testSubjects.missingOrFail('visualizeSaveButton', 10000);
+        await testSubjects.existOrFail('shareTopNavButton', { timeout: 10000 });
+        await testSubjects.missingOrFail('visualizeSaveButton', { timeout: 10000 });
       });
 
       it(`Embed Code doesn't show create short-url button`, async () => {
@@ -241,7 +240,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`edit page redirects to home page`, async () => {
@@ -249,7 +248,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
index e69878f3200dd..c7e8811074bc1 100644
--- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
+++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
@@ -7,10 +7,9 @@ import expect from '@kbn/expect';
 // eslint-disable-next-line max-len
 import { VisualizeConstants } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants';
 import { SpacesService } from '../../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../../types/providers';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getPageObjects, getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const spacesService: SpacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'visualize', 'security', 'spaceSelector']);
@@ -59,7 +58,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('visualizationLoader', 10000);
+        await testSubjects.existOrFail('visualizationLoader', { timeout: 10000 });
       });
     });
 
@@ -96,7 +95,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
         });
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`edit visualization for object which doesn't exist redirects to the home page`, async () => {
@@ -109,7 +108,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
 
       it(`edit visualization for object which exists redirects to the home page`, async () => {
@@ -122,7 +121,7 @@ export default function({ getPageObjects, getService }: KibanaFunctionalTestDefa
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', 10000);
+        await testSubjects.existOrFail('homeApp', { timeout: 10000 });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/visualize/index.ts b/x-pack/test/functional/apps/visualize/index.ts
index 3c59bcdd77bf8..3b35e8e8c35f0 100644
--- a/x-pack/test/functional/apps/visualize/index.ts
+++ b/x-pack/test/functional/apps/visualize/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function visualize({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function visualize({ loadTestFile }: FtrProviderContext) {
   describe('Visualize', function visualizeTestSuite() {
     this.tags(['ciGroup4', 'skipFirefox']);
 
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index cc69bfcf259b7..d106c407f9c2a 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -8,71 +8,8 @@
 
 import { resolve } from 'path';
 
-import {
-  CanvasPageProvider,
-  SecurityPageProvider,
-  MonitoringPageProvider,
-  LogstashPageProvider,
-  GraphPageProvider,
-  GrokDebuggerPageProvider,
-  WatcherPageProvider,
-  ReportingPageProvider,
-  SpaceSelectorPageProvider,
-  AccountSettingProvider,
-  InfraHomePageProvider,
-  InfraLogsPageProvider,
-  GisPageProvider,
-  StatusPagePageProvider,
-  UpgradeAssistantProvider,
-  CodeHomePageProvider,
-  RollupPageProvider,
-  UptimePageProvider,
-  LicenseManagementPageProvider,
-  IndexManagementPageProvider,
-  IndexLifecycleManagementPageProvider,
-  SnapshotRestorePageProvider,
-  CrossClusterReplicationPageProvider,
-  RemoteClustersPageProvider,
-} from './page_objects';
-
-import {
-  MonitoringNoDataProvider,
-  MonitoringClusterListProvider,
-  MonitoringClusterOverviewProvider,
-  MonitoringClusterAlertsProvider,
-  MonitoringElasticsearchSummaryStatusProvider,
-  MonitoringElasticsearchOverviewProvider,
-  MonitoringElasticsearchNodesProvider,
-  MonitoringElasticsearchNodeDetailProvider,
-  MonitoringElasticsearchIndicesProvider,
-  MonitoringElasticsearchIndexDetailProvider,
-  MonitoringElasticsearchShardsProvider,
-  MonitoringBeatsOverviewProvider,
-  MonitoringBeatsListingProvider,
-  MonitoringBeatDetailProvider,
-  MonitoringBeatsSummaryStatusProvider,
-  MonitoringLogstashPipelinesProvider,
-  MonitoringLogstashSummaryStatusProvider,
-  MonitoringKibanaOverviewProvider,
-  MonitoringKibanaInstancesProvider,
-  MonitoringKibanaInstanceProvider,
-  MonitoringKibanaSummaryStatusProvider,
-  PipelineListProvider,
-  PipelineEditorProvider,
-  RandomProvider,
-  AceEditorProvider,
-  GrokDebuggerProvider,
-  UserMenuProvider,
-  UptimeProvider,
-  InfraSourceConfigurationFlyoutProvider,
-  InfraLogStreamProvider,
-  MachineLearningProvider,
-} from './services';
-
-import {
-  SecurityServiceProvider,
-  SpacesServiceProvider,
-} from '../common/services';
+import { services } from './services';
+import { pageObjects } from './page_objects';
 
 // the default export of config files must be a config provider
 // that returns an object with the projects config values
@@ -83,9 +20,6 @@ export default async function ({ readConfigFile }) {
   const kibanaFunctionalConfig = await readConfigFile(
     require.resolve('../../../test/functional/config.js')
   );
-  const kibanaAPITestsConfig = await readConfigFile(
-    require.resolve('../../../test/api_integration/config.js')
-  );
 
   return {
     // list paths to the files that contain your plugins tests
@@ -116,85 +50,17 @@ export default async function ({ readConfigFile }) {
       resolve(__dirname, './apps/dev_tools'),
       resolve(__dirname, './apps/apm'),
       resolve(__dirname, './apps/index_patterns'),
-      resolve(__dirname, './apps/license_management'),
       resolve(__dirname, './apps/index_management'),
       resolve(__dirname, './apps/index_lifecycle_management'),
       resolve(__dirname, './apps/snapshot_restore'),
       resolve(__dirname, './apps/cross_cluster_replication'),
       resolve(__dirname, './apps/remote_clusters'),
+      // This license_management file must be last because it is destructive.
+      resolve(__dirname, './apps/license_management'),
     ],
 
-    // define the name and providers for services that should be
-    // available to your tests. If you don't specify anything here
-    // only the built-in services will be available
-    services: {
-      ...kibanaFunctionalConfig.get('services'),
-      esSupertest: kibanaAPITestsConfig.get('services.esSupertest'),
-      monitoringNoData: MonitoringNoDataProvider,
-      monitoringClusterList: MonitoringClusterListProvider,
-      monitoringClusterOverview: MonitoringClusterOverviewProvider,
-      monitoringClusterAlerts: MonitoringClusterAlertsProvider,
-      monitoringElasticsearchSummaryStatus: MonitoringElasticsearchSummaryStatusProvider,
-      monitoringElasticsearchOverview: MonitoringElasticsearchOverviewProvider,
-      monitoringElasticsearchNodes: MonitoringElasticsearchNodesProvider,
-      monitoringElasticsearchNodeDetail: MonitoringElasticsearchNodeDetailProvider,
-      monitoringElasticsearchIndices: MonitoringElasticsearchIndicesProvider,
-      monitoringElasticsearchIndexDetail: MonitoringElasticsearchIndexDetailProvider,
-      monitoringElasticsearchShards: MonitoringElasticsearchShardsProvider,
-      monitoringBeatsOverview: MonitoringBeatsOverviewProvider,
-      monitoringBeatsListing: MonitoringBeatsListingProvider,
-      monitoringBeatDetail: MonitoringBeatDetailProvider,
-      monitoringBeatsSummaryStatus: MonitoringBeatsSummaryStatusProvider,
-      monitoringLogstashPipelines: MonitoringLogstashPipelinesProvider,
-      monitoringLogstashSummaryStatus: MonitoringLogstashSummaryStatusProvider,
-      monitoringKibanaOverview: MonitoringKibanaOverviewProvider,
-      monitoringKibanaInstances: MonitoringKibanaInstancesProvider,
-      monitoringKibanaInstance: MonitoringKibanaInstanceProvider,
-      monitoringKibanaSummaryStatus: MonitoringKibanaSummaryStatusProvider,
-      pipelineList: PipelineListProvider,
-      pipelineEditor: PipelineEditorProvider,
-      random: RandomProvider,
-      aceEditor: AceEditorProvider,
-      grokDebugger: GrokDebuggerProvider,
-      security: SecurityServiceProvider,
-      spaces: SpacesServiceProvider,
-      userMenu: UserMenuProvider,
-      uptime: UptimeProvider,
-      rollup: RollupPageProvider,
-      infraSourceConfigurationFlyout: InfraSourceConfigurationFlyoutProvider,
-      infraLogStream: InfraLogStreamProvider,
-      ml: MachineLearningProvider,
-    },
-
-    // just like services, PageObjects are defined as a map of
-    // names to Providers. Merge in Kibana's or pick specific ones
-    pageObjects: {
-      ...kibanaFunctionalConfig.get('pageObjects'),
-      canvas: CanvasPageProvider,
-      security: SecurityPageProvider,
-      accountSetting: AccountSettingProvider,
-      monitoring: MonitoringPageProvider,
-      logstash: LogstashPageProvider,
-      graph: GraphPageProvider,
-      grokDebugger: GrokDebuggerPageProvider,
-      watcher: WatcherPageProvider,
-      reporting: ReportingPageProvider,
-      spaceSelector: SpaceSelectorPageProvider,
-      infraHome: InfraHomePageProvider,
-      infraLogs: InfraLogsPageProvider,
-      maps: GisPageProvider,
-      statusPage: StatusPagePageProvider,
-      upgradeAssistant: UpgradeAssistantProvider,
-      code: CodeHomePageProvider,
-      uptime: UptimePageProvider,
-      rollup: RollupPageProvider,
-      licenseManagement: LicenseManagementPageProvider,
-      indexManagement: IndexManagementPageProvider,
-      indexLifecycleManagement: IndexLifecycleManagementPageProvider,
-      snapshotRestore: SnapshotRestorePageProvider,
-      crossClusterReplication: CrossClusterReplicationPageProvider,
-      remoteClusters: RemoteClustersPageProvider
-    },
+    services,
+    pageObjects,
 
     servers: kibanaFunctionalConfig.get('servers'),
 
diff --git a/x-pack/test/functional/es_archives/actions/README.md b/x-pack/test/functional/es_archives/actions/README.md
index 89e699aa6a04d..e833a429dce07 100644
--- a/x-pack/test/functional/es_archives/actions/README.md
+++ b/x-pack/test/functional/es_archives/actions/README.md
@@ -1,4 +1,4 @@
-The values of `id` and `actionTypeConfigSecrets` in the `basic/data.json` file
+The values of `id` and `secrets` in the `basic/data.json` file
 may change over time, and to get the current "correct" value to replace it with,
 you can do the following:
 
@@ -9,13 +9,13 @@ you can do the following:
 
 - figure out what data got put in ES via
 
-      curl http://elastic:changeme@localhost:9220/_search -v | json
+      curl -v 'http://elastic:changeme@localhost:9220/_search?q=type:action' | json
 
-- there should be a new `id` and `actionTypeConfigSecrets`
+- there should be a new `id` and `secrets`
 
 - update the following files:
 
-    - `id` and `actionTypeConfigSecrets`
+    - `id` and `secrets`
 
       `x-pack/test/functional/es_archives/actions/basic/data.json`
 
diff --git a/x-pack/test/functional/es_archives/actions/basic/data.json b/x-pack/test/functional/es_archives/actions/basic/data.json
index 4509fcc038576..b8dc9e307ee9e 100644
--- a/x-pack/test/functional/es_archives/actions/basic/data.json
+++ b/x-pack/test/functional/es_archives/actions/basic/data.json
@@ -1,6 +1,6 @@
 {
   "value": {
-    "id": "action:19cfba7c-711a-4170-8590-9a99a281e85c",
+    "id": "action:60071910-1ef1-4a72-9a68-b94af6a836a7",
     "index": ".kibana",
     "source": {
       "type": "action",
@@ -8,10 +8,10 @@
       "action": {
         "description": "My action",
         "actionTypeId": "test.index-record",
-        "actionTypeConfig": {
+        "config": {
           "unencrypted" : "This value shouldn't get encrypted"
         },
-        "actionTypeConfigSecrets": "iQw4fXsPBWItxabHCqQOZhPgkvDzvB7RMEMeWjg7WbcWbhi05KWp7xAmfnUaUZ0wDgHHcrujMiVTYdfXRnL4IZdIbiFDoDsOTicF2PucUGlpspSSFI2KJQIr+bLiFz+LqULMouIkhtPYEZSQ1oU6OECxn54aNExZ+NLbC+TMewp7+C6lWZ+BVqHA"
+        "secrets": "P1k6WTkcODQcb9+xWwO9s9qrCTimK2pMJDOtN0gJsraa0zx5dRroZ2Ppsr6D5ffPSN5QpO0aPVvef7/TLTw3A2Fn7Q44hrz+nEqZ+NBQ2zmQFq+8208DrhNu/Z+4M175UW+u8mUX3tkGqGU/rcbw9HGHK8NcpZC6Fgx5wCmUSfQWklNN2FJXjyAG"
       }
     }
   }
@@ -27,7 +27,7 @@
       "action": {
         "description": "My failing action",
         "actionTypeId": "test.failing",
-        "actionTypeConfig": {}
+        "config": {}
       }
     }
   }
@@ -43,8 +43,27 @@
       "action": {
         "description": "My rate limited action",
         "actionTypeId": "test.rate-limit",
-        "actionTypeConfig": {}
+        "config": {}
       }
     }
   }
 }
+
+{
+  "value": {
+    "id" : "space_1:action:6c7d0f6b-2fb5-4821-b182-624fc3ccc7a3",
+    "index" : ".kibana",
+    "source" : {
+      "action" : {
+        "description" : "My action",
+        "actionTypeId" : "test.index-record",
+        "config" : {
+          "unencrypted" : "This value shouldn't get encrypted"
+        },
+        "secrets" : "LEepwqGVUSkkAZSYCGDz3Y0DGoRgBGPRnu+Ta0jmEz+TiGUj3SBYWL6t2jqncBhsWgzSzwCusY+z5B/k+4wjaXW5t/KxNZP7bGpLQK0hL9IwKxqmRzRbEvX0nzeExxgfSaMRjjn2SnrE21MTw6qyBwGNqnuvmN7ILde4ZUbR9Jyjl8A6Y0GDcWvN"
+      },
+      "type": "action",
+      "namespace": "space_1"
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/actions/basic/mappings.json b/x-pack/test/functional/es_archives/actions/basic/mappings.json
index 0113e064db3ab..d9b4918add58f 100644
--- a/x-pack/test/functional/es_archives/actions/basic/mappings.json
+++ b/x-pack/test/functional/es_archives/actions/basic/mappings.json
@@ -56,11 +56,11 @@
               "actionTypeId": {
                 "type": "keyword"
               },
-              "actionTypeConfig": {
-                "dynamic": "true",
+              "config": {
+                "enabled": "false",
                 "type": "object"
               },
-              "actionTypeConfigSecrets": {
+              "secrets": {
                 "type": "binary"
               }
             }
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/data.json.gz b/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/data.json.gz
new file mode 100644
index 0000000000000..28f641523191f
Binary files /dev/null and b/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/mappings.json b/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/mappings.json
new file mode 100644
index 0000000000000..0fe0c00d72809
--- /dev/null
+++ b/x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws/mappings.json
@@ -0,0 +1,17024 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+    },
+    "index": "filebeat-2019.07.25",
+    "mappings": {
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "properties": {
+            "ephemeral_id": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "hostname": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "id": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "type": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "version": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "cloud": {
+          "properties": {
+            "availability_zone": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "instance": {
+              "properties": {
+                "id": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "machine": {
+              "properties": {
+                "type": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "project": {
+              "properties": {
+                "id": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "provider": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "container": {
+          "properties": {
+            "id": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "image": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "labels": {
+              "properties": {
+                "annotation_io_kubernetes_container_hash": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "annotation_io_kubernetes_container_ports": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "annotation_io_kubernetes_container_restartCount": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "annotation_io_kubernetes_container_terminationMessagePath": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "annotation_io_kubernetes_container_terminationMessagePolicy": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "annotation_io_kubernetes_pod_terminationGracePeriod": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "io_kubernetes_container_logpath": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "io_kubernetes_container_name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "io_kubernetes_docker_type": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "io_kubernetes_pod_name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "io_kubernetes_pod_namespace": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "io_kubernetes_pod_uid": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "io_kubernetes_sandbox_id": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "license": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "maintainer": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "org_label-schema_build-date": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "org_label-schema_license": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "org_label-schema_name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "org_label-schema_schema-version": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "org_label-schema_url": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "org_label-schema_vcs-url": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "org_label-schema_vendor": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "org_label-schema_version": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "elasticsearch": {
+          "properties": {
+            "cluster": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "uuid": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "component": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "index": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "node": {
+              "properties": {
+                "id": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "server": {
+              "properties": {
+                "cluster": {
+                  "type": "object"
+                },
+                "gc": {
+                  "properties": {
+                    "collection_duration": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "observation_duration": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "overhead_seq": {
+                      "fields": {
+                        "keyword": {
+                          "ignore_above": 256,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "text"
+                    }
+                  }
+                },
+                "node": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "message": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "dataset": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "module": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "timezone": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "fileset": {
+          "properties": {
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "architecture": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "containerized": {
+              "type": "boolean"
+            },
+            "hostname": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "os": {
+              "properties": {
+                "codename": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "family": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "kernel": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "platform": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "version": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            }
+          }
+        },
+        "http": {
+          "properties": {
+            "request": {
+              "properties": {
+                "method": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "referrer": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "status_code": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "input": {
+          "properties": {
+            "type": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "kibana": {
+          "properties": {
+            "log": {
+              "properties": {
+                "meta": {
+                  "properties": {
+                    "req": {
+                      "properties": {
+                        "headers": {
+                          "properties": {
+                            "accept": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "accept-encoding": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "accept-language": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "content-length": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "content-type": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "dnt": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "host": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "kbn-system-api": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "kbn-version": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "origin": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "x-forwarded-for": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "x-forwarded-host": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "x-forwarded-port": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "x-forwarded-proto": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "x-original-uri": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "x-real-ip": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "x-request-id": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            },
+                            "x-scheme": {
+                              "fields": {
+                                "keyword": {
+                                  "ignore_above": 256,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "text"
+                            }
+                          }
+                        },
+                        "userAgent": {
+                          "fields": {
+                            "keyword": {
+                              "ignore_above": 256,
+                              "type": "keyword"
+                            }
+                          },
+                          "type": "text"
+                        }
+                      }
+                    },
+                    "res": {
+                      "type": "object"
+                    },
+                    "type": {
+                      "fields": {
+                        "keyword": {
+                          "ignore_above": 256,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "kubernetes": {
+          "properties": {
+            "container": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "labels": {
+              "properties": {
+                "app": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "chart": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "component": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "controller-revision-hash": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "controller-uid": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "heritage": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "job-name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "pod-template-hash": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "release": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "role": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "service": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "statefulset_kubernetes_io/pod-name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "namespace": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "pod": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "uid": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "replicaset": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "statefulset": {
+              "properties": {
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            }
+          }
+        },
+        "log": {
+          "properties": {
+            "file": {
+              "properties": {
+                "path": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "flags": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "level": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "offset": {
+              "type": "long"
+            }
+          }
+        },
+        "message": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "nginx": {
+          "properties": {
+            "access": {
+              "properties": {
+                "body_sent": {
+                  "properties": {
+                    "bytes": {
+                      "fields": {
+                        "keyword": {
+                          "ignore_above": 256,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "text"
+                    }
+                  }
+                },
+                "geoip": {
+                  "properties": {
+                    "continent_name": {
+                      "fields": {
+                        "keyword": {
+                          "ignore_above": 256,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "text"
+                    },
+                    "country_iso_code": {
+                      "fields": {
+                        "keyword": {
+                          "ignore_above": 256,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "text"
+                    },
+                    "location": {
+                      "properties": {
+                        "lat": {
+                          "type": "float"
+                        },
+                        "lon": {
+                          "type": "float"
+                        }
+                      }
+                    }
+                  }
+                },
+                "http_version": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "method": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "referrer": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "remote_ip": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "response_code": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "url": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "user_agent": {
+                  "properties": {
+                    "device": {
+                      "properties": {
+                        "name": {
+                          "fields": {
+                            "keyword": {
+                              "ignore_above": 256,
+                              "type": "keyword"
+                            }
+                          },
+                          "type": "text"
+                        }
+                      }
+                    },
+                    "name": {
+                      "fields": {
+                        "keyword": {
+                          "ignore_above": 256,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "text"
+                    },
+                    "original": {
+                      "fields": {
+                        "keyword": {
+                          "ignore_above": 256,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "text"
+                    },
+                    "os": {
+                      "properties": {
+                        "name": {
+                          "fields": {
+                            "keyword": {
+                              "ignore_above": 256,
+                              "type": "keyword"
+                            }
+                          },
+                          "type": "text"
+                        }
+                      }
+                    },
+                    "version": {
+                      "fields": {
+                        "keyword": {
+                          "ignore_above": 256,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "error": {
+              "properties": {
+                "connection_id": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "level": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "message": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "pid": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                },
+                "tid": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            }
+          }
+        },
+        "process": {
+          "properties": {
+            "pid": {
+              "type": "long"
+            }
+          }
+        },
+        "read_timestamp": {
+          "type": "date"
+        },
+        "redis": {
+          "properties": {
+            "log": {
+              "properties": {
+                "role": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            }
+          }
+        },
+        "service": {
+          "properties": {
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "type": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "source": {
+          "properties": {
+            "address": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "ip": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "stream": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "tags": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "temp": {
+          "type": "object"
+        },
+        "url": {
+          "properties": {
+            "original": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "user_agent": {
+          "properties": {
+            "original": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "mapping": {
+          "total_fields": {
+            "limit": "10000"
+          }
+        },
+        "number_of_replicas": "0",
+        "number_of_shards": "1",
+        "query": {
+          "default_field": [
+            "beat.*",
+            "type",
+            "tags",
+            "meta.*",
+            "message"
+          ]
+        }
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+    },
+    "index": "metricbeat-2019.07.25",
+    "mappings": {
+      "_meta": {
+        "beat": "metricbeat",
+        "version": "8.0.0"
+      },
+      "date_detection": false,
+      "dynamic_templates": [
+        {
+          "labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "labels.*"
+          }
+        },
+        {
+          "container.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "container.labels.*"
+          }
+        },
+        {
+          "fields": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "fields.*"
+          }
+        },
+        {
+          "docker.container.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "docker.container.labels.*"
+          }
+        },
+        {
+          "aws.tags.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "path_match": "aws.tags.*"
+          }
+        },
+        {
+          "aws.cloudwatch.metrics.*": {
+            "mapping": {
+              "type": "double"
+            },
+            "path_match": "aws.cloudwatch.metrics.*"
+          }
+        },
+        {
+          "aws.cloudwatch.dimensions.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "path_match": "aws.cloudwatch.dimensions.*"
+          }
+        },
+        {
+          "coredns.stats.dns.request.duration.ns.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "coredns.stats.dns.request.duration.ns.bucket.*"
+          }
+        },
+        {
+          "coredns.stats.dns.request.size.bytes.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "coredns.stats.dns.request.size.bytes.bucket.*"
+          }
+        },
+        {
+          "coredns.stats.dns.response.size.bytes.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "coredns.stats.dns.response.size.bytes.bucket.*"
+          }
+        },
+        {
+          "docker.cpu.core.*.pct": {
+            "mapping": {
+              "scaling_factor": 1000,
+              "type": "scaled_float"
+            },
+            "path_match": "docker.cpu.core.*.pct"
+          }
+        },
+        {
+          "docker.cpu.core.*.ticks": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "docker.cpu.core.*.ticks"
+          }
+        },
+        {
+          "docker.event.actor.attributes": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "docker.event.actor.attributes.*"
+          }
+        },
+        {
+          "docker.image.labels": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "docker.image.labels.*"
+          }
+        },
+        {
+          "etcd.disk.wal_fsync_duration.ns.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "etcd.disk.wal_fsync_duration.ns.bucket.*"
+          }
+        },
+        {
+          "etcd.disk.backend_commit_duration.ns.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "etcd.disk.backend_commit_duration.ns.bucket.*"
+          }
+        },
+        {
+          "kubernetes.apiserver.http.request.duration.us.percentile.*": {
+            "mapping": {
+              "type": "double"
+            },
+            "match_mapping_type": "double",
+            "path_match": "kubernetes.apiserver.http.request.duration.us.percentile.*"
+          }
+        },
+        {
+          "kubernetes.apiserver.http.request.size.bytes.percentile.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.apiserver.http.request.size.bytes.percentile.*"
+          }
+        },
+        {
+          "kubernetes.apiserver.http.response.size.bytes.percentile.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.apiserver.http.response.size.bytes.percentile.*"
+          }
+        },
+        {
+          "kubernetes.apiserver.request.latency.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.apiserver.request.latency.bucket.*"
+          }
+        },
+        {
+          "kubernetes.apiserver.request.duration.us.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.apiserver.request.duration.us.bucket.*"
+          }
+        },
+        {
+          "kubernetes.controllermanager.http.request.duration.us.percentile.*": {
+            "mapping": {
+              "type": "double"
+            },
+            "match_mapping_type": "double",
+            "path_match": "kubernetes.controllermanager.http.request.duration.us.percentile.*"
+          }
+        },
+        {
+          "kubernetes.controllermanager.http.request.size.bytes.percentile.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.controllermanager.http.request.size.bytes.percentile.*"
+          }
+        },
+        {
+          "kubernetes.controllermanager.http.response.size.bytes.percentile.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.controllermanager.http.response.size.bytes.percentile.*"
+          }
+        },
+        {
+          "kubernetes.proxy.http.request.duration.us.percentile.*": {
+            "mapping": {
+              "type": "double"
+            },
+            "match_mapping_type": "double",
+            "path_match": "kubernetes.proxy.http.request.duration.us.percentile.*"
+          }
+        },
+        {
+          "kubernetes.proxy.http.request.size.bytes.percentile.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.proxy.http.request.size.bytes.percentile.*"
+          }
+        },
+        {
+          "kubernetes.proxy.http.response.size.bytes.percentile.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.proxy.http.response.size.bytes.percentile.*"
+          }
+        },
+        {
+          "kubernetes.proxy.sync.rules.duration.us.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.proxy.sync.rules.duration.us.bucket.*"
+          }
+        },
+        {
+          "kubernetes.proxy.sync.networkprogramming.duration.us.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.proxy.sync.networkprogramming.duration.us.bucket.*"
+          }
+        },
+        {
+          "kubernetes.scheduler.http.request.duration.us.percentile.*": {
+            "mapping": {
+              "type": "double"
+            },
+            "match_mapping_type": "double",
+            "path_match": "kubernetes.scheduler.http.request.duration.us.percentile.*"
+          }
+        },
+        {
+          "kubernetes.scheduler.http.request.size.bytes.percentile.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.scheduler.http.request.size.bytes.percentile.*"
+          }
+        },
+        {
+          "kubernetes.scheduler.http.response.size.bytes.percentile.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.scheduler.http.response.size.bytes.percentile.*"
+          }
+        },
+        {
+          "kubernetes.scheduler.scheduling.e2e.duration.us.bucket.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "kubernetes.scheduler.scheduling.e2e.duration.us.bucket.*"
+          }
+        },
+        {
+          "kubernetes.scheduler.scheduling.duration.seconds.percentile.*": {
+            "mapping": {
+              "type": "double"
+            },
+            "match_mapping_type": "double",
+            "path_match": "kubernetes.scheduler.scheduling.duration.seconds.percentile.*"
+          }
+        },
+        {
+          "munin.metrics.*": {
+            "mapping": {
+              "type": "double"
+            },
+            "path_match": "munin.metrics.*"
+          }
+        },
+        {
+          "prometheus.labels.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "prometheus.labels.*"
+          }
+        },
+        {
+          "prometheus.metrics.*": {
+            "mapping": {
+              "type": "double"
+            },
+            "path_match": "prometheus.metrics.*"
+          }
+        },
+        {
+          "system.process.env": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "system.process.env.*"
+          }
+        },
+        {
+          "system.process.cgroup.cpuacct.percpu": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "system.process.cgroup.cpuacct.percpu.*"
+          }
+        },
+        {
+          "system.raid.disks.states.*": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "system.raid.disks.states.*"
+          }
+        },
+        {
+          "traefik.health.response.status_codes.*": {
+            "mapping": {
+              "type": "long"
+            },
+            "match_mapping_type": "long",
+            "path_match": "traefik.health.response.status_codes.*"
+          }
+        },
+        {
+          "vsphere.virtualmachine.custom_fields": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match_mapping_type": "string",
+            "path_match": "vsphere.virtualmachine.custom_fields.*"
+          }
+        },
+        {
+          "strings_as_keyword": {
+            "mapping": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "match_mapping_type": "string"
+          }
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "aerospike": {
+          "properties": {
+            "namespace": {
+              "properties": {
+                "client": {
+                  "properties": {
+                    "delete": {
+                      "properties": {
+                        "error": {
+                          "type": "long"
+                        },
+                        "not_found": {
+                          "type": "long"
+                        },
+                        "success": {
+                          "type": "long"
+                        },
+                        "timeout": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "read": {
+                      "properties": {
+                        "error": {
+                          "type": "long"
+                        },
+                        "not_found": {
+                          "type": "long"
+                        },
+                        "success": {
+                          "type": "long"
+                        },
+                        "timeout": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "write": {
+                      "properties": {
+                        "error": {
+                          "type": "long"
+                        },
+                        "success": {
+                          "type": "long"
+                        },
+                        "timeout": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "device": {
+                  "properties": {
+                    "available": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "free": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "hwm_breached": {
+                  "type": "boolean"
+                },
+                "memory": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "data": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "index": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "sindex": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "total": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "node": {
+                  "properties": {
+                    "host": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "objects": {
+                  "properties": {
+                    "master": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "stop_writes": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        },
+        "agent": {
+          "properties": {
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "apache": {
+          "properties": {
+            "status": {
+              "properties": {
+                "bytes_per_request": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                },
+                "bytes_per_sec": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                },
+                "connections": {
+                  "properties": {
+                    "async": {
+                      "properties": {
+                        "closing": {
+                          "type": "long"
+                        },
+                        "keep_alive": {
+                          "type": "long"
+                        },
+                        "writing": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "cpu": {
+                  "properties": {
+                    "children_system": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "children_user": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "load": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "system": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "user": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "hostname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "load": {
+                  "properties": {
+                    "1": {
+                      "scaling_factor": 100,
+                      "type": "scaled_float"
+                    },
+                    "15": {
+                      "scaling_factor": 100,
+                      "type": "scaled_float"
+                    },
+                    "5": {
+                      "scaling_factor": 100,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "requests_per_sec": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                },
+                "scoreboard": {
+                  "properties": {
+                    "closing_connection": {
+                      "type": "long"
+                    },
+                    "dns_lookup": {
+                      "type": "long"
+                    },
+                    "gracefully_finishing": {
+                      "type": "long"
+                    },
+                    "idle_cleanup": {
+                      "type": "long"
+                    },
+                    "keepalive": {
+                      "type": "long"
+                    },
+                    "logging": {
+                      "type": "long"
+                    },
+                    "open_slot": {
+                      "type": "long"
+                    },
+                    "reading_request": {
+                      "type": "long"
+                    },
+                    "sending_reply": {
+                      "type": "long"
+                    },
+                    "starting_up": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    },
+                    "waiting_for_connection": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "total_accesses": {
+                  "type": "long"
+                },
+                "total_kbytes": {
+                  "type": "long"
+                },
+                "uptime": {
+                  "properties": {
+                    "server_uptime": {
+                      "type": "long"
+                    },
+                    "uptime": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "workers": {
+                  "properties": {
+                    "busy": {
+                      "type": "long"
+                    },
+                    "idle": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "aws": {
+          "properties": {
+            "cloudwatch": {
+              "properties": {
+                "dimensions": {
+                  "properties": {
+                    "*": {
+                      "type": "object"
+                    }
+                  }
+                },
+                "metrics": {
+                  "properties": {
+                    "*": {
+                      "type": "object"
+                    }
+                  }
+                },
+                "namespace": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ec2": {
+              "properties": {
+                "cpu": {
+                  "properties": {
+                    "credit_balance": {
+                      "type": "long"
+                    },
+                    "credit_usage": {
+                      "type": "long"
+                    },
+                    "surplus_credit_balance": {
+                      "type": "long"
+                    },
+                    "surplus_credits_charged": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    }
+                  }
+                },
+                "diskio": {
+                  "properties": {
+                    "read": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "count": {
+                          "type": "long"
+                        },
+                        "ops": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "write": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "count": {
+                          "type": "long"
+                        },
+                        "ops": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "instance": {
+                  "properties": {
+                    "core": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "image": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "monitoring": {
+                      "properties": {
+                        "state": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "private": {
+                      "properties": {
+                        "dns_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "ip": {
+                          "type": "ip"
+                        }
+                      }
+                    },
+                    "public": {
+                      "properties": {
+                        "dns_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "ip": {
+                          "type": "ip"
+                        }
+                      }
+                    },
+                    "state": {
+                      "properties": {
+                        "code": {
+                          "type": "long"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "threads_per_core": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "network": {
+                  "properties": {
+                    "in": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "packets": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "out": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "packets": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "status": {
+                  "properties": {
+                    "check_failed": {
+                      "type": "long"
+                    },
+                    "check_failed_instance": {
+                      "type": "long"
+                    },
+                    "check_failed_system": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "rds": {
+              "properties": {
+                "cpu": {
+                  "properties": {
+                    "credit_balance": {
+                      "type": "long"
+                    },
+                    "credit_usage": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    }
+                  }
+                },
+                "database_connections": {
+                  "type": "long"
+                },
+                "db_instance": {
+                  "properties": {
+                    "arn": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "class": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "identifier": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "status": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "deadlocks": {
+                  "type": "long"
+                },
+                "disk_queue_depth": {
+                  "type": "long"
+                },
+                "disk_usage": {
+                  "properties": {
+                    "bin_log": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "replication_slot": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "transaction_logs": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "failed_sql_server_agent_jobs": {
+                  "type": "long"
+                },
+                "free_local_storage": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "free_storage": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "freeable_memory": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "latency": {
+                  "properties": {
+                    "commit": {
+                      "type": "long"
+                    },
+                    "ddl": {
+                      "type": "long"
+                    },
+                    "dml": {
+                      "type": "long"
+                    },
+                    "insert": {
+                      "type": "long"
+                    },
+                    "read": {
+                      "type": "long"
+                    },
+                    "select": {
+                      "type": "long"
+                    },
+                    "update": {
+                      "type": "long"
+                    },
+                    "write": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "login_failures": {
+                  "type": "long"
+                },
+                "maximum_used_transaction_ids": {
+                  "type": "long"
+                },
+                "oldest_replication_slot_lag": {
+                  "properties": {
+                    "mb": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "queries": {
+                  "type": "long"
+                },
+                "read_io": {
+                  "properties": {
+                    "ops_per_sec": {
+                      "type": "float"
+                    }
+                  }
+                },
+                "replica_lag": {
+                  "properties": {
+                    "sec": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "swap_usage": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "throughput": {
+                  "properties": {
+                    "commit": {
+                      "type": "long"
+                    },
+                    "ddl": {
+                      "type": "long"
+                    },
+                    "delete": {
+                      "type": "long"
+                    },
+                    "dml": {
+                      "type": "long"
+                    },
+                    "insert": {
+                      "type": "long"
+                    },
+                    "network": {
+                      "type": "long"
+                    },
+                    "network_receive": {
+                      "type": "long"
+                    },
+                    "network_transmit": {
+                      "type": "long"
+                    },
+                    "read": {
+                      "type": "long"
+                    },
+                    "select": {
+                      "type": "long"
+                    },
+                    "update": {
+                      "type": "long"
+                    },
+                    "write": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "transaction_logs_generation": {
+                  "type": "long"
+                },
+                "transactions": {
+                  "properties": {
+                    "active": {
+                      "type": "long"
+                    },
+                    "blocked": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "volume_used": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write_io": {
+                  "properties": {
+                    "ops_per_sec": {
+                      "type": "float"
+                    }
+                  }
+                }
+              }
+            },
+            "s3_daily_storage": {
+              "properties": {
+                "bucket": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "size": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "number_of_objects": {
+                  "type": "long"
+                }
+              }
+            },
+            "s3_request": {
+              "properties": {
+                "bucket": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "downloaded": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "errors": {
+                  "properties": {
+                    "4xx": {
+                      "type": "long"
+                    },
+                    "5xx": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "latency": {
+                  "properties": {
+                    "first_byte": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total_request": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "requests": {
+                  "properties": {
+                    "delete": {
+                      "type": "long"
+                    },
+                    "get": {
+                      "type": "long"
+                    },
+                    "head": {
+                      "type": "long"
+                    },
+                    "list": {
+                      "type": "long"
+                    },
+                    "post": {
+                      "type": "long"
+                    },
+                    "put": {
+                      "type": "long"
+                    },
+                    "select": {
+                      "type": "long"
+                    },
+                    "select_returned": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "select_scanned": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "uploaded": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "sqs": {
+              "properties": {
+                "empty_receives": {
+                  "type": "long"
+                },
+                "messages": {
+                  "properties": {
+                    "delayed": {
+                      "type": "long"
+                    },
+                    "deleted": {
+                      "type": "long"
+                    },
+                    "not_visible": {
+                      "type": "long"
+                    },
+                    "received": {
+                      "type": "long"
+                    },
+                    "sent": {
+                      "type": "long"
+                    },
+                    "visible": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "oldest_message_age": {
+                  "properties": {
+                    "sec": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "queue": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "sent_message_size": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "tags": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "beat": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "state": {
+              "properties": {
+                "management": {
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "module": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "output": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "queue": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "stats": {
+              "properties": {
+                "libbeat": {
+                  "properties": {
+                    "output": {
+                      "properties": {
+                        "events": {
+                          "properties": {
+                            "acked": {
+                              "type": "long"
+                            },
+                            "active": {
+                              "type": "long"
+                            },
+                            "batches": {
+                              "type": "long"
+                            },
+                            "dropped": {
+                              "type": "long"
+                            },
+                            "duplicates": {
+                              "type": "long"
+                            },
+                            "failed": {
+                              "type": "long"
+                            },
+                            "toomany": {
+                              "type": "long"
+                            },
+                            "total": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "read": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "errors": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "write": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "errors": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "runtime": {
+                  "properties": {
+                    "goroutines": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "uptime": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "ceph": {
+          "properties": {
+            "cluster_disk": {
+              "properties": {
+                "available": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "used": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "cluster_health": {
+              "properties": {
+                "overall_status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timechecks": {
+                  "properties": {
+                    "epoch": {
+                      "type": "long"
+                    },
+                    "round": {
+                      "properties": {
+                        "status": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "cluster_status": {
+              "properties": {
+                "degraded": {
+                  "properties": {
+                    "objects": {
+                      "type": "long"
+                    },
+                    "ratio": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "misplace": {
+                  "properties": {
+                    "objects": {
+                      "type": "long"
+                    },
+                    "ratio": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "osd": {
+                  "properties": {
+                    "epoch": {
+                      "type": "long"
+                    },
+                    "full": {
+                      "type": "boolean"
+                    },
+                    "nearfull": {
+                      "type": "boolean"
+                    },
+                    "num_in_osds": {
+                      "type": "long"
+                    },
+                    "num_osds": {
+                      "type": "long"
+                    },
+                    "num_remapped_pgs": {
+                      "type": "long"
+                    },
+                    "num_up_osds": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "pg": {
+                  "properties": {
+                    "avail_bytes": {
+                      "type": "long"
+                    },
+                    "data_bytes": {
+                      "type": "long"
+                    },
+                    "total_bytes": {
+                      "type": "long"
+                    },
+                    "used_bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "pg_state": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "state_name": {
+                      "type": "long"
+                    },
+                    "version": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "traffic": {
+                  "properties": {
+                    "read_bytes": {
+                      "type": "long"
+                    },
+                    "read_op_per_sec": {
+                      "type": "long"
+                    },
+                    "write_bytes": {
+                      "type": "long"
+                    },
+                    "write_op_per_sec": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "version": {
+                  "type": "long"
+                }
+              }
+            },
+            "monitor_health": {
+              "properties": {
+                "available": {
+                  "properties": {
+                    "kb": {
+                      "type": "long"
+                    },
+                    "pct": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "health": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "last_updated": {
+                  "type": "date"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "store_stats": {
+                  "properties": {
+                    "last_updated": {
+                      "type": "long"
+                    },
+                    "log": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "misc": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "sst": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "kb": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "used": {
+                  "properties": {
+                    "kb": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "osd_df": {
+              "properties": {
+                "available": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "device_class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pg_num": {
+                  "type": "long"
+                },
+                "total": {
+                  "properties": {
+                    "byte": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "used": {
+                  "properties": {
+                    "byte": {
+                      "type": "long"
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                }
+              }
+            },
+            "osd_tree": {
+              "properties": {
+                "children": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "crush_weight": {
+                  "type": "float"
+                },
+                "depth": {
+                  "type": "long"
+                },
+                "device_class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exists": {
+                  "type": "boolean"
+                },
+                "father": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "primary_affinity": {
+                  "type": "float"
+                },
+                "reweight": {
+                  "type": "long"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type_id": {
+                  "type": "long"
+                }
+              }
+            },
+            "pool_disk": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "stats": {
+                  "properties": {
+                    "available": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "objects": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "kb": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "client": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cloud": {
+          "properties": {
+            "account": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "availability_zone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "instance": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "machine": {
+              "properties": {
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "project": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "cockroachdb": {
+          "type": "object"
+        },
+        "consul": {
+          "properties": {
+            "agent": {
+              "properties": {
+                "autopilot": {
+                  "properties": {
+                    "healthy": {
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "runtime": {
+                  "properties": {
+                    "alloc": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "garbage_collector": {
+                      "properties": {
+                        "pause": {
+                          "properties": {
+                            "current": {
+                              "properties": {
+                                "ns": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "total": {
+                              "properties": {
+                                "ns": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "runs": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "goroutines": {
+                      "type": "long"
+                    },
+                    "heap_objects": {
+                      "type": "long"
+                    },
+                    "malloc_count": {
+                      "type": "long"
+                    },
+                    "sys": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "container": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tag": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "properties": {
+                "annotation_checksum/configmap": {
+                  "type": "keyword"
+                },
+                "annotation_checksum/health": {
+                  "type": "keyword"
+                },
+                "annotation_checksum/secret": {
+                  "type": "keyword"
+                },
+                "annotation_configchecksum": {
+                  "type": "keyword"
+                },
+                "annotation_io_kubernetes_container_hash": {
+                  "type": "keyword"
+                },
+                "annotation_io_kubernetes_container_ports": {
+                  "type": "keyword"
+                },
+                "annotation_io_kubernetes_container_restartCount": {
+                  "type": "keyword"
+                },
+                "annotation_io_kubernetes_container_terminationMessagePath": {
+                  "type": "keyword"
+                },
+                "annotation_io_kubernetes_container_terminationMessagePolicy": {
+                  "type": "keyword"
+                },
+                "annotation_io_kubernetes_pod_terminationGracePeriod": {
+                  "type": "keyword"
+                },
+                "annotation_kubernetes_io/config_hash": {
+                  "type": "keyword"
+                },
+                "annotation_kubernetes_io/config_seen": {
+                  "type": "keyword"
+                },
+                "annotation_kubernetes_io/config_source": {
+                  "type": "keyword"
+                },
+                "annotation_kubernetes_io/limit-ranger": {
+                  "type": "keyword"
+                },
+                "annotation_scheduler_alpha_kubernetes_io/critical-pod": {
+                  "type": "keyword"
+                },
+                "annotation_seccomp_security_alpha_kubernetes_io/pod": {
+                  "type": "keyword"
+                },
+                "app": {
+                  "type": "keyword"
+                },
+                "chart": {
+                  "type": "keyword"
+                },
+                "component": {
+                  "type": "keyword"
+                },
+                "controller-revision-hash": {
+                  "type": "keyword"
+                },
+                "controller-uid": {
+                  "type": "keyword"
+                },
+                "description": {
+                  "type": "keyword"
+                },
+                "heritage": {
+                  "type": "keyword"
+                },
+                "io_kubernetes_container_logpath": {
+                  "type": "keyword"
+                },
+                "io_kubernetes_container_name": {
+                  "type": "keyword"
+                },
+                "io_kubernetes_docker_type": {
+                  "type": "keyword"
+                },
+                "io_kubernetes_pod_name": {
+                  "type": "keyword"
+                },
+                "io_kubernetes_pod_namespace": {
+                  "type": "keyword"
+                },
+                "io_kubernetes_pod_uid": {
+                  "type": "keyword"
+                },
+                "io_kubernetes_sandbox_id": {
+                  "type": "keyword"
+                },
+                "job-name": {
+                  "type": "keyword"
+                },
+                "k8s-app": {
+                  "type": "keyword"
+                },
+                "kubernetes_io/cluster-service": {
+                  "type": "keyword"
+                },
+                "license": {
+                  "type": "keyword"
+                },
+                "maintainer": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                },
+                "org_label-schema_build-date": {
+                  "type": "keyword"
+                },
+                "org_label-schema_license": {
+                  "type": "keyword"
+                },
+                "org_label-schema_name": {
+                  "type": "keyword"
+                },
+                "org_label-schema_schema-version": {
+                  "type": "keyword"
+                },
+                "org_label-schema_url": {
+                  "type": "keyword"
+                },
+                "org_label-schema_vcs-ref": {
+                  "type": "keyword"
+                },
+                "org_label-schema_vcs-url": {
+                  "type": "keyword"
+                },
+                "org_label-schema_vendor": {
+                  "type": "keyword"
+                },
+                "org_label-schema_version": {
+                  "type": "keyword"
+                },
+                "pod-template-generation": {
+                  "type": "keyword"
+                },
+                "pod-template-hash": {
+                  "type": "keyword"
+                },
+                "release": {
+                  "type": "keyword"
+                },
+                "role": {
+                  "type": "keyword"
+                },
+                "service": {
+                  "type": "keyword"
+                },
+                "statefulset_kubernetes_io/pod-name": {
+                  "type": "keyword"
+                },
+                "tier": {
+                  "type": "keyword"
+                },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "runtime": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "coredns": {
+          "properties": {
+            "stats": {
+              "properties": {
+                "dns": {
+                  "properties": {
+                    "cache": {
+                      "properties": {
+                        "hits": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "misses": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "do": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "duration": {
+                          "properties": {
+                            "ns": {
+                              "properties": {
+                                "bucket": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "count": {
+                                  "type": "long"
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "bucket": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "count": {
+                                  "type": "long"
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "type": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "response": {
+                      "properties": {
+                        "rcode": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "bucket": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "count": {
+                                  "type": "long"
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "panic": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "proto": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "rcode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "server": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "zone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "couchbase": {
+          "properties": {
+            "bucket": {
+              "properties": {
+                "data": {
+                  "properties": {
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "disk": {
+                  "properties": {
+                    "fetches": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "item_count": {
+                  "type": "long"
+                },
+                "memory": {
+                  "properties": {
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ops_per_sec": {
+                  "type": "long"
+                },
+                "quota": {
+                  "properties": {
+                    "ram": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "use": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    }
+                  }
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "cluster": {
+              "properties": {
+                "hdd": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "quota": {
+                      "properties": {
+                        "total": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "by_data": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "value": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "max_bucket_count": {
+                  "type": "long"
+                },
+                "quota": {
+                  "properties": {
+                    "index_memory": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "memory": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "ram": {
+                  "properties": {
+                    "quota": {
+                      "properties": {
+                        "total": {
+                          "properties": {
+                            "per_node": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "value": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "used": {
+                          "properties": {
+                            "per_node": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "value": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "by_data": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "value": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "node": {
+              "properties": {
+                "cmd_get": {
+                  "type": "long"
+                },
+                "couch": {
+                  "properties": {
+                    "docs": {
+                      "properties": {
+                        "data_size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "disk_size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "spatial": {
+                      "properties": {
+                        "data_size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "disk_size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "views": {
+                      "properties": {
+                        "data_size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "disk_size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "cpu_utilization_rate": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "current_items": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    },
+                    "value": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ep_bg_fetched": {
+                  "type": "long"
+                },
+                "get_hits": {
+                  "type": "long"
+                },
+                "hostname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcd_memory": {
+                  "properties": {
+                    "allocated": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "reserved": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "ops": {
+                  "type": "long"
+                },
+                "swap": {
+                  "properties": {
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uptime": {
+                  "properties": {
+                    "sec": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "vb_replica_curr_items": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "couchdb": {
+          "properties": {
+            "server": {
+              "properties": {
+                "couchdb": {
+                  "properties": {
+                    "auth_cache_hits": {
+                      "type": "long"
+                    },
+                    "auth_cache_misses": {
+                      "type": "long"
+                    },
+                    "database_reads": {
+                      "type": "long"
+                    },
+                    "database_writes": {
+                      "type": "long"
+                    },
+                    "open_databases": {
+                      "type": "long"
+                    },
+                    "open_os_files": {
+                      "type": "long"
+                    },
+                    "request_time": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "httpd": {
+                  "properties": {
+                    "bulk_requests": {
+                      "type": "long"
+                    },
+                    "clients_requesting_changes": {
+                      "type": "long"
+                    },
+                    "requests": {
+                      "type": "long"
+                    },
+                    "temporary_view_reads": {
+                      "type": "long"
+                    },
+                    "view_reads": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "httpd_request_methods": {
+                  "properties": {
+                    "COPY": {
+                      "type": "long"
+                    },
+                    "DELETE": {
+                      "type": "long"
+                    },
+                    "GET": {
+                      "type": "long"
+                    },
+                    "HEAD": {
+                      "type": "long"
+                    },
+                    "POST": {
+                      "type": "long"
+                    },
+                    "PUT": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "httpd_status_codes": {
+                  "properties": {
+                    "200": {
+                      "type": "long"
+                    },
+                    "201": {
+                      "type": "long"
+                    },
+                    "202": {
+                      "type": "long"
+                    },
+                    "301": {
+                      "type": "long"
+                    },
+                    "304": {
+                      "type": "long"
+                    },
+                    "400": {
+                      "type": "long"
+                    },
+                    "401": {
+                      "type": "long"
+                    },
+                    "403": {
+                      "type": "long"
+                    },
+                    "404": {
+                      "type": "long"
+                    },
+                    "405": {
+                      "type": "long"
+                    },
+                    "409": {
+                      "type": "long"
+                    },
+                    "412": {
+                      "type": "long"
+                    },
+                    "500": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "destination": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "docker": {
+          "properties": {
+            "container": {
+              "properties": {
+                "command": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "created": {
+                  "type": "date"
+                },
+                "ip_addresses": {
+                  "type": "ip"
+                },
+                "labels": {
+                  "properties": {
+                    "annotation_checksum/configmap": {
+                      "type": "keyword"
+                    },
+                    "annotation_checksum/health": {
+                      "type": "keyword"
+                    },
+                    "annotation_checksum/secret": {
+                      "type": "keyword"
+                    },
+                    "annotation_io_kubernetes_container_hash": {
+                      "type": "keyword"
+                    },
+                    "annotation_io_kubernetes_container_ports": {
+                      "type": "keyword"
+                    },
+                    "annotation_io_kubernetes_container_restartCount": {
+                      "type": "keyword"
+                    },
+                    "annotation_io_kubernetes_container_terminationMessagePath": {
+                      "type": "keyword"
+                    },
+                    "annotation_io_kubernetes_container_terminationMessagePolicy": {
+                      "type": "keyword"
+                    },
+                    "annotation_io_kubernetes_pod_terminationGracePeriod": {
+                      "type": "keyword"
+                    },
+                    "annotation_kubernetes_io/config_hash": {
+                      "type": "keyword"
+                    },
+                    "annotation_kubernetes_io/config_seen": {
+                      "type": "keyword"
+                    },
+                    "annotation_kubernetes_io/config_source": {
+                      "type": "keyword"
+                    },
+                    "annotation_kubernetes_io/limit-ranger": {
+                      "type": "keyword"
+                    },
+                    "annotation_scheduler_alpha_kubernetes_io/critical-pod": {
+                      "type": "keyword"
+                    },
+                    "annotation_seccomp_security_alpha_kubernetes_io/pod": {
+                      "type": "keyword"
+                    },
+                    "app": {
+                      "type": "keyword"
+                    },
+                    "chart": {
+                      "type": "keyword"
+                    },
+                    "component": {
+                      "type": "keyword"
+                    },
+                    "controller-revision-hash": {
+                      "type": "keyword"
+                    },
+                    "controller-uid": {
+                      "type": "keyword"
+                    },
+                    "description": {
+                      "type": "keyword"
+                    },
+                    "heritage": {
+                      "type": "keyword"
+                    },
+                    "io_kubernetes_container_logpath": {
+                      "type": "keyword"
+                    },
+                    "io_kubernetes_container_name": {
+                      "type": "keyword"
+                    },
+                    "io_kubernetes_docker_type": {
+                      "type": "keyword"
+                    },
+                    "io_kubernetes_pod_name": {
+                      "type": "keyword"
+                    },
+                    "io_kubernetes_pod_namespace": {
+                      "type": "keyword"
+                    },
+                    "io_kubernetes_pod_uid": {
+                      "type": "keyword"
+                    },
+                    "io_kubernetes_sandbox_id": {
+                      "type": "keyword"
+                    },
+                    "job-name": {
+                      "type": "keyword"
+                    },
+                    "k8s-app": {
+                      "type": "keyword"
+                    },
+                    "kubernetes_io/cluster-service": {
+                      "type": "keyword"
+                    },
+                    "license": {
+                      "type": "keyword"
+                    },
+                    "maintainer": {
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_build-date": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_license": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_name": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_schema-version": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_url": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_vcs-ref": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_vcs-url": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_vendor": {
+                      "type": "keyword"
+                    },
+                    "org_label-schema_version": {
+                      "type": "keyword"
+                    },
+                    "pod-template-generation": {
+                      "type": "keyword"
+                    },
+                    "pod-template-hash": {
+                      "type": "keyword"
+                    },
+                    "release": {
+                      "type": "keyword"
+                    },
+                    "role": {
+                      "type": "keyword"
+                    },
+                    "service": {
+                      "type": "keyword"
+                    },
+                    "statefulset_kubernetes_io/pod-name": {
+                      "type": "keyword"
+                    },
+                    "tier": {
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "size": {
+                  "properties": {
+                    "root_fs": {
+                      "type": "long"
+                    },
+                    "rw": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tags": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "cpu": {
+              "properties": {
+                "core": {
+                  "properties": {
+                    "*": {
+                      "properties": {
+                        "pct": {
+                          "type": "object"
+                        },
+                        "ticks": {
+                          "type": "object"
+                        }
+                      }
+                    },
+                    "0": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "ticks": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "1": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "ticks": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "2": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "ticks": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "3": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "ticks": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "kernel": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "system": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "user": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "diskio": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "ops": {
+                      "type": "long"
+                    },
+                    "rate": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "reads": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                },
+                "summary": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "ops": {
+                      "type": "long"
+                    },
+                    "rate": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "total": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "ops": {
+                      "type": "long"
+                    },
+                    "rate": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "writes": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "event": {
+              "properties": {
+                "action": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "actor": {
+                  "properties": {
+                    "attributes": {
+                      "type": "object"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "from": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "healthcheck": {
+              "properties": {
+                "event": {
+                  "properties": {
+                    "end_date": {
+                      "type": "date"
+                    },
+                    "exit_code": {
+                      "type": "long"
+                    },
+                    "output": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "start_date": {
+                      "type": "date"
+                    }
+                  }
+                },
+                "failingstreak": {
+                  "type": "long"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "image": {
+              "properties": {
+                "created": {
+                  "type": "date"
+                },
+                "id": {
+                  "properties": {
+                    "current": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "parent": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "labels": {
+                  "type": "object"
+                },
+                "size": {
+                  "properties": {
+                    "regular": {
+                      "type": "long"
+                    },
+                    "virtual": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "tags": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "info": {
+              "properties": {
+                "containers": {
+                  "properties": {
+                    "paused": {
+                      "type": "long"
+                    },
+                    "running": {
+                      "type": "long"
+                    },
+                    "stopped": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "images": {
+                  "type": "long"
+                }
+              }
+            },
+            "memory": {
+              "properties": {
+                "commit": {
+                  "properties": {
+                    "peak": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "fail": {
+                  "properties": {
+                    "count": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "limit": {
+                  "type": "long"
+                },
+                "private_working_set": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "rss": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "usage": {
+                  "properties": {
+                    "max": {
+                      "type": "long"
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "network": {
+              "properties": {
+                "in": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "dropped": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "inbound": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "dropped": {
+                      "type": "long"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "interface": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "out": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "dropped": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "outbound": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "dropped": {
+                      "type": "long"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "dropwizard": {
+          "type": "object"
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "elasticsearch": {
+          "properties": {
+            "ccr": {
+              "properties": {
+                "follower": {
+                  "properties": {
+                    "global_checkpoint": {
+                      "type": "long"
+                    },
+                    "index": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "operations_written": {
+                      "type": "long"
+                    },
+                    "shard": {
+                      "properties": {
+                        "number": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "time_since_last_read": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "leader": {
+                  "properties": {
+                    "index": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "max_seq_no": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "cluster": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pending_task": {
+                  "properties": {
+                    "insert_order": {
+                      "type": "long"
+                    },
+                    "priority": {
+                      "type": "long"
+                    },
+                    "source": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "time_in_queue": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "state": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "stats": {
+                  "properties": {
+                    "indices": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "fielddata": {
+                          "properties": {
+                            "memory": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "primaries": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "nodes": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "data": {
+                          "type": "long"
+                        },
+                        "master": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "status": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "index": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "recovery": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "primary": {
+                      "type": "boolean"
+                    },
+                    "source": {
+                      "properties": {
+                        "host": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "stage": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "target": {
+                      "properties": {
+                        "host": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "summary": {
+                  "properties": {
+                    "primaries": {
+                      "properties": {
+                        "docs": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "deleted": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "segments": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "memory": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "store": {
+                          "properties": {
+                            "size": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "docs": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "deleted": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "segments": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "memory": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "store": {
+                          "properties": {
+                            "size": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "docs": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "deleted": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "segments": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "memory": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "store": {
+                      "properties": {
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "ml": {
+              "properties": {
+                "job": {
+                  "properties": {
+                    "data_counts": {
+                      "properties": {
+                        "invalid_date_count": {
+                          "type": "long"
+                        },
+                        "processed_record_count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "state": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "node": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "jvm": {
+                  "properties": {
+                    "memory": {
+                      "properties": {
+                        "heap": {
+                          "properties": {
+                            "init": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "max": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "nonheap": {
+                          "properties": {
+                            "init": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "max": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "process": {
+                  "properties": {
+                    "mlockall": {
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "stats": {
+                  "properties": {
+                    "fs": {
+                      "properties": {
+                        "summary": {
+                          "properties": {
+                            "available": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "free": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "total": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "indices": {
+                      "properties": {
+                        "docs": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "deleted": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "segments": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "memory": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "store": {
+                          "properties": {
+                            "size": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "jvm": {
+                      "properties": {
+                        "gc": {
+                          "properties": {
+                            "collectors": {
+                              "properties": {
+                                "old": {
+                                  "properties": {
+                                    "collection": {
+                                      "properties": {
+                                        "count": {
+                                          "type": "long"
+                                        },
+                                        "ms": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "young": {
+                                  "properties": {
+                                    "collection": {
+                                      "properties": {
+                                        "count": {
+                                          "type": "long"
+                                        },
+                                        "ms": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "mem": {
+                          "properties": {
+                            "pools": {
+                              "properties": {
+                                "old": {
+                                  "properties": {
+                                    "max": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "peak": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "peak_max": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "used": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "survivor": {
+                                  "properties": {
+                                    "max": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "peak": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "peak_max": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "used": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "young": {
+                                  "properties": {
+                                    "max": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "peak": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "peak_max": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    },
+                                    "used": {
+                                      "properties": {
+                                        "bytes": {
+                                          "type": "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "shard": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "primary": {
+                  "type": "boolean"
+                },
+                "relocating_node": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "envoyproxy": {
+          "properties": {
+            "server": {
+              "properties": {
+                "cluster_manager": {
+                  "properties": {
+                    "active_clusters": {
+                      "type": "long"
+                    },
+                    "cluster_added": {
+                      "type": "long"
+                    },
+                    "cluster_modified": {
+                      "type": "long"
+                    },
+                    "cluster_removed": {
+                      "type": "long"
+                    },
+                    "warming_clusters": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "filesystem": {
+                  "properties": {
+                    "flushed_by_timer": {
+                      "type": "long"
+                    },
+                    "reopen_failed": {
+                      "type": "long"
+                    },
+                    "write_buffered": {
+                      "type": "long"
+                    },
+                    "write_completed": {
+                      "type": "long"
+                    },
+                    "write_total_buffered": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "http2": {
+                  "properties": {
+                    "header_overflow": {
+                      "type": "long"
+                    },
+                    "headers_cb_no_stream": {
+                      "type": "long"
+                    },
+                    "rx_messaging_error": {
+                      "type": "long"
+                    },
+                    "rx_reset": {
+                      "type": "long"
+                    },
+                    "too_many_header_frames": {
+                      "type": "long"
+                    },
+                    "trailers": {
+                      "type": "long"
+                    },
+                    "tx_reset": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "listener_manager": {
+                  "properties": {
+                    "listener_added": {
+                      "type": "long"
+                    },
+                    "listener_create_failure": {
+                      "type": "long"
+                    },
+                    "listener_create_success": {
+                      "type": "long"
+                    },
+                    "listener_modified": {
+                      "type": "long"
+                    },
+                    "listener_removed": {
+                      "type": "long"
+                    },
+                    "total_listeners_active": {
+                      "type": "long"
+                    },
+                    "total_listeners_draining": {
+                      "type": "long"
+                    },
+                    "total_listeners_warming": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "runtime": {
+                  "properties": {
+                    "admin_overrides_active": {
+                      "type": "long"
+                    },
+                    "load_error": {
+                      "type": "long"
+                    },
+                    "load_success": {
+                      "type": "long"
+                    },
+                    "num_keys": {
+                      "type": "long"
+                    },
+                    "override_dir_exists": {
+                      "type": "long"
+                    },
+                    "override_dir_not_exists": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "server": {
+                  "properties": {
+                    "days_until_first_cert_expiring": {
+                      "type": "long"
+                    },
+                    "hot_restart_epoch": {
+                      "type": "long"
+                    },
+                    "live": {
+                      "type": "long"
+                    },
+                    "memory_allocated": {
+                      "type": "long"
+                    },
+                    "memory_heap_size": {
+                      "type": "long"
+                    },
+                    "parent_connections": {
+                      "type": "long"
+                    },
+                    "total_connections": {
+                      "type": "long"
+                    },
+                    "uptime": {
+                      "type": "long"
+                    },
+                    "version": {
+                      "type": "long"
+                    },
+                    "watchdog_mega_miss": {
+                      "type": "long"
+                    },
+                    "watchdog_miss": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "stats": {
+                  "properties": {
+                    "overflow": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "message": {
+              "norms": false,
+              "type": "text"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "etcd": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "disk": {
+              "properties": {
+                "backend_commit_duration": {
+                  "properties": {
+                    "ns": {
+                      "properties": {
+                        "bucket": {
+                          "properties": {
+                            "*": {
+                              "type": "object"
+                            }
+                          }
+                        },
+                        "count": {
+                          "type": "long"
+                        },
+                        "sum": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mvcc_db_total_size": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "wal_fsync_duration": {
+                  "properties": {
+                    "ns": {
+                      "properties": {
+                        "bucket": {
+                          "properties": {
+                            "*": {
+                              "type": "object"
+                            }
+                          }
+                        },
+                        "count": {
+                          "type": "long"
+                        },
+                        "sum": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "leader": {
+              "properties": {
+                "followers": {
+                  "properties": {
+                    "counts": {
+                      "properties": {
+                        "followers": {
+                          "properties": {
+                            "counts": {
+                              "properties": {
+                                "fail": {
+                                  "type": "long"
+                                },
+                                "success": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "latency": {
+                      "properties": {
+                        "follower": {
+                          "properties": {
+                            "latency": {
+                              "properties": {
+                                "standardDeviation": {
+                                  "scaling_factor": 1000,
+                                  "type": "scaled_float"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "followers": {
+                          "properties": {
+                            "latency": {
+                              "properties": {
+                                "average": {
+                                  "scaling_factor": 1000,
+                                  "type": "scaled_float"
+                                },
+                                "current": {
+                                  "scaling_factor": 1000,
+                                  "type": "scaled_float"
+                                },
+                                "maximum": {
+                                  "scaling_factor": 1000,
+                                  "type": "scaled_float"
+                                },
+                                "minimum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "leader": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "memory": {
+              "properties": {
+                "go_memstats_alloc": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "network": {
+              "properties": {
+                "client_grpc_received": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "client_grpc_sent": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "self": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "leaderinfo": {
+                  "properties": {
+                    "leader": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "starttime": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "uptime": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "recv": {
+                  "properties": {
+                    "appendrequest": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "bandwidthrate": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "pkgrate": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "send": {
+                  "properties": {
+                    "appendrequest": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "bandwidthrate": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "pkgrate": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "starttime": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "server": {
+              "properties": {
+                "grpc_handled": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "grpc_started": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "has_leader": {
+                  "type": "byte"
+                },
+                "leader_changes": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "proposals_committed": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "proposals_failed": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "proposals_pending": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "store": {
+              "properties": {
+                "compareanddelete": {
+                  "properties": {
+                    "fail": {
+                      "type": "long"
+                    },
+                    "success": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "compareandswap": {
+                  "properties": {
+                    "fail": {
+                      "type": "long"
+                    },
+                    "success": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "create": {
+                  "properties": {
+                    "fail": {
+                      "type": "long"
+                    },
+                    "success": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "delete": {
+                  "properties": {
+                    "fail": {
+                      "type": "long"
+                    },
+                    "success": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "expire": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "gets": {
+                  "properties": {
+                    "fail": {
+                      "type": "long"
+                    },
+                    "success": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "sets": {
+                  "properties": {
+                    "fail": {
+                      "type": "long"
+                    },
+                    "success": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "update": {
+                  "properties": {
+                    "fail": {
+                      "type": "long"
+                    },
+                    "success": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "watchers": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "dataset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "kind": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "module": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk_score": {
+              "type": "float"
+            },
+            "risk_score_norm": {
+              "type": "float"
+            },
+            "severity": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "fields": {
+          "type": "object"
+        },
+        "file": {
+          "properties": {
+            "ctime": {
+              "type": "date"
+            },
+            "device": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "gid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "inode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mtime": {
+              "type": "date"
+            },
+            "owner": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "target_path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "geo": {
+          "properties": {
+            "city_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "continent_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "country_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_iso_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "golang": {
+          "properties": {
+            "expvar": {
+              "properties": {
+                "cmdline": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "heap": {
+              "properties": {
+                "allocations": {
+                  "properties": {
+                    "active": {
+                      "type": "long"
+                    },
+                    "allocated": {
+                      "type": "long"
+                    },
+                    "frees": {
+                      "type": "long"
+                    },
+                    "idle": {
+                      "type": "long"
+                    },
+                    "mallocs": {
+                      "type": "long"
+                    },
+                    "objects": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "cmdline": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "gc": {
+                  "properties": {
+                    "cpu_fraction": {
+                      "type": "float"
+                    },
+                    "next_gc_limit": {
+                      "type": "long"
+                    },
+                    "pause": {
+                      "properties": {
+                        "avg": {
+                          "properties": {
+                            "ns": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "count": {
+                          "type": "long"
+                        },
+                        "max": {
+                          "properties": {
+                            "ns": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "sum": {
+                          "properties": {
+                            "ns": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "total_count": {
+                      "type": "long"
+                    },
+                    "total_pause": {
+                      "properties": {
+                        "ns": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "system": {
+                  "properties": {
+                    "obtained": {
+                      "type": "long"
+                    },
+                    "released": {
+                      "type": "long"
+                    },
+                    "stack": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "graphite": {
+          "properties": {
+            "server": {
+              "properties": {
+                "example": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "group": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "haproxy": {
+          "properties": {
+            "info": {
+              "properties": {
+                "compress": {
+                  "properties": {
+                    "bps": {
+                      "properties": {
+                        "in": {
+                          "type": "long"
+                        },
+                        "out": {
+                          "type": "long"
+                        },
+                        "rate_limit": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "connection": {
+                  "properties": {
+                    "current": {
+                      "type": "long"
+                    },
+                    "hard_max": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "rate": {
+                      "properties": {
+                        "limit": {
+                          "type": "long"
+                        },
+                        "max": {
+                          "type": "long"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "ssl": {
+                      "properties": {
+                        "current": {
+                          "type": "long"
+                        },
+                        "max": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "idle": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "max": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "pipes": {
+                  "properties": {
+                    "free": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "process_num": {
+                  "type": "long"
+                },
+                "processes": {
+                  "type": "long"
+                },
+                "requests": {
+                  "properties": {
+                    "max": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "run_queue": {
+                  "type": "long"
+                },
+                "session": {
+                  "properties": {
+                    "rate": {
+                      "properties": {
+                        "limit": {
+                          "type": "long"
+                        },
+                        "max": {
+                          "type": "long"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "sockets": {
+                  "properties": {
+                    "max": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ssl": {
+                  "properties": {
+                    "backend": {
+                      "properties": {
+                        "key_rate": {
+                          "properties": {
+                            "max": {
+                              "type": "long"
+                            },
+                            "value": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cache_misses": {
+                      "type": "long"
+                    },
+                    "cached_lookups": {
+                      "type": "long"
+                    },
+                    "frontend": {
+                      "properties": {
+                        "key_rate": {
+                          "properties": {
+                            "max": {
+                              "type": "long"
+                            },
+                            "value": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "session_reuse": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "rate": {
+                      "properties": {
+                        "limit": {
+                          "type": "long"
+                        },
+                        "max": {
+                          "type": "long"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "tasks": {
+                  "type": "long"
+                },
+                "ulimit_n": {
+                  "type": "long"
+                },
+                "uptime": {
+                  "properties": {
+                    "sec": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "zlib_mem_usage": {
+                  "properties": {
+                    "max": {
+                      "type": "long"
+                    },
+                    "value": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "stat": {
+              "properties": {
+                "check": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "last": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "code": {
+                      "type": "long"
+                    },
+                    "down": {
+                      "type": "long"
+                    },
+                    "duration": {
+                      "type": "long"
+                    },
+                    "failed": {
+                      "type": "long"
+                    },
+                    "health": {
+                      "properties": {
+                        "fail": {
+                          "type": "long"
+                        },
+                        "last": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "status": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "client": {
+                  "properties": {
+                    "aborted": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "component_type": {
+                  "type": "long"
+                },
+                "compressor": {
+                  "properties": {
+                    "bypassed": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "in": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "out": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "response": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "connection": {
+                  "properties": {
+                    "retried": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "avg": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "downtime": {
+                  "type": "long"
+                },
+                "in": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "last_change": {
+                  "type": "long"
+                },
+                "out": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "proxy": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "queue": {
+                  "properties": {
+                    "limit": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "avg": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "request": {
+                  "properties": {
+                    "connection": {
+                      "properties": {
+                        "errors": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "denied": {
+                      "type": "long"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "queued": {
+                      "properties": {
+                        "current": {
+                          "type": "long"
+                        },
+                        "max": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "rate": {
+                      "properties": {
+                        "max": {
+                          "type": "long"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "redispatched": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "response": {
+                  "properties": {
+                    "denied": {
+                      "type": "long"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "http": {
+                      "properties": {
+                        "1xx": {
+                          "type": "long"
+                        },
+                        "2xx": {
+                          "type": "long"
+                        },
+                        "3xx": {
+                          "type": "long"
+                        },
+                        "4xx": {
+                          "type": "long"
+                        },
+                        "5xx": {
+                          "type": "long"
+                        },
+                        "other": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "time": {
+                      "properties": {
+                        "avg": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "selected": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "server": {
+                  "properties": {
+                    "aborted": {
+                      "type": "long"
+                    },
+                    "active": {
+                      "type": "long"
+                    },
+                    "backup": {
+                      "type": "long"
+                    },
+                    "id": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "service_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "session": {
+                  "properties": {
+                    "current": {
+                      "type": "long"
+                    },
+                    "limit": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "rate": {
+                      "properties": {
+                        "limit": {
+                          "type": "long"
+                        },
+                        "max": {
+                          "type": "long"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "throttle": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "tracked": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "weight": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "containerized": {
+              "type": "boolean"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "build": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "codename": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "http": {
+          "properties": {
+            "json": {
+              "type": "object"
+            },
+            "request": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "headers": {
+                  "type": "object"
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "referrer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "headers": {
+                  "type": "object"
+                },
+                "phrase": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status_code": {
+                  "type": "long"
+                }
+              }
+            },
+            "server": {
+              "type": "object"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "jolokia": {
+          "properties": {
+            "agent": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "secured": {
+              "type": "boolean"
+            },
+            "server": {
+              "properties": {
+                "product": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "url": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "kafka": {
+          "properties": {
+            "broker": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "long"
+                }
+              }
+            },
+            "consumergroup": {
+              "properties": {
+                "broker": {
+                  "properties": {
+                    "address": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "client": {
+                  "properties": {
+                    "host": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "member_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "error": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "meta": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "offset": {
+                  "type": "long"
+                },
+                "partition": {
+                  "type": "long"
+                },
+                "topic": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "partition": {
+              "properties": {
+                "broker": {
+                  "properties": {
+                    "address": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "id": {
+                  "type": "long"
+                },
+                "offset": {
+                  "properties": {
+                    "newest": {
+                      "type": "long"
+                    },
+                    "oldest": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "partition": {
+                  "properties": {
+                    "error": {
+                      "properties": {
+                        "code": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "id": {
+                      "type": "long"
+                    },
+                    "insync_replica": {
+                      "type": "boolean"
+                    },
+                    "is_leader": {
+                      "type": "boolean"
+                    },
+                    "isr": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "leader": {
+                      "type": "long"
+                    },
+                    "replica": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "topic": {
+                  "properties": {
+                    "error": {
+                      "properties": {
+                        "code": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "topic_broker_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "topic_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "topic": {
+              "properties": {
+                "error": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "kibana": {
+          "properties": {
+            "stats": {
+              "properties": {
+                "concurrent_connections": {
+                  "type": "long"
+                },
+                "host": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "index": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "process": {
+                  "properties": {
+                    "event_loop_delay": {
+                      "properties": {
+                        "ms": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "memory": {
+                      "properties": {
+                        "heap": {
+                          "properties": {
+                            "size_limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "total": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "uptime": {
+                              "properties": {
+                                "ms": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "used": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "request": {
+                  "properties": {
+                    "disconnects": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "response_time": {
+                  "properties": {
+                    "avg": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "max": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "snapshot": {
+                  "type": "boolean"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "status": {
+              "properties": {
+                "metrics": {
+                  "properties": {
+                    "concurrent_connections": {
+                      "type": "long"
+                    },
+                    "requests": {
+                      "properties": {
+                        "disconnects": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status": {
+                  "properties": {
+                    "overall": {
+                      "properties": {
+                        "state": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "kubernetes": {
+          "properties": {
+            "annotations": {
+              "type": "object"
+            },
+            "apiserver": {
+              "properties": {
+                "audit": {
+                  "properties": {
+                    "event": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "rejected": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "client": {
+                  "properties": {
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "etcd": {
+                  "properties": {
+                    "object": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "http": {
+                  "properties": {
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "duration": {
+                          "properties": {
+                            "us": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "double"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "response": {
+                      "properties": {
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "process": {
+                  "properties": {
+                    "cpu": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    },
+                    "fds": {
+                      "properties": {
+                        "open": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "memory": {
+                      "properties": {
+                        "resident": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "virtual": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "started": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    }
+                  }
+                },
+                "request": {
+                  "properties": {
+                    "client": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "code": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "component": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "content_type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "count": {
+                      "type": "long"
+                    },
+                    "current": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "dry_run": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "duration": {
+                      "properties": {
+                        "us": {
+                          "properties": {
+                            "bucket": {
+                              "properties": {
+                                "*": {
+                                  "type": "object"
+                                }
+                              }
+                            },
+                            "count": {
+                              "type": "long"
+                            },
+                            "sum": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "group": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "handler": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "host": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "kind": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "latency": {
+                      "properties": {
+                        "bucket": {
+                          "properties": {
+                            "*": {
+                              "type": "object"
+                            }
+                          }
+                        },
+                        "count": {
+                          "type": "long"
+                        },
+                        "sum": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "longrunning": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "method": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "resource": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "scope": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subresource": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "verb": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "container": {
+              "properties": {
+                "_module": {
+                  "properties": {
+                    "labels": {
+                      "properties": {
+                        "app": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "chart": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "component": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "controller-revision-hash": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "controller-uid": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "heritage": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "job-name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "k8s-app": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "kubernetes": {
+                          "properties": {
+                            "io/cluster-service": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "pod-template-generation": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "pod-template-hash": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "release": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "role": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "service": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "statefulset": {
+                          "properties": {
+                            "kubernetes": {
+                              "properties": {
+                                "io/pod-name": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "tier": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "namespace": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "node": {
+                      "properties": {
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "pod": {
+                      "properties": {
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "uid": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "cpu": {
+                  "properties": {
+                    "limit": {
+                      "properties": {
+                        "cores": {
+                          "type": "float"
+                        },
+                        "nanocores": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "request": {
+                      "properties": {
+                        "cores": {
+                          "type": "float"
+                        },
+                        "nanocores": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "usage": {
+                      "properties": {
+                        "core": {
+                          "properties": {
+                            "ns": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "limit": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        },
+                        "nanocores": {
+                          "type": "long"
+                        },
+                        "node": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "image": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "logs": {
+                  "properties": {
+                    "available": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "capacity": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "inodes": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "free": {
+                          "type": "long"
+                        },
+                        "used": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "available": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "limit": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "majorpagefaults": {
+                      "type": "long"
+                    },
+                    "pagefaults": {
+                      "type": "long"
+                    },
+                    "request": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "rss": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "usage": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "limit": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        },
+                        "node": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "workingset": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "rootfs": {
+                  "properties": {
+                    "available": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "capacity": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "inodes": {
+                      "properties": {
+                        "used": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "start_time": {
+                  "type": "date"
+                },
+                "status": {
+                  "properties": {
+                    "phase": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "ready": {
+                      "type": "boolean"
+                    },
+                    "reason": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "restarts": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "controllermanager": {
+              "properties": {
+                "client": {
+                  "properties": {
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "handler": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "host": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "http": {
+                  "properties": {
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "duration": {
+                          "properties": {
+                            "us": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "double"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "response": {
+                      "properties": {
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "leader": {
+                  "properties": {
+                    "is_master": {
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "node": {
+                  "properties": {
+                    "collector": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "eviction": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "health": {
+                          "properties": {
+                            "pct": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "unhealthy": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "process": {
+                  "properties": {
+                    "cpu": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    },
+                    "fds": {
+                      "properties": {
+                        "open": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "memory": {
+                      "properties": {
+                        "resident": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "virtual": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "started": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    }
+                  }
+                },
+                "workqueue": {
+                  "properties": {
+                    "adds": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "depth": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "longestrunning": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    },
+                    "retries": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "unfinished": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    }
+                  }
+                },
+                "zone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "deployment": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "paused": {
+                  "type": "boolean"
+                },
+                "replicas": {
+                  "properties": {
+                    "available": {
+                      "type": "long"
+                    },
+                    "desired": {
+                      "type": "long"
+                    },
+                    "unavailable": {
+                      "type": "long"
+                    },
+                    "updated": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "event": {
+              "properties": {
+                "count": {
+                  "type": "long"
+                },
+                "involved_object": {
+                  "properties": {
+                    "api_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "kind": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "resource_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "uid": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "message": {
+                  "copy_to": [
+                    "message"
+                  ],
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "metadata": {
+                  "properties": {
+                    "generate_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "namespace": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "resource_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "self_link": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "timestamp": {
+                      "properties": {
+                        "created": {
+                          "type": "date"
+                        }
+                      }
+                    },
+                    "uid": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "reason": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "properties": {
+                    "first_occurrence": {
+                      "type": "date"
+                    },
+                    "last_occurrence": {
+                      "type": "date"
+                    }
+                  }
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "properties": {
+                "addonmanager": {
+                  "properties": {
+                    "kubernetes": {
+                      "properties": {
+                        "io/mode": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "app": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "chart": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "component": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "controller-revision-hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "controller-uid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "heritage": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "job-name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "k8s-app": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kubernetes": {
+                  "properties": {
+                    "io/cluster-service": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "io/name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pod-template-generation": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pod-template-hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "release": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "role": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "service": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "statefulset": {
+                  "properties": {
+                    "kubernetes": {
+                      "properties": {
+                        "io/pod-name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "statefulset_kubernetes_io/pod-name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tier": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "_module": {
+                  "properties": {
+                    "labels": {
+                      "properties": {
+                        "beta": {
+                          "properties": {
+                            "kubernetes": {
+                              "properties": {
+                                "io/arch": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "io/fluentd-ds-ready": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "io/instance-type": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "io/os": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "cloud": {
+                          "properties": {
+                            "google": {
+                              "properties": {
+                                "com/gke-nodepool": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "com/gke-os-distribution": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "failure-domain": {
+                          "properties": {
+                            "beta": {
+                              "properties": {
+                                "kubernetes": {
+                                  "properties": {
+                                    "io/region": {
+                                      "ignore_above": 1024,
+                                      "type": "keyword"
+                                    },
+                                    "io/zone": {
+                                      "ignore_above": 1024,
+                                      "type": "keyword"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "kubernetes": {
+                          "properties": {
+                            "io/hostname": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "cpu": {
+                  "properties": {
+                    "allocatable": {
+                      "properties": {
+                        "cores": {
+                          "type": "float"
+                        }
+                      }
+                    },
+                    "capacity": {
+                      "properties": {
+                        "cores": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "usage": {
+                      "properties": {
+                        "core": {
+                          "properties": {
+                            "ns": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "nanocores": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "fs": {
+                  "properties": {
+                    "available": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "capacity": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "inodes": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "free": {
+                          "type": "long"
+                        },
+                        "used": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "allocatable": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "available": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "capacity": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "majorpagefaults": {
+                      "type": "long"
+                    },
+                    "pagefaults": {
+                      "type": "long"
+                    },
+                    "rss": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "usage": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "workingset": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "network": {
+                  "properties": {
+                    "rx": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "errors": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "tx": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "errors": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "pod": {
+                  "properties": {
+                    "allocatable": {
+                      "properties": {
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "capacity": {
+                      "properties": {
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "runtime": {
+                  "properties": {
+                    "imagefs": {
+                      "properties": {
+                        "available": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "capacity": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "used": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "start_time": {
+                  "type": "date"
+                },
+                "status": {
+                  "properties": {
+                    "ready": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "unschedulable": {
+                      "type": "boolean"
+                    }
+                  }
+                }
+              }
+            },
+            "pod": {
+              "properties": {
+                "_module": {
+                  "properties": {
+                    "labels": {
+                      "properties": {
+                        "app": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "chart": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "component": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "controller-revision-hash": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "controller-uid": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "heritage": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "job-name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "k8s-app": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "kubernetes": {
+                          "properties": {
+                            "io/cluster-service": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "pod-template-generation": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "pod-template-hash": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "release": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "role": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "service": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "statefulset": {
+                          "properties": {
+                            "kubernetes": {
+                              "properties": {
+                                "io/pod-name": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "tier": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "namespace": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "node": {
+                      "properties": {
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "cpu": {
+                  "properties": {
+                    "usage": {
+                      "properties": {
+                        "limit": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        },
+                        "nanocores": {
+                          "type": "long"
+                        },
+                        "node": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "host_ip": {
+                  "type": "ip"
+                },
+                "ip": {
+                  "type": "ip"
+                },
+                "memory": {
+                  "properties": {
+                    "available": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "major_page_faults": {
+                      "type": "long"
+                    },
+                    "page_faults": {
+                      "type": "long"
+                    },
+                    "rss": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "usage": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "limit": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        },
+                        "node": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "working_set": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "network": {
+                  "properties": {
+                    "rx": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "errors": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "tx": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "errors": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "start_time": {
+                  "type": "date"
+                },
+                "status": {
+                  "properties": {
+                    "phase": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "ready": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "scheduled": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "uid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "proxy": {
+              "properties": {
+                "client": {
+                  "properties": {
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "handler": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "host": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "http": {
+                  "properties": {
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "duration": {
+                          "properties": {
+                            "us": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "double"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "response": {
+                      "properties": {
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "process": {
+                  "properties": {
+                    "cpu": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    },
+                    "fds": {
+                      "properties": {
+                        "open": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "memory": {
+                      "properties": {
+                        "resident": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "virtual": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "started": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    }
+                  }
+                },
+                "sync": {
+                  "properties": {
+                    "networkprogramming": {
+                      "properties": {
+                        "duration": {
+                          "properties": {
+                            "us": {
+                              "properties": {
+                                "bucket": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "count": {
+                                  "type": "long"
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "rules": {
+                      "properties": {
+                        "duration": {
+                          "properties": {
+                            "us": {
+                              "properties": {
+                                "bucket": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "count": {
+                                  "type": "long"
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "replicaset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "replicas": {
+                  "properties": {
+                    "available": {
+                      "type": "long"
+                    },
+                    "desired": {
+                      "type": "long"
+                    },
+                    "labeled": {
+                      "type": "long"
+                    },
+                    "observed": {
+                      "type": "long"
+                    },
+                    "ready": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "scheduler": {
+              "properties": {
+                "client": {
+                  "properties": {
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "handler": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "host": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "http": {
+                  "properties": {
+                    "request": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "duration": {
+                          "properties": {
+                            "us": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "double"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "response": {
+                      "properties": {
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                },
+                                "percentile": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "leader": {
+                  "properties": {
+                    "is_master": {
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "operation": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "process": {
+                  "properties": {
+                    "cpu": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    },
+                    "fds": {
+                      "properties": {
+                        "open": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "memory": {
+                      "properties": {
+                        "resident": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "virtual": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "started": {
+                      "properties": {
+                        "sec": {
+                          "type": "double"
+                        }
+                      }
+                    }
+                  }
+                },
+                "result": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "scheduling": {
+                  "properties": {
+                    "duration": {
+                      "properties": {
+                        "seconds": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "percentile": {
+                              "properties": {
+                                "*": {
+                                  "type": "object"
+                                }
+                              }
+                            },
+                            "sum": {
+                              "type": "double"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "e2e": {
+                      "properties": {
+                        "duration": {
+                          "properties": {
+                            "us": {
+                              "properties": {
+                                "bucket": {
+                                  "properties": {
+                                    "*": {
+                                      "type": "object"
+                                    }
+                                  }
+                                },
+                                "count": {
+                                  "type": "long"
+                                },
+                                "sum": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "pod": {
+                      "properties": {
+                        "attempts": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "preemption": {
+                          "properties": {
+                            "victims": {
+                              "properties": {
+                                "count": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "statefulset": {
+              "properties": {
+                "created": {
+                  "type": "long"
+                },
+                "generation": {
+                  "properties": {
+                    "desired": {
+                      "type": "long"
+                    },
+                    "observed": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "replicas": {
+                  "properties": {
+                    "desired": {
+                      "type": "long"
+                    },
+                    "observed": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "system": {
+              "properties": {
+                "_module": {
+                  "properties": {
+                    "node": {
+                      "properties": {
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "container": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cpu": {
+                  "properties": {
+                    "usage": {
+                      "properties": {
+                        "core": {
+                          "properties": {
+                            "ns": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "nanocores": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "majorpagefaults": {
+                      "type": "long"
+                    },
+                    "pagefaults": {
+                      "type": "long"
+                    },
+                    "rss": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "usage": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "workingset": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "start_time": {
+                  "type": "date"
+                }
+              }
+            },
+            "volume": {
+              "properties": {
+                "_module": {
+                  "properties": {
+                    "namespace": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "node": {
+                      "properties": {
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "pod": {
+                      "properties": {
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "fs": {
+                  "properties": {
+                    "available": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "capacity": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "inodes": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "free": {
+                          "type": "long"
+                        },
+                        "used": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "kvm": {
+          "properties": {
+            "dommemstat": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "stat": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "value": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "labels": {
+          "type": "object"
+        },
+        "log": {
+          "properties": {
+            "level": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "logstash": {
+          "properties": {
+            "node": {
+              "properties": {
+                "jvm": {
+                  "properties": {
+                    "version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "stats": {
+                  "properties": {
+                    "events": {
+                      "properties": {
+                        "filtered": {
+                          "type": "long"
+                        },
+                        "in": {
+                          "type": "long"
+                        },
+                        "out": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "memcached": {
+          "properties": {
+            "stats": {
+              "properties": {
+                "bytes": {
+                  "properties": {
+                    "current": {
+                      "type": "long"
+                    },
+                    "limit": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "cmd": {
+                  "properties": {
+                    "get": {
+                      "type": "long"
+                    },
+                    "set": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "connections": {
+                  "properties": {
+                    "current": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "evictions": {
+                  "type": "long"
+                },
+                "get": {
+                  "properties": {
+                    "hits": {
+                      "type": "long"
+                    },
+                    "misses": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "items": {
+                  "properties": {
+                    "current": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "threads": {
+                  "type": "long"
+                },
+                "uptime": {
+                  "properties": {
+                    "sec": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "written": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "message": {
+          "norms": false,
+          "type": "text"
+        },
+        "metricset": {
+          "properties": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "mongodb": {
+          "properties": {
+            "collstats": {
+              "properties": {
+                "collection": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "commands": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "db": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "getmore": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "insert": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lock": {
+                  "properties": {
+                    "read": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "time": {
+                          "properties": {
+                            "us": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "write": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "time": {
+                          "properties": {
+                            "us": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "queries": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "remove": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "update": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "dbstats": {
+              "properties": {
+                "avg_obj_size": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "collections": {
+                  "type": "long"
+                },
+                "data_file_version": {
+                  "properties": {
+                    "major": {
+                      "type": "long"
+                    },
+                    "minor": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "data_size": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "db": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "extent_free_list": {
+                  "properties": {
+                    "num": {
+                      "type": "long"
+                    },
+                    "size": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "file_size": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "index_size": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "indexes": {
+                  "type": "long"
+                },
+                "ns_size_mb": {
+                  "properties": {
+                    "mb": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "num_extents": {
+                  "type": "long"
+                },
+                "objects": {
+                  "type": "long"
+                },
+                "storage_size": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "metrics": {
+              "properties": {
+                "commands": {
+                  "properties": {
+                    "aggregate": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "build_info": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "coll_stats": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "connection_pool_stats": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "count": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "db_stats": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "distinct": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "find": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "get_cmd_line_opts": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "get_last_error": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "get_log": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "get_more": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "get_parameter": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "host_info": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "insert": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "is_master": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "is_self": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "last_collections": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "last_commands": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "list_databased": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "list_indexes": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "ping": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "profile": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "replset_get_rbid": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "replset_get_status": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "replset_heartbeat": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "replset_update_position": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "server_status": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "update": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "whatsmyuri": {
+                      "properties": {
+                        "failed": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "cursor": {
+                  "properties": {
+                    "open": {
+                      "properties": {
+                        "no_timeout": {
+                          "type": "long"
+                        },
+                        "pinned": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "timed_out": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "document": {
+                  "properties": {
+                    "deleted": {
+                      "type": "long"
+                    },
+                    "inserted": {
+                      "type": "long"
+                    },
+                    "returned": {
+                      "type": "long"
+                    },
+                    "updated": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "get_last_error": {
+                  "properties": {
+                    "write_timeouts": {
+                      "type": "long"
+                    },
+                    "write_wait": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "operation": {
+                  "properties": {
+                    "scan_and_order": {
+                      "type": "long"
+                    },
+                    "write_conflicts": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "query_executor": {
+                  "properties": {
+                    "scanned_documents": {
+                      "type": "long"
+                    },
+                    "scanned_indexes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "replication": {
+                  "properties": {
+                    "apply": {
+                      "properties": {
+                        "attempts_to_become_secondary": {
+                          "type": "long"
+                        },
+                        "batches": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "time": {
+                              "properties": {
+                                "ms": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "ops": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "buffer": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "max_size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "executor": {
+                      "properties": {
+                        "counters": {
+                          "properties": {
+                            "cancels": {
+                              "type": "long"
+                            },
+                            "event_created": {
+                              "type": "long"
+                            },
+                            "event_wait": {
+                              "type": "long"
+                            },
+                            "scheduled": {
+                              "properties": {
+                                "dbwork": {
+                                  "type": "long"
+                                },
+                                "exclusive": {
+                                  "type": "long"
+                                },
+                                "failures": {
+                                  "type": "long"
+                                },
+                                "netcmd": {
+                                  "type": "long"
+                                },
+                                "work": {
+                                  "type": "long"
+                                },
+                                "work_at": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "waits": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "event_waiters": {
+                          "type": "long"
+                        },
+                        "network_interface": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "queues": {
+                          "properties": {
+                            "free": {
+                              "type": "long"
+                            },
+                            "in_progress": {
+                              "properties": {
+                                "dbwork": {
+                                  "type": "long"
+                                },
+                                "exclusive": {
+                                  "type": "long"
+                                },
+                                "network": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "ready": {
+                              "type": "long"
+                            },
+                            "sleepers": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "shutting_down": {
+                          "type": "boolean"
+                        },
+                        "unsignaled_events": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "initial_sync": {
+                      "properties": {
+                        "completed": {
+                          "type": "long"
+                        },
+                        "failed_attempts": {
+                          "type": "long"
+                        },
+                        "failures": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "network": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "getmores": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "time": {
+                              "properties": {
+                                "ms": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "ops": {
+                          "type": "long"
+                        },
+                        "reders_created": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "preload": {
+                      "properties": {
+                        "docs": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "time": {
+                              "properties": {
+                                "ms": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "indexes": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "time": {
+                              "properties": {
+                                "ms": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "storage": {
+                  "properties": {
+                    "free_list": {
+                      "properties": {
+                        "search": {
+                          "properties": {
+                            "bucket_exhausted": {
+                              "type": "long"
+                            },
+                            "requests": {
+                              "type": "long"
+                            },
+                            "scanned": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "ttl": {
+                  "properties": {
+                    "deleted_documents": {
+                      "type": "long"
+                    },
+                    "passes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "replstatus": {
+              "properties": {
+                "headroom": {
+                  "properties": {
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "lag": {
+                  "properties": {
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "members": {
+                  "properties": {
+                    "arbiter": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "hosts": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "down": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "hosts": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "primary": {
+                      "properties": {
+                        "host": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "optime": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "recovering": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "hosts": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "rollback": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "hosts": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "secondary": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "hosts": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "optimes": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "startup2": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "hosts": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "unhealthy": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "hosts": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "unknown": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "hosts": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "oplog": {
+                  "properties": {
+                    "first": {
+                      "properties": {
+                        "timestamp": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "last": {
+                      "properties": {
+                        "timestamp": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "size": {
+                      "properties": {
+                        "allocated": {
+                          "type": "long"
+                        },
+                        "used": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "window": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "optimes": {
+                  "properties": {
+                    "applied": {
+                      "type": "long"
+                    },
+                    "durable": {
+                      "type": "long"
+                    },
+                    "last_committed": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "server_date": {
+                  "type": "date"
+                },
+                "set_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "status": {
+              "properties": {
+                "asserts": {
+                  "properties": {
+                    "msg": {
+                      "type": "long"
+                    },
+                    "regular": {
+                      "type": "long"
+                    },
+                    "rollovers": {
+                      "type": "long"
+                    },
+                    "user": {
+                      "type": "long"
+                    },
+                    "warning": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "background_flushing": {
+                  "properties": {
+                    "average": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "flushes": {
+                      "type": "long"
+                    },
+                    "last": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "last_finished": {
+                      "type": "date"
+                    },
+                    "total": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "connections": {
+                  "properties": {
+                    "available": {
+                      "type": "long"
+                    },
+                    "current": {
+                      "type": "long"
+                    },
+                    "total_created": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "extra_info": {
+                  "properties": {
+                    "heap_usage": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "page_faults": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "global_lock": {
+                  "properties": {
+                    "active_clients": {
+                      "properties": {
+                        "readers": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        },
+                        "writers": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "current_queue": {
+                      "properties": {
+                        "readers": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        },
+                        "writers": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total_time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "journaling": {
+                  "properties": {
+                    "commits": {
+                      "type": "long"
+                    },
+                    "commits_in_write_lock": {
+                      "type": "long"
+                    },
+                    "compression": {
+                      "type": "long"
+                    },
+                    "early_commits": {
+                      "type": "long"
+                    },
+                    "journaled": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "times": {
+                      "properties": {
+                        "commits": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "commits_in_write_lock": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "dt": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "prep_log_buffer": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "remap_private_view": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "write_to_data_files": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "write_to_journal": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "write_to_data_files": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "local_time": {
+                  "type": "date"
+                },
+                "locks": {
+                  "properties": {
+                    "collection": {
+                      "properties": {
+                        "acquire": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "deadlock": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "wait": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "us": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "database": {
+                      "properties": {
+                        "acquire": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "deadlock": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "wait": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "us": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "global": {
+                      "properties": {
+                        "acquire": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "deadlock": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "wait": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "us": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "meta_data": {
+                      "properties": {
+                        "acquire": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "deadlock": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "wait": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "us": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "oplog": {
+                      "properties": {
+                        "acquire": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "deadlock": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "wait": {
+                          "properties": {
+                            "count": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "us": {
+                              "properties": {
+                                "R": {
+                                  "type": "long"
+                                },
+                                "W": {
+                                  "type": "long"
+                                },
+                                "r": {
+                                  "type": "long"
+                                },
+                                "w": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "bits": {
+                      "type": "long"
+                    },
+                    "mapped": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "mapped_with_journal": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "resident": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "virtual": {
+                      "properties": {
+                        "mb": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "network": {
+                  "properties": {
+                    "in": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "out": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "requests": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ops": {
+                  "properties": {
+                    "counters": {
+                      "properties": {
+                        "command": {
+                          "type": "long"
+                        },
+                        "delete": {
+                          "type": "long"
+                        },
+                        "getmore": {
+                          "type": "long"
+                        },
+                        "insert": {
+                          "type": "long"
+                        },
+                        "query": {
+                          "type": "long"
+                        },
+                        "update": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "latencies": {
+                      "properties": {
+                        "commands": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "latency": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "reads": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "latency": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "writes": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "latency": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "replicated": {
+                      "properties": {
+                        "command": {
+                          "type": "long"
+                        },
+                        "delete": {
+                          "type": "long"
+                        },
+                        "getmore": {
+                          "type": "long"
+                        },
+                        "insert": {
+                          "type": "long"
+                        },
+                        "query": {
+                          "type": "long"
+                        },
+                        "update": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "process": {
+                  "path": "process.name",
+                  "type": "alias"
+                },
+                "storage_engine": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "uptime": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "version": {
+                  "path": "service.version",
+                  "type": "alias"
+                },
+                "wired_tiger": {
+                  "properties": {
+                    "cache": {
+                      "properties": {
+                        "dirty": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "maximum": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "pages": {
+                          "properties": {
+                            "evicted": {
+                              "type": "long"
+                            },
+                            "read": {
+                              "type": "long"
+                            },
+                            "write": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "used": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "concurrent_transactions": {
+                      "properties": {
+                        "read": {
+                          "properties": {
+                            "available": {
+                              "type": "long"
+                            },
+                            "out": {
+                              "type": "long"
+                            },
+                            "total_tickets": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "write": {
+                          "properties": {
+                            "available": {
+                              "type": "long"
+                            },
+                            "out": {
+                              "type": "long"
+                            },
+                            "total_tickets": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "log": {
+                      "properties": {
+                        "flushes": {
+                          "type": "long"
+                        },
+                        "max_file_size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "scans": {
+                          "type": "long"
+                        },
+                        "size": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "syncs": {
+                          "type": "long"
+                        },
+                        "write": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "writes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "write_backs_queued": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        },
+        "mssql": {
+          "properties": {
+            "database": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "performance": {
+              "properties": {
+                "active_temp_tables": {
+                  "type": "long"
+                },
+                "batch_requests_per_sec": {
+                  "type": "long"
+                },
+                "buffer": {
+                  "properties": {
+                    "cache_hit": {
+                      "properties": {
+                        "pct": {
+                          "type": "double"
+                        }
+                      }
+                    },
+                    "checkpoint_pages_per_sec": {
+                      "type": "long"
+                    },
+                    "database_pages": {
+                      "type": "long"
+                    },
+                    "page_life_expectancy": {
+                      "properties": {
+                        "sec": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "target_pages": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "compilations_per_sec": {
+                  "type": "long"
+                },
+                "connections_reset_per_sec": {
+                  "type": "long"
+                },
+                "lock_waits_per_sec": {
+                  "type": "long"
+                },
+                "logins_per_sec": {
+                  "type": "long"
+                },
+                "logouts_per_sec": {
+                  "type": "long"
+                },
+                "page_splits_per_sec": {
+                  "type": "long"
+                },
+                "recompilations_per_sec": {
+                  "type": "long"
+                },
+                "transactions": {
+                  "type": "long"
+                },
+                "user_connections": {
+                  "type": "long"
+                }
+              }
+            },
+            "transaction_log": {
+              "properties": {
+                "space_usage": {
+                  "properties": {
+                    "since_last_backup": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "type": "float"
+                        }
+                      }
+                    }
+                  }
+                },
+                "stats": {
+                  "properties": {
+                    "active_size": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "backup_time": {
+                      "type": "date"
+                    },
+                    "recovery_size": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "since_last_checkpoint": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total_size": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "munin": {
+          "properties": {
+            "metrics": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "plugin": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "mysql": {
+          "properties": {
+            "galera_status": {
+              "properties": {
+                "apply": {
+                  "properties": {
+                    "oooe": {
+                      "type": "double"
+                    },
+                    "oool": {
+                      "type": "double"
+                    },
+                    "window": {
+                      "type": "double"
+                    }
+                  }
+                },
+                "cert": {
+                  "properties": {
+                    "deps_distance": {
+                      "type": "double"
+                    },
+                    "index_size": {
+                      "type": "long"
+                    },
+                    "interval": {
+                      "type": "double"
+                    }
+                  }
+                },
+                "cluster": {
+                  "properties": {
+                    "conf_id": {
+                      "type": "long"
+                    },
+                    "size": {
+                      "type": "long"
+                    },
+                    "status": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "commit": {
+                  "properties": {
+                    "oooe": {
+                      "type": "double"
+                    },
+                    "window": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "connected": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "evs": {
+                  "properties": {
+                    "evict": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "state": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "flow_ctl": {
+                  "properties": {
+                    "paused": {
+                      "type": "double"
+                    },
+                    "paused_ns": {
+                      "type": "long"
+                    },
+                    "recv": {
+                      "type": "long"
+                    },
+                    "sent": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "last_committed": {
+                  "type": "long"
+                },
+                "local": {
+                  "properties": {
+                    "bf_aborts": {
+                      "type": "long"
+                    },
+                    "cert_failures": {
+                      "type": "long"
+                    },
+                    "commits": {
+                      "type": "long"
+                    },
+                    "recv": {
+                      "properties": {
+                        "queue": {
+                          "type": "long"
+                        },
+                        "queue_avg": {
+                          "type": "double"
+                        },
+                        "queue_max": {
+                          "type": "long"
+                        },
+                        "queue_min": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "replays": {
+                      "type": "long"
+                    },
+                    "send": {
+                      "properties": {
+                        "queue": {
+                          "type": "long"
+                        },
+                        "queue_avg": {
+                          "type": "double"
+                        },
+                        "queue_max": {
+                          "type": "long"
+                        },
+                        "queue_min": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "state": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "ready": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "received": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "repl": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "count": {
+                      "type": "long"
+                    },
+                    "data_bytes": {
+                      "type": "long"
+                    },
+                    "keys": {
+                      "type": "long"
+                    },
+                    "keys_bytes": {
+                      "type": "long"
+                    },
+                    "other_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "status": {
+              "properties": {
+                "aborted": {
+                  "properties": {
+                    "clients": {
+                      "type": "long"
+                    },
+                    "connects": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "binlog": {
+                  "properties": {
+                    "cache": {
+                      "properties": {
+                        "disk_use": {
+                          "type": "long"
+                        },
+                        "use": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "bytes": {
+                  "properties": {
+                    "received": {
+                      "type": "long"
+                    },
+                    "sent": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "command": {
+                  "properties": {
+                    "delete": {
+                      "type": "long"
+                    },
+                    "insert": {
+                      "type": "long"
+                    },
+                    "select": {
+                      "type": "long"
+                    },
+                    "update": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "connections": {
+                  "type": "long"
+                },
+                "created": {
+                  "properties": {
+                    "tmp": {
+                      "properties": {
+                        "disk_tables": {
+                          "type": "long"
+                        },
+                        "files": {
+                          "type": "long"
+                        },
+                        "tables": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "delayed": {
+                  "properties": {
+                    "errors": {
+                      "type": "long"
+                    },
+                    "insert_threads": {
+                      "type": "long"
+                    },
+                    "writes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "flush_commands": {
+                  "type": "long"
+                },
+                "handler": {
+                  "properties": {
+                    "commit": {
+                      "type": "long"
+                    },
+                    "delete": {
+                      "type": "long"
+                    },
+                    "external_lock": {
+                      "type": "long"
+                    },
+                    "mrr_init": {
+                      "type": "long"
+                    },
+                    "prepare": {
+                      "type": "long"
+                    },
+                    "read": {
+                      "properties": {
+                        "first": {
+                          "type": "long"
+                        },
+                        "key": {
+                          "type": "long"
+                        },
+                        "last": {
+                          "type": "long"
+                        },
+                        "next": {
+                          "type": "long"
+                        },
+                        "prev": {
+                          "type": "long"
+                        },
+                        "rnd": {
+                          "type": "long"
+                        },
+                        "rnd_next": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "rollback": {
+                      "type": "long"
+                    },
+                    "savepoint": {
+                      "type": "long"
+                    },
+                    "savepoint_rollback": {
+                      "type": "long"
+                    },
+                    "update": {
+                      "type": "long"
+                    },
+                    "write": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "innodb": {
+                  "properties": {
+                    "buffer_pool": {
+                      "properties": {
+                        "bytes": {
+                          "properties": {
+                            "data": {
+                              "type": "long"
+                            },
+                            "dirty": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "dump_status": {
+                          "type": "long"
+                        },
+                        "load_status": {
+                          "type": "long"
+                        },
+                        "pages": {
+                          "properties": {
+                            "data": {
+                              "type": "long"
+                            },
+                            "dirty": {
+                              "type": "long"
+                            },
+                            "flushed": {
+                              "type": "long"
+                            },
+                            "free": {
+                              "type": "long"
+                            },
+                            "latched": {
+                              "type": "long"
+                            },
+                            "misc": {
+                              "type": "long"
+                            },
+                            "total": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "pool": {
+                          "properties": {
+                            "reads": {
+                              "type": "long"
+                            },
+                            "resize_status": {
+                              "type": "long"
+                            },
+                            "wait_free": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "read": {
+                          "properties": {
+                            "ahead": {
+                              "type": "long"
+                            },
+                            "ahead_evicted": {
+                              "type": "long"
+                            },
+                            "ahead_rnd": {
+                              "type": "long"
+                            },
+                            "requests": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "write_requests": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "max_used_connections": {
+                  "type": "long"
+                },
+                "open": {
+                  "properties": {
+                    "files": {
+                      "type": "long"
+                    },
+                    "streams": {
+                      "type": "long"
+                    },
+                    "tables": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "opened_tables": {
+                  "type": "long"
+                },
+                "queries": {
+                  "type": "long"
+                },
+                "questions": {
+                  "type": "long"
+                },
+                "threads": {
+                  "properties": {
+                    "cached": {
+                      "type": "long"
+                    },
+                    "connected": {
+                      "type": "long"
+                    },
+                    "created": {
+                      "type": "long"
+                    },
+                    "running": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "nats": {
+          "properties": {
+            "connections": {
+              "properties": {
+                "total": {
+                  "type": "long"
+                }
+              }
+            },
+            "routes": {
+              "properties": {
+                "total": {
+                  "type": "long"
+                }
+              }
+            },
+            "server": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "time": {
+                  "type": "date"
+                }
+              }
+            },
+            "stats": {
+              "properties": {
+                "cores": {
+                  "type": "long"
+                },
+                "cpu": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                },
+                "http": {
+                  "properties": {
+                    "req_stats": {
+                      "properties": {
+                        "uri": {
+                          "properties": {
+                            "connz": {
+                              "type": "long"
+                            },
+                            "root": {
+                              "type": "long"
+                            },
+                            "routez": {
+                              "type": "long"
+                            },
+                            "subsz": {
+                              "type": "long"
+                            },
+                            "varz": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "in": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "messages": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "mem": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "out": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "messages": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "remotes": {
+                  "type": "long"
+                },
+                "slow_consumers": {
+                  "type": "long"
+                },
+                "total_connections": {
+                  "type": "long"
+                },
+                "uptime": {
+                  "type": "long"
+                }
+              }
+            },
+            "subscriptions": {
+              "properties": {
+                "cache": {
+                  "properties": {
+                    "fanout": {
+                      "properties": {
+                        "avg": {
+                          "type": "double"
+                        },
+                        "max": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "hit_rate": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "size": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "inserts": {
+                  "type": "long"
+                },
+                "matches": {
+                  "type": "long"
+                },
+                "removes": {
+                  "type": "long"
+                },
+                "total": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "network": {
+          "properties": {
+            "application": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "community_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "direction": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "forwarded_ip": {
+              "type": "ip"
+            },
+            "iana_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transport": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "nginx": {
+          "properties": {
+            "stubstatus": {
+              "properties": {
+                "accepts": {
+                  "type": "long"
+                },
+                "active": {
+                  "type": "long"
+                },
+                "current": {
+                  "type": "long"
+                },
+                "dropped": {
+                  "type": "long"
+                },
+                "handled": {
+                  "type": "long"
+                },
+                "hostname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reading": {
+                  "type": "long"
+                },
+                "requests": {
+                  "type": "long"
+                },
+                "waiting": {
+                  "type": "long"
+                },
+                "writing": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "observer": {
+          "properties": {
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "serial_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vendor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "oracle": {
+          "properties": {
+            "tablespace": {
+              "properties": {
+                "data_file": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "online_status": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "size": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "free": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "max": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "status": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "space": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "organization": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "os": {
+          "properties": {
+            "family": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "kernel": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "platform": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "php_fpm": {
+          "properties": {
+            "pool": {
+              "properties": {
+                "connections": {
+                  "properties": {
+                    "accepted": {
+                      "type": "long"
+                    },
+                    "listen_queue_len": {
+                      "type": "long"
+                    },
+                    "max_listen_queue": {
+                      "type": "long"
+                    },
+                    "queued": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "process_manager": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "processes": {
+                  "properties": {
+                    "active": {
+                      "type": "long"
+                    },
+                    "idle": {
+                      "type": "long"
+                    },
+                    "max_active": {
+                      "type": "long"
+                    },
+                    "max_children_reached": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "slow_requests": {
+                  "type": "long"
+                },
+                "start_since": {
+                  "type": "long"
+                },
+                "start_time": {
+                  "type": "date"
+                }
+              }
+            },
+            "process": {
+              "properties": {
+                "last_request_cpu": {
+                  "type": "long"
+                },
+                "last_request_memory": {
+                  "type": "long"
+                },
+                "request_duration": {
+                  "type": "long"
+                },
+                "requests": {
+                  "type": "long"
+                },
+                "script": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "start_since": {
+                  "type": "long"
+                },
+                "start_time": {
+                  "type": "date"
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "postgresql": {
+          "properties": {
+            "activity": {
+              "properties": {
+                "application_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "backend_start": {
+                  "type": "date"
+                },
+                "client": {
+                  "properties": {
+                    "address": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "hostname": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "port": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "database": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "oid": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "query": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "query_start": {
+                  "type": "date"
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "state_change": {
+                  "type": "date"
+                },
+                "transaction_start": {
+                  "type": "date"
+                },
+                "user": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "waiting": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "bgwriter": {
+              "properties": {
+                "buffers": {
+                  "properties": {
+                    "allocated": {
+                      "type": "long"
+                    },
+                    "backend": {
+                      "type": "long"
+                    },
+                    "backend_fsync": {
+                      "type": "long"
+                    },
+                    "checkpoints": {
+                      "type": "long"
+                    },
+                    "clean": {
+                      "type": "long"
+                    },
+                    "clean_full": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "checkpoints": {
+                  "properties": {
+                    "requested": {
+                      "type": "long"
+                    },
+                    "scheduled": {
+                      "type": "long"
+                    },
+                    "times": {
+                      "properties": {
+                        "sync": {
+                          "properties": {
+                            "ms": {
+                              "type": "float"
+                            }
+                          }
+                        },
+                        "write": {
+                          "properties": {
+                            "ms": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "stats_reset": {
+                  "type": "date"
+                }
+              }
+            },
+            "database": {
+              "properties": {
+                "blocks": {
+                  "properties": {
+                    "hit": {
+                      "type": "long"
+                    },
+                    "read": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "properties": {
+                        "read": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "write": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "conflicts": {
+                  "type": "long"
+                },
+                "deadlocks": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "number_of_backends": {
+                  "type": "long"
+                },
+                "oid": {
+                  "type": "long"
+                },
+                "rows": {
+                  "properties": {
+                    "deleted": {
+                      "type": "long"
+                    },
+                    "fetched": {
+                      "type": "long"
+                    },
+                    "inserted": {
+                      "type": "long"
+                    },
+                    "returned": {
+                      "type": "long"
+                    },
+                    "updated": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "stats_reset": {
+                  "type": "date"
+                },
+                "temporary": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "files": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "transactions": {
+                  "properties": {
+                    "commit": {
+                      "type": "long"
+                    },
+                    "rollback": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "statement": {
+              "properties": {
+                "database": {
+                  "properties": {
+                    "oid": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "query": {
+                  "properties": {
+                    "calls": {
+                      "type": "long"
+                    },
+                    "id": {
+                      "type": "long"
+                    },
+                    "memory": {
+                      "properties": {
+                        "local": {
+                          "properties": {
+                            "dirtied": {
+                              "type": "long"
+                            },
+                            "hit": {
+                              "type": "long"
+                            },
+                            "read": {
+                              "type": "long"
+                            },
+                            "written": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "shared": {
+                          "properties": {
+                            "dirtied": {
+                              "type": "long"
+                            },
+                            "hit": {
+                              "type": "long"
+                            },
+                            "read": {
+                              "type": "long"
+                            },
+                            "written": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "temp": {
+                          "properties": {
+                            "read": {
+                              "type": "long"
+                            },
+                            "written": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "rows": {
+                      "type": "long"
+                    },
+                    "text": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "time": {
+                      "properties": {
+                        "max": {
+                          "properties": {
+                            "ms": {
+                              "type": "float"
+                            }
+                          }
+                        },
+                        "mean": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "min": {
+                          "properties": {
+                            "ms": {
+                              "type": "float"
+                            }
+                          }
+                        },
+                        "stddev": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "total": {
+                          "properties": {
+                            "ms": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "user": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "process": {
+          "properties": {
+            "args": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "executable": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "pgid": {
+              "type": "long"
+            },
+            "pid": {
+              "type": "long"
+            },
+            "ppid": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "thread": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                }
+              }
+            },
+            "title": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "working_directory": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "prometheus": {
+          "properties": {
+            "labels": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "metrics": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "rabbitmq": {
+          "properties": {
+            "connection": {
+              "properties": {
+                "channel_max": {
+                  "type": "long"
+                },
+                "channels": {
+                  "type": "long"
+                },
+                "client_provided": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "frame_max": {
+                  "type": "long"
+                },
+                "host": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "octet_count": {
+                  "properties": {
+                    "received": {
+                      "type": "long"
+                    },
+                    "sent": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "packet_count": {
+                  "properties": {
+                    "pending": {
+                      "type": "long"
+                    },
+                    "received": {
+                      "type": "long"
+                    },
+                    "sent": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "peer": {
+                  "properties": {
+                    "host": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "port": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "port": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "exchange": {
+              "properties": {
+                "auto_delete": {
+                  "type": "boolean"
+                },
+                "durable": {
+                  "type": "boolean"
+                },
+                "internal": {
+                  "type": "boolean"
+                },
+                "messages": {
+                  "properties": {
+                    "publish_in": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "details": {
+                          "properties": {
+                            "rate": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "publish_out": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "details": {
+                          "properties": {
+                            "rate": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "node": {
+              "properties": {
+                "disk": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "limit": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "fd": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "gc": {
+                  "properties": {
+                    "num": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "reclaimed": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "io": {
+                  "properties": {
+                    "file_handle": {
+                      "properties": {
+                        "open_attempt": {
+                          "properties": {
+                            "avg": {
+                              "properties": {
+                                "ms": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "read": {
+                      "properties": {
+                        "avg": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "reopen": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "seek": {
+                      "properties": {
+                        "avg": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "sync": {
+                      "properties": {
+                        "avg": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "write": {
+                      "properties": {
+                        "avg": {
+                          "properties": {
+                            "ms": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mem": {
+                  "properties": {
+                    "limit": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mnesia": {
+                  "properties": {
+                    "disk": {
+                      "properties": {
+                        "tx": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "ram": {
+                      "properties": {
+                        "tx": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "msg": {
+                  "properties": {
+                    "store_read": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "store_write": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "proc": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "processors": {
+                  "type": "long"
+                },
+                "queue": {
+                  "properties": {
+                    "index": {
+                      "properties": {
+                        "journal_write": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "read": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "write": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "run": {
+                  "properties": {
+                    "queue": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "socket": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uptime": {
+                  "type": "long"
+                }
+              }
+            },
+            "queue": {
+              "properties": {
+                "arguments": {
+                  "properties": {
+                    "max_priority": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "auto_delete": {
+                  "type": "boolean"
+                },
+                "consumers": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "utilisation": {
+                      "properties": {
+                        "pct": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "disk": {
+                  "properties": {
+                    "reads": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "writes": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "durable": {
+                  "type": "boolean"
+                },
+                "exclusive": {
+                  "type": "boolean"
+                },
+                "memory": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "messages": {
+                  "properties": {
+                    "persistent": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "ready": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "details": {
+                          "properties": {
+                            "rate": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "details": {
+                          "properties": {
+                            "rate": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "unacknowledged": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "details": {
+                          "properties": {
+                            "rate": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "vhost": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "redis": {
+          "properties": {
+            "info": {
+              "properties": {
+                "clients": {
+                  "properties": {
+                    "biggest_input_buf": {
+                      "type": "long"
+                    },
+                    "blocked": {
+                      "type": "long"
+                    },
+                    "connected": {
+                      "type": "long"
+                    },
+                    "longest_output_list": {
+                      "type": "long"
+                    },
+                    "max_input_buffer": {
+                      "type": "long"
+                    },
+                    "max_output_buffer": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "cluster": {
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "cpu": {
+                  "properties": {
+                    "used": {
+                      "properties": {
+                        "sys": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "sys_children": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "user": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "user_children": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "active_defrag": {
+                      "properties": {
+                        "is_running": {
+                          "type": "boolean"
+                        }
+                      }
+                    },
+                    "allocator": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "allocator_stats": {
+                      "properties": {
+                        "active": {
+                          "type": "long"
+                        },
+                        "allocated": {
+                          "type": "long"
+                        },
+                        "fragmentation": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "ratio": {
+                              "type": "float"
+                            }
+                          }
+                        },
+                        "resident": {
+                          "type": "long"
+                        },
+                        "rss": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "ratio": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "fragmentation": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "ratio": {
+                          "type": "float"
+                        }
+                      }
+                    },
+                    "max": {
+                      "properties": {
+                        "policy": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "dataset": {
+                          "type": "long"
+                        },
+                        "lua": {
+                          "type": "long"
+                        },
+                        "peak": {
+                          "type": "long"
+                        },
+                        "rss": {
+                          "type": "long"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "persistence": {
+                  "properties": {
+                    "aof": {
+                      "properties": {
+                        "bgrewrite": {
+                          "properties": {
+                            "last_status": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "buffer": {
+                          "properties": {
+                            "size": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "copy_on_write": {
+                          "properties": {
+                            "last_size": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "enabled": {
+                          "type": "boolean"
+                        },
+                        "fsync": {
+                          "properties": {
+                            "delayed": {
+                              "type": "long"
+                            },
+                            "pending": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "rewrite": {
+                          "properties": {
+                            "buffer": {
+                              "properties": {
+                                "size": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "current_time": {
+                              "properties": {
+                                "sec": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "in_progress": {
+                              "type": "boolean"
+                            },
+                            "last_time": {
+                              "properties": {
+                                "sec": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "scheduled": {
+                              "type": "boolean"
+                            }
+                          }
+                        },
+                        "size": {
+                          "properties": {
+                            "base": {
+                              "type": "long"
+                            },
+                            "current": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "write": {
+                          "properties": {
+                            "last_status": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "loading": {
+                      "type": "boolean"
+                    },
+                    "rdb": {
+                      "properties": {
+                        "bgsave": {
+                          "properties": {
+                            "current_time": {
+                              "properties": {
+                                "sec": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "in_progress": {
+                              "type": "boolean"
+                            },
+                            "last_status": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "last_time": {
+                              "properties": {
+                                "sec": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "copy_on_write": {
+                          "properties": {
+                            "last_size": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "last_save": {
+                          "properties": {
+                            "changes_since": {
+                              "type": "long"
+                            },
+                            "time": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "replication": {
+                  "properties": {
+                    "backlog": {
+                      "properties": {
+                        "active": {
+                          "type": "long"
+                        },
+                        "first_byte_offset": {
+                          "type": "long"
+                        },
+                        "histlen": {
+                          "type": "long"
+                        },
+                        "size": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "connected_slaves": {
+                      "type": "long"
+                    },
+                    "master": {
+                      "properties": {
+                        "last_io_seconds_ago": {
+                          "type": "long"
+                        },
+                        "link_status": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "offset": {
+                          "type": "long"
+                        },
+                        "second_offset": {
+                          "type": "long"
+                        },
+                        "sync": {
+                          "properties": {
+                            "in_progress": {
+                              "type": "boolean"
+                            },
+                            "last_io_seconds_ago": {
+                              "type": "long"
+                            },
+                            "left_bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "master_offset": {
+                      "type": "long"
+                    },
+                    "role": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "slave": {
+                      "properties": {
+                        "is_readonly": {
+                          "type": "boolean"
+                        },
+                        "offset": {
+                          "type": "long"
+                        },
+                        "priority": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "server": {
+                  "properties": {
+                    "arch_bits": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "build_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "config_file": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "gcc_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "git_dirty": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "git_sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "hz": {
+                      "type": "long"
+                    },
+                    "lru_clock": {
+                      "type": "long"
+                    },
+                    "mode": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "multiplexing_api": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "run_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "tcp_port": {
+                      "type": "long"
+                    },
+                    "uptime": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "slowlog": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "stats": {
+                  "properties": {
+                    "active_defrag": {
+                      "properties": {
+                        "hits": {
+                          "type": "long"
+                        },
+                        "key_hits": {
+                          "type": "long"
+                        },
+                        "key_misses": {
+                          "type": "long"
+                        },
+                        "misses": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "commands_processed": {
+                      "type": "long"
+                    },
+                    "connections": {
+                      "properties": {
+                        "received": {
+                          "type": "long"
+                        },
+                        "rejected": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "instantaneous": {
+                      "properties": {
+                        "input_kbps": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "ops_per_sec": {
+                          "type": "long"
+                        },
+                        "output_kbps": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "keys": {
+                      "properties": {
+                        "evicted": {
+                          "type": "long"
+                        },
+                        "expired": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "keyspace": {
+                      "properties": {
+                        "hits": {
+                          "type": "long"
+                        },
+                        "misses": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "latest_fork_usec": {
+                      "type": "long"
+                    },
+                    "migrate_cached_sockets": {
+                      "type": "long"
+                    },
+                    "net": {
+                      "properties": {
+                        "input": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "output": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "pubsub": {
+                      "properties": {
+                        "channels": {
+                          "type": "long"
+                        },
+                        "patterns": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "slave_expires_tracked_keys": {
+                      "type": "long"
+                    },
+                    "sync": {
+                      "properties": {
+                        "full": {
+                          "type": "long"
+                        },
+                        "partial": {
+                          "properties": {
+                            "err": {
+                              "type": "long"
+                            },
+                            "ok": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "key": {
+              "properties": {
+                "expire": {
+                  "properties": {
+                    "ttl": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "length": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "keyspace": {
+              "properties": {
+                "avg_ttl": {
+                  "type": "long"
+                },
+                "expires": {
+                  "type": "long"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "keys": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "related": {
+          "properties": {
+            "ip": {
+              "type": "ip"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "service": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "state": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "source": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "system": {
+          "properties": {
+            "core": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "idle": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "iowait": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "irq": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "nice": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "softirq": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "steal": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "system": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "user": {
+                  "properties": {
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "cpu": {
+              "properties": {
+                "cores": {
+                  "type": "long"
+                },
+                "idle": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "iowait": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "irq": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "nice": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "softirq": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "steal": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "system": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                },
+                "user": {
+                  "properties": {
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "diskio": {
+              "properties": {
+                "io": {
+                  "properties": {
+                    "time": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "iostat": {
+                  "properties": {
+                    "await": {
+                      "type": "float"
+                    },
+                    "busy": {
+                      "type": "float"
+                    },
+                    "queue": {
+                      "properties": {
+                        "avg_size": {
+                          "type": "float"
+                        }
+                      }
+                    },
+                    "read": {
+                      "properties": {
+                        "await": {
+                          "type": "float"
+                        },
+                        "per_sec": {
+                          "properties": {
+                            "bytes": {
+                              "type": "float"
+                            }
+                          }
+                        },
+                        "request": {
+                          "properties": {
+                            "merges_per_sec": {
+                              "type": "float"
+                            },
+                            "per_sec": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "request": {
+                      "properties": {
+                        "avg_size": {
+                          "type": "float"
+                        }
+                      }
+                    },
+                    "service_time": {
+                      "type": "float"
+                    },
+                    "write": {
+                      "properties": {
+                        "await": {
+                          "type": "float"
+                        },
+                        "per_sec": {
+                          "properties": {
+                            "bytes": {
+                              "type": "float"
+                            }
+                          }
+                        },
+                        "request": {
+                          "properties": {
+                            "merges_per_sec": {
+                              "type": "float"
+                            },
+                            "per_sec": {
+                              "type": "float"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "serial_number": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "count": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "entropy": {
+              "properties": {
+                "available_bits": {
+                  "type": "long"
+                },
+                "pct": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "filesystem": {
+              "properties": {
+                "available": {
+                  "type": "long"
+                },
+                "device_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "files": {
+                  "type": "long"
+                },
+                "free": {
+                  "type": "long"
+                },
+                "free_files": {
+                  "type": "long"
+                },
+                "mount_point": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "total": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "used": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                }
+              }
+            },
+            "fsstat": {
+              "properties": {
+                "count": {
+                  "type": "long"
+                },
+                "total_files": {
+                  "type": "long"
+                },
+                "total_size": {
+                  "properties": {
+                    "free": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "load": {
+              "properties": {
+                "1": {
+                  "scaling_factor": 100,
+                  "type": "scaled_float"
+                },
+                "15": {
+                  "scaling_factor": 100,
+                  "type": "scaled_float"
+                },
+                "5": {
+                  "scaling_factor": 100,
+                  "type": "scaled_float"
+                },
+                "cores": {
+                  "type": "long"
+                },
+                "norm": {
+                  "properties": {
+                    "1": {
+                      "scaling_factor": 100,
+                      "type": "scaled_float"
+                    },
+                    "15": {
+                      "scaling_factor": 100,
+                      "type": "scaled_float"
+                    },
+                    "5": {
+                      "scaling_factor": 100,
+                      "type": "scaled_float"
+                    }
+                  }
+                }
+              }
+            },
+            "memory": {
+              "properties": {
+                "actual": {
+                  "properties": {
+                    "free": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    }
+                  }
+                },
+                "free": {
+                  "type": "long"
+                },
+                "hugepages": {
+                  "properties": {
+                    "default_size": {
+                      "type": "long"
+                    },
+                    "free": {
+                      "type": "long"
+                    },
+                    "reserved": {
+                      "type": "long"
+                    },
+                    "surplus": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "swap": {
+                  "properties": {
+                    "free": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "type": "long"
+                },
+                "used": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "pct": {
+                      "scaling_factor": 1000,
+                      "type": "scaled_float"
+                    }
+                  }
+                }
+              }
+            },
+            "network": {
+              "properties": {
+                "in": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "dropped": {
+                      "type": "long"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "out": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "dropped": {
+                      "type": "long"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "process": {
+              "properties": {
+                "cgroup": {
+                  "properties": {
+                    "blkio": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "ios": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "shares": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "rt": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "runtime": {
+                              "properties": {
+                                "us": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "percpu": {
+                          "properties": {
+                            "1": {
+                              "type": "long"
+                            },
+                            "2": {
+                              "type": "long"
+                            },
+                            "3": {
+                              "type": "long"
+                            },
+                            "4": {
+                              "type": "long"
+                            },
+                            "5": {
+                              "type": "long"
+                            },
+                            "6": {
+                              "type": "long"
+                            },
+                            "7": {
+                              "type": "long"
+                            },
+                            "8": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "stats": {
+                          "properties": {
+                            "system": {
+                              "properties": {
+                                "ns": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "user": {
+                              "properties": {
+                                "ns": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "memory": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "kmem": {
+                          "properties": {
+                            "failures": {
+                              "type": "long"
+                            },
+                            "limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "usage": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                },
+                                "max": {
+                                  "properties": {
+                                    "bytes": {
+                                      "type": "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "kmem_tcp": {
+                          "properties": {
+                            "failures": {
+                              "type": "long"
+                            },
+                            "limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "usage": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                },
+                                "max": {
+                                  "properties": {
+                                    "bytes": {
+                                      "type": "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "mem": {
+                          "properties": {
+                            "failures": {
+                              "type": "long"
+                            },
+                            "limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "usage": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                },
+                                "max": {
+                                  "properties": {
+                                    "bytes": {
+                                      "type": "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "memsw": {
+                          "properties": {
+                            "failures": {
+                              "type": "long"
+                            },
+                            "limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "usage": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                },
+                                "max": {
+                                  "properties": {
+                                    "bytes": {
+                                      "type": "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "active_anon": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "active_file": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "cache": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "hierarchical_memory_limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "hierarchical_memsw_limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "inactive_anon": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "inactive_file": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "major_page_faults": {
+                              "type": "long"
+                            },
+                            "mapped_file": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "page_faults": {
+                              "type": "long"
+                            },
+                            "pages_in": {
+                              "type": "long"
+                            },
+                            "pages_out": {
+                              "type": "long"
+                            },
+                            "rss": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "rss_huge": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "swap": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "unevictable": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "path": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "cmdline": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                },
+                "cpu": {
+                  "properties": {
+                    "start_time": {
+                      "type": "date"
+                    },
+                    "system": {
+                      "properties": {
+                        "ticks": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "norm": {
+                          "properties": {
+                            "pct": {
+                              "scaling_factor": 1000,
+                              "type": "scaled_float"
+                            }
+                          }
+                        },
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        },
+                        "ticks": {
+                          "type": "long"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "user": {
+                      "properties": {
+                        "ticks": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "env": {
+                  "type": "object"
+                },
+                "fd": {
+                  "properties": {
+                    "limit": {
+                      "properties": {
+                        "hard": {
+                          "type": "long"
+                        },
+                        "soft": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "open": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "rss": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "scaling_factor": 1000,
+                          "type": "scaled_float"
+                        }
+                      }
+                    },
+                    "share": {
+                      "type": "long"
+                    },
+                    "size": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "summary": {
+                  "properties": {
+                    "dead": {
+                      "type": "long"
+                    },
+                    "idle": {
+                      "type": "long"
+                    },
+                    "running": {
+                      "type": "long"
+                    },
+                    "sleeping": {
+                      "type": "long"
+                    },
+                    "stopped": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    },
+                    "unknown": {
+                      "type": "long"
+                    },
+                    "zombie": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "raid": {
+              "properties": {
+                "blocks": {
+                  "properties": {
+                    "synced": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "disks": {
+                  "properties": {
+                    "active": {
+                      "type": "long"
+                    },
+                    "failed": {
+                      "type": "long"
+                    },
+                    "spare": {
+                      "type": "long"
+                    },
+                    "states": {
+                      "properties": {
+                        "*": {
+                          "type": "object"
+                        }
+                      }
+                    },
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sync_action": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "socket": {
+              "properties": {
+                "local": {
+                  "properties": {
+                    "ip": {
+                      "type": "ip"
+                    },
+                    "port": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "process": {
+                  "properties": {
+                    "cmdline": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "remote": {
+                  "properties": {
+                    "etld_plus_one": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "host": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "host_error": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "ip": {
+                      "type": "ip"
+                    },
+                    "port": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "summary": {
+                  "properties": {
+                    "all": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "listening": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "tcp": {
+                      "properties": {
+                        "all": {
+                          "properties": {
+                            "close_wait": {
+                              "type": "long"
+                            },
+                            "count": {
+                              "type": "long"
+                            },
+                            "established": {
+                              "type": "long"
+                            },
+                            "listening": {
+                              "type": "long"
+                            },
+                            "orphan": {
+                              "type": "long"
+                            },
+                            "time_wait": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "memory": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "udp": {
+                      "properties": {
+                        "all": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "memory": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "uptime": {
+              "properties": {
+                "duration": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "timeseries": {
+          "properties": {
+            "instance": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "traefik": {
+          "properties": {
+            "health": {
+              "properties": {
+                "response": {
+                  "properties": {
+                    "avg_time": {
+                      "properties": {
+                        "us": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "count": {
+                      "type": "long"
+                    },
+                    "status_codes": {
+                      "properties": {
+                        "*": {
+                          "type": "object"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uptime": {
+                  "properties": {
+                    "sec": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "type": {
+          "ignore_above": 1024,
+          "type": "keyword"
+        },
+        "url": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fragment": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "password": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "port": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scheme": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "username": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user": {
+          "properties": {
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user_agent": {
+          "properties": {
+            "device": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "uwsgi": {
+          "properties": {
+            "status": {
+              "properties": {
+                "core": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "read_errors": {
+                      "type": "long"
+                    },
+                    "requests": {
+                      "properties": {
+                        "offloaded": {
+                          "type": "long"
+                        },
+                        "routed": {
+                          "type": "long"
+                        },
+                        "static": {
+                          "type": "long"
+                        },
+                        "total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "worker_pid": {
+                      "type": "long"
+                    },
+                    "write_errors": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "exceptions": {
+                      "type": "long"
+                    },
+                    "pid": {
+                      "type": "long"
+                    },
+                    "read_errors": {
+                      "type": "long"
+                    },
+                    "requests": {
+                      "type": "long"
+                    },
+                    "write_errors": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "worker": {
+                  "properties": {
+                    "accepting": {
+                      "type": "long"
+                    },
+                    "avg_rt": {
+                      "type": "long"
+                    },
+                    "delta_requests": {
+                      "type": "long"
+                    },
+                    "exceptions": {
+                      "type": "long"
+                    },
+                    "harakiri_count": {
+                      "type": "long"
+                    },
+                    "id": {
+                      "type": "long"
+                    },
+                    "pid": {
+                      "type": "long"
+                    },
+                    "requests": {
+                      "type": "long"
+                    },
+                    "respawn_count": {
+                      "type": "long"
+                    },
+                    "rss": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "running_time": {
+                      "type": "long"
+                    },
+                    "signal_queue": {
+                      "type": "long"
+                    },
+                    "signals": {
+                      "type": "long"
+                    },
+                    "status": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "tx": {
+                      "type": "long"
+                    },
+                    "vsz": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "vsphere": {
+          "properties": {
+            "datastore": {
+              "properties": {
+                "capacity": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "fstype": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "host": {
+              "properties": {
+                "cpu": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "mhz": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "mhz": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "mhz": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "memory": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "network_names": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "virtualmachine": {
+              "properties": {
+                "cpu": {
+                  "properties": {
+                    "used": {
+                      "properties": {
+                        "mhz": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "custom_fields": {
+                  "type": "object"
+                },
+                "host": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "memory": {
+                  "properties": {
+                    "free": {
+                      "properties": {
+                        "guest": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "total": {
+                      "properties": {
+                        "guest": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "used": {
+                      "properties": {
+                        "guest": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "host": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "network_names": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "os": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "windows": {
+          "properties": {
+            "service": {
+              "properties": {
+                "display_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exit_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "path_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "start_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "start_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "uptime": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "zookeeper": {
+          "properties": {
+            "connection": {
+              "properties": {
+                "interest_ops": {
+                  "type": "long"
+                },
+                "queued": {
+                  "type": "long"
+                },
+                "received": {
+                  "type": "long"
+                },
+                "sent": {
+                  "type": "long"
+                }
+              }
+            },
+            "mntr": {
+              "properties": {
+                "approximate_data_size": {
+                  "type": "long"
+                },
+                "ephemerals_count": {
+                  "type": "long"
+                },
+                "followers": {
+                  "type": "long"
+                },
+                "hostname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "latency": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "max_file_descriptor_count": {
+                  "type": "long"
+                },
+                "num_alive_connections": {
+                  "type": "long"
+                },
+                "open_file_descriptor_count": {
+                  "type": "long"
+                },
+                "outstanding_requests": {
+                  "type": "long"
+                },
+                "packets": {
+                  "properties": {
+                    "received": {
+                      "type": "long"
+                    },
+                    "sent": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "pending_syncs": {
+                  "type": "long"
+                },
+                "server_state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "synced_followers": {
+                  "type": "long"
+                },
+                "version": {
+                  "path": "service.version",
+                  "type": "alias"
+                },
+                "watch_count": {
+                  "type": "long"
+                },
+                "znode_count": {
+                  "type": "long"
+                }
+              }
+            },
+            "server": {
+              "properties": {
+                "connections": {
+                  "type": "long"
+                },
+                "count": {
+                  "type": "long"
+                },
+                "epoch": {
+                  "type": "long"
+                },
+                "latency": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "mode": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "node_count": {
+                  "type": "long"
+                },
+                "outstanding": {
+                  "type": "long"
+                },
+                "received": {
+                  "type": "long"
+                },
+                "sent": {
+                  "type": "long"
+                },
+                "version_date": {
+                  "type": "date"
+                },
+                "zxid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "mapping": {
+          "total_fields": {
+            "limit": "10000"
+          }
+        },
+        "number_of_replicas": "0",
+        "number_of_shards": "1",
+        "query": {
+          "default_field": [
+            "beat.*",
+            "type",
+            "tags",
+            "meta.*",
+            "message"
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/reporting/nanos/mappings.json b/x-pack/test/functional/es_archives/reporting/nanos/mappings.json
index 135c7e7512a6c..34420b6bb63e1 100644
--- a/x-pack/test/functional/es_archives/reporting/nanos/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/nanos/mappings.json
@@ -49,11 +49,11 @@
       "properties": {
         "action": {
           "properties": {
-            "actionTypeConfig": {
+            "config": {
               "enabled": false,
               "type": "object"
             },
-            "actionTypeConfigSecrets": {
+            "secrets": {
               "type": "binary"
             },
             "actionTypeId": {
diff --git a/x-pack/test/functional/ftr_provider_context.d.ts b/x-pack/test/functional/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..bb257cdcbfe1b
--- /dev/null
+++ b/x-pack/test/functional/ftr_provider_context.d.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.
+ */
+
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+
+import { pageObjects } from './page_objects';
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/x-pack/test/functional/page_objects/canvas_page.ts b/x-pack/test/functional/page_objects/canvas_page.ts
index 38672dd7d3115..78863f91451f6 100644
--- a/x-pack/test/functional/page_objects/canvas_page.ts
+++ b/x-pack/test/functional/page_objects/canvas_page.ts
@@ -6,9 +6,9 @@
 
 import expect from '@kbn/expect';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export function CanvasPageProvider({ getService }: KibanaFunctionalTestDefaultProviders) {
+export function CanvasPageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const find = getService('find');
 
diff --git a/x-pack/test/functional/page_objects/code_page.ts b/x-pack/test/functional/page_objects/code_page.ts
index 203902dcc1b13..5494f2e82569c 100644
--- a/x-pack/test/functional/page_objects/code_page.ts
+++ b/x-pack/test/functional/page_objects/code_page.ts
@@ -8,9 +8,9 @@
 // import Keys from 'leadfoot/keys';
 // import moment from 'moment';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export function CodeHomePageProvider({ getService }: KibanaFunctionalTestDefaultProviders) {
+export function CodeHomePageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const log = getService('log');
   const queryBar = getService('queryBar');
diff --git a/x-pack/test/functional/page_objects/cross_cluster_replication_page.ts b/x-pack/test/functional/page_objects/cross_cluster_replication_page.ts
index 256a9b483f1d4..e884d200a0759 100644
--- a/x-pack/test/functional/page_objects/cross_cluster_replication_page.ts
+++ b/x-pack/test/functional/page_objects/cross_cluster_replication_page.ts
@@ -4,11 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export const CrossClusterReplicationPageProvider = ({
-  getService,
-}: KibanaFunctionalTestDefaultProviders) => {
+export function CrossClusterReplicationPageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
 
   return {
@@ -19,4 +17,4 @@ export const CrossClusterReplicationPageProvider = ({
       return await testSubjects.find('createFollowerIndexButton');
     },
   };
-};
+}
diff --git a/x-pack/test/functional/page_objects/index.js b/x-pack/test/functional/page_objects/index.js
deleted file mode 100644
index e3ecab8df9596..0000000000000
--- a/x-pack/test/functional/page_objects/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { CanvasPageProvider } from './canvas_page';
-export { SecurityPageProvider } from './security_page';
-export { MonitoringPageProvider } from './monitoring_page';
-export { LogstashPageProvider } from './logstash_page';
-export { GraphPageProvider } from './graph_page';
-export { GrokDebuggerPageProvider } from './grok_debugger_page';
-export { WatcherPageProvider } from './watcher_page';
-export { ReportingPageProvider } from './reporting_page';
-export { SpaceSelectorPageProvider } from './space_selector_page';
-export { AccountSettingProvider } from './accountsetting_page';
-export { InfraHomePageProvider } from './infra_home_page';
-export { InfraLogsPageProvider } from './infra_logs_page';
-export { GisPageProvider } from './gis_page';
-export { StatusPagePageProvider } from './status_page';
-export { UpgradeAssistantProvider } from './upgrade_assistant';
-export { CodeHomePageProvider } from './code_page';
-export { RollupPageProvider } from './rollup_page';
-export { UptimePageProvider } from './uptime_page';
-export { LicenseManagementPageProvider } from './license_management_page';
-export { IndexManagementPageProvider } from './index_management_page';
-export { IndexLifecycleManagementPageProvider } from './index_lifecycle_management_page';
-export { SnapshotRestorePageProvider } from './snapshot_restore_page';
-export { CrossClusterReplicationPageProvider } from './cross_cluster_replication_page';
-export { RemoteClustersPageProvider } from './remote_clusters_page';
diff --git a/x-pack/test/functional/page_objects/index.ts b/x-pack/test/functional/page_objects/index.ts
new file mode 100644
index 0000000000000..c80b8c76c639c
--- /dev/null
+++ b/x-pack/test/functional/page_objects/index.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { pageObjects as kibanaFunctionalPageObjects } from '../../../../test/functional/page_objects';
+
+import { CanvasPageProvider } from './canvas_page';
+// @ts-ignore not ts yet
+import { SecurityPageProvider } from './security_page';
+// @ts-ignore not ts yet
+import { MonitoringPageProvider } from './monitoring_page';
+// @ts-ignore not ts yet
+import { LogstashPageProvider } from './logstash_page';
+// @ts-ignore not ts yet
+import { GraphPageProvider } from './graph_page';
+// @ts-ignore not ts yet
+import { GrokDebuggerPageProvider } from './grok_debugger_page';
+// @ts-ignore not ts yet
+import { WatcherPageProvider } from './watcher_page';
+// @ts-ignore not ts yet
+import { ReportingPageProvider } from './reporting_page';
+// @ts-ignore not ts yet
+import { SpaceSelectorPageProvider } from './space_selector_page';
+// @ts-ignore not ts yet
+import { AccountSettingProvider } from './accountsetting_page';
+import { InfraHomePageProvider } from './infra_home_page';
+import { InfraLogsPageProvider } from './infra_logs_page';
+// @ts-ignore not ts yet
+import { GisPageProvider } from './gis_page';
+// @ts-ignore not ts yet
+import { StatusPagePageProvider } from './status_page';
+// @ts-ignore not ts yet
+import { UpgradeAssistantProvider } from './upgrade_assistant';
+import { CodeHomePageProvider } from './code_page';
+// @ts-ignore not ts yet
+import { RollupPageProvider } from './rollup_page';
+import { UptimePageProvider } from './uptime_page';
+import { LicenseManagementPageProvider } from './license_management_page';
+import { IndexManagementPageProvider } from './index_management_page';
+import { IndexLifecycleManagementPageProvider } from './index_lifecycle_management_page';
+import { SnapshotRestorePageProvider } from './snapshot_restore_page';
+import { CrossClusterReplicationPageProvider } from './cross_cluster_replication_page';
+import { RemoteClustersPageProvider } from './remote_clusters_page';
+
+// just like services, PageObjects are defined as a map of
+// names to Providers. Merge in Kibana's or pick specific ones
+export const pageObjects = {
+  ...kibanaFunctionalPageObjects,
+  canvas: CanvasPageProvider,
+  security: SecurityPageProvider,
+  accountSetting: AccountSettingProvider,
+  monitoring: MonitoringPageProvider,
+  logstash: LogstashPageProvider,
+  graph: GraphPageProvider,
+  grokDebugger: GrokDebuggerPageProvider,
+  watcher: WatcherPageProvider,
+  reporting: ReportingPageProvider,
+  spaceSelector: SpaceSelectorPageProvider,
+  infraHome: InfraHomePageProvider,
+  infraLogs: InfraLogsPageProvider,
+  maps: GisPageProvider,
+  statusPage: StatusPagePageProvider,
+  upgradeAssistant: UpgradeAssistantProvider,
+  code: CodeHomePageProvider,
+  uptime: UptimePageProvider,
+  rollup: RollupPageProvider,
+  licenseManagement: LicenseManagementPageProvider,
+  indexManagement: IndexManagementPageProvider,
+  indexLifecycleManagement: IndexLifecycleManagementPageProvider,
+  snapshotRestore: SnapshotRestorePageProvider,
+  crossClusterReplication: CrossClusterReplicationPageProvider,
+  remoteClusters: RemoteClustersPageProvider,
+};
diff --git a/x-pack/test/functional/page_objects/index_lifecycle_management_page.ts b/x-pack/test/functional/page_objects/index_lifecycle_management_page.ts
index fac6f5a48101a..3a8ff4bd2b86f 100644
--- a/x-pack/test/functional/page_objects/index_lifecycle_management_page.ts
+++ b/x-pack/test/functional/page_objects/index_lifecycle_management_page.ts
@@ -4,11 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export const IndexLifecycleManagementPageProvider = ({
-  getService,
-}: KibanaFunctionalTestDefaultProviders) => {
+export function IndexLifecycleManagementPageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
 
   return {
@@ -19,4 +17,4 @@ export const IndexLifecycleManagementPageProvider = ({
       return await testSubjects.find('createPolicyButton');
     },
   };
-};
+}
diff --git a/x-pack/test/functional/page_objects/index_management_page.ts b/x-pack/test/functional/page_objects/index_management_page.ts
index 409272e61bd32..a8e02b6e7e805 100644
--- a/x-pack/test/functional/page_objects/index_management_page.ts
+++ b/x-pack/test/functional/page_objects/index_management_page.ts
@@ -4,11 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export const IndexManagementPageProvider = ({
-  getService,
-}: KibanaFunctionalTestDefaultProviders) => {
+export function IndexManagementPageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
 
   return {
@@ -19,4 +17,4 @@ export const IndexManagementPageProvider = ({
       return await testSubjects.find('reloadIndicesButton');
     },
   };
-};
+}
diff --git a/x-pack/test/functional/page_objects/infra_home_page.ts b/x-pack/test/functional/page_objects/infra_home_page.ts
index e9e960a62642d..479468d1f82c6 100644
--- a/x-pack/test/functional/page_objects/infra_home_page.ts
+++ b/x-pack/test/functional/page_objects/infra_home_page.ts
@@ -6,9 +6,9 @@
 
 import testSubjSelector from '@kbn/test-subj-selector';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export function InfraHomePageProvider({ getService }: KibanaFunctionalTestDefaultProviders) {
+export function InfraHomePageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const find = getService('find');
   const browser = getService('browser');
diff --git a/x-pack/test/functional/page_objects/infra_logs_page.ts b/x-pack/test/functional/page_objects/infra_logs_page.ts
index 696995fb716d8..f38740dbb6d13 100644
--- a/x-pack/test/functional/page_objects/infra_logs_page.ts
+++ b/x-pack/test/functional/page_objects/infra_logs_page.ts
@@ -7,12 +7,9 @@
 // import testSubjSelector from '@kbn/test-subj-selector';
 // import moment from 'moment';
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export function InfraLogsPageProvider({
-  getPageObjects,
-  getService,
-}: KibanaFunctionalTestDefaultProviders) {
+export function InfraLogsPageProvider({ getPageObjects, getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const pageObjects = getPageObjects(['common']);
 
diff --git a/x-pack/test/functional/page_objects/license_management_page.ts b/x-pack/test/functional/page_objects/license_management_page.ts
index bbc0843587bf9..ee49ecc6ad56e 100644
--- a/x-pack/test/functional/page_objects/license_management_page.ts
+++ b/x-pack/test/functional/page_objects/license_management_page.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export const LicenseManagementPageProvider = ({
-  getService,
-  getPageObjects,
-}: KibanaFunctionalTestDefaultProviders) => {
+export function LicenseManagementPageProvider({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'header']);
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
@@ -38,4 +35,4 @@ export const LicenseManagementPageProvider = ({
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
   };
-};
+}
diff --git a/x-pack/test/functional/page_objects/remote_clusters_page.ts b/x-pack/test/functional/page_objects/remote_clusters_page.ts
index 36519b8668c69..afa83c1df27d0 100644
--- a/x-pack/test/functional/page_objects/remote_clusters_page.ts
+++ b/x-pack/test/functional/page_objects/remote_clusters_page.ts
@@ -4,11 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export const RemoteClustersPageProvider = ({
-  getService,
-}: KibanaFunctionalTestDefaultProviders) => {
+export function RemoteClustersPageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
 
   return {
@@ -16,4 +14,4 @@ export const RemoteClustersPageProvider = ({
       return await testSubjects.find('remoteClusterEmptyPromptCreateButton');
     },
   };
-};
+}
diff --git a/x-pack/test/functional/page_objects/snapshot_restore_page.ts b/x-pack/test/functional/page_objects/snapshot_restore_page.ts
index d5d004693d8e3..25bdfc7075727 100644
--- a/x-pack/test/functional/page_objects/snapshot_restore_page.ts
+++ b/x-pack/test/functional/page_objects/snapshot_restore_page.ts
@@ -4,11 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export const SnapshotRestorePageProvider = ({
-  getService,
-}: KibanaFunctionalTestDefaultProviders) => {
+export function SnapshotRestorePageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
 
   return {
@@ -19,4 +17,4 @@ export const SnapshotRestorePageProvider = ({
       return await testSubjects.find('registerRepositoryButton');
     },
   };
-};
+}
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index 42c4625e98678..5429463623aaa 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export const UptimePageProvider = ({
-  getPageObjects,
-  getService,
-}: KibanaFunctionalTestDefaultProviders) => {
+export function UptimePageProvider({ getPageObjects, getService }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common', 'timePicker']);
   const uptimeService = getService('uptime');
 
@@ -49,4 +46,4 @@ export const UptimePageProvider = ({
       await uptimeService.monitorIdExists('monitor-page-link-auto-http-0X131221E73F825974');
     }
   })();
-};
+}
diff --git a/x-pack/test/functional/services/index.js b/x-pack/test/functional/services/index.js
deleted file mode 100644
index 126623e35ad05..0000000000000
--- a/x-pack/test/functional/services/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './monitoring';
-export { PipelineListProvider } from './pipeline_list';
-export { PipelineEditorProvider } from './pipeline_editor';
-export { RandomProvider } from './random';
-export { AceEditorProvider } from './ace_editor';
-export { GrokDebuggerProvider } from './grok_debugger';
-export { UserMenuProvider } from './user_menu';
-export { UptimeProvider } from './uptime';
-export { InfraSourceConfigurationFlyoutProvider } from './infra_source_configuration_flyout';
-export { InfraLogStreamProvider } from './infra_log_stream';
-export { MachineLearningProvider } from './machine_learning';
diff --git a/x-pack/test/functional/services/index.ts b/x-pack/test/functional/services/index.ts
new file mode 100644
index 0000000000000..87e27a5955571
--- /dev/null
+++ b/x-pack/test/functional/services/index.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { services as kibanaFunctionalServices } from '../../../../test/functional/services';
+import { services as kibanaApiIntegrationServices } from '../../../../test/api_integration/services';
+
+import {
+  MonitoringNoDataProvider,
+  MonitoringClusterListProvider,
+  MonitoringClusterOverviewProvider,
+  MonitoringClusterAlertsProvider,
+  MonitoringElasticsearchSummaryStatusProvider,
+  MonitoringElasticsearchOverviewProvider,
+  MonitoringElasticsearchNodesProvider,
+  MonitoringElasticsearchNodeDetailProvider,
+  MonitoringElasticsearchIndicesProvider,
+  MonitoringElasticsearchIndexDetailProvider,
+  MonitoringElasticsearchShardsProvider,
+  MonitoringBeatsOverviewProvider,
+  MonitoringBeatsListingProvider,
+  MonitoringBeatDetailProvider,
+  MonitoringBeatsSummaryStatusProvider,
+  MonitoringLogstashPipelinesProvider,
+  MonitoringLogstashSummaryStatusProvider,
+  MonitoringKibanaOverviewProvider,
+  MonitoringKibanaInstancesProvider,
+  MonitoringKibanaInstanceProvider,
+  MonitoringKibanaSummaryStatusProvider,
+  // @ts-ignore not ts yet
+} from './monitoring';
+// @ts-ignore not ts yet
+import { PipelineListProvider } from './pipeline_list';
+// @ts-ignore not ts yet
+import { PipelineEditorProvider } from './pipeline_editor';
+// @ts-ignore not ts yet
+import { RandomProvider } from './random';
+// @ts-ignore not ts yet
+import { AceEditorProvider } from './ace_editor';
+// @ts-ignore not ts yet
+import { GrokDebuggerProvider } from './grok_debugger';
+// @ts-ignore not ts yet
+import { UserMenuProvider } from './user_menu';
+import { UptimeProvider } from './uptime';
+import { InfraSourceConfigurationFlyoutProvider } from './infra_source_configuration_flyout';
+import { InfraLogStreamProvider } from './infra_log_stream';
+import { MachineLearningProvider } from './machine_learning';
+
+import { SecurityServiceProvider, SpacesServiceProvider } from '../../common/services';
+
+// define the name and providers for services that should be
+// available to your tests. If you don't specify anything here
+// only the built-in services will be available
+export const services = {
+  ...kibanaFunctionalServices,
+  esSupertest: kibanaApiIntegrationServices.esSupertest,
+  monitoringNoData: MonitoringNoDataProvider,
+  monitoringClusterList: MonitoringClusterListProvider,
+  monitoringClusterOverview: MonitoringClusterOverviewProvider,
+  monitoringClusterAlerts: MonitoringClusterAlertsProvider,
+  monitoringElasticsearchSummaryStatus: MonitoringElasticsearchSummaryStatusProvider,
+  monitoringElasticsearchOverview: MonitoringElasticsearchOverviewProvider,
+  monitoringElasticsearchNodes: MonitoringElasticsearchNodesProvider,
+  monitoringElasticsearchNodeDetail: MonitoringElasticsearchNodeDetailProvider,
+  monitoringElasticsearchIndices: MonitoringElasticsearchIndicesProvider,
+  monitoringElasticsearchIndexDetail: MonitoringElasticsearchIndexDetailProvider,
+  monitoringElasticsearchShards: MonitoringElasticsearchShardsProvider,
+  monitoringBeatsOverview: MonitoringBeatsOverviewProvider,
+  monitoringBeatsListing: MonitoringBeatsListingProvider,
+  monitoringBeatDetail: MonitoringBeatDetailProvider,
+  monitoringBeatsSummaryStatus: MonitoringBeatsSummaryStatusProvider,
+  monitoringLogstashPipelines: MonitoringLogstashPipelinesProvider,
+  monitoringLogstashSummaryStatus: MonitoringLogstashSummaryStatusProvider,
+  monitoringKibanaOverview: MonitoringKibanaOverviewProvider,
+  monitoringKibanaInstances: MonitoringKibanaInstancesProvider,
+  monitoringKibanaInstance: MonitoringKibanaInstanceProvider,
+  monitoringKibanaSummaryStatus: MonitoringKibanaSummaryStatusProvider,
+  pipelineList: PipelineListProvider,
+  pipelineEditor: PipelineEditorProvider,
+  random: RandomProvider,
+  aceEditor: AceEditorProvider,
+  grokDebugger: GrokDebuggerProvider,
+  security: SecurityServiceProvider,
+  spaces: SpacesServiceProvider,
+  userMenu: UserMenuProvider,
+  uptime: UptimeProvider,
+  infraSourceConfigurationFlyout: InfraSourceConfigurationFlyoutProvider,
+  infraLogStream: InfraLogStreamProvider,
+  ml: MachineLearningProvider,
+};
diff --git a/x-pack/test/functional/services/infra_log_stream.ts b/x-pack/test/functional/services/infra_log_stream.ts
index c5bf85af05789..265c4b8d13b3c 100644
--- a/x-pack/test/functional/services/infra_log_stream.ts
+++ b/x-pack/test/functional/services/infra_log_stream.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 
-export function InfraLogStreamProvider({ getService }: KibanaFunctionalTestDefaultProviders) {
+export function InfraLogStreamProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
 
   return {
diff --git a/x-pack/test/functional/services/infra_source_configuration_flyout.ts b/x-pack/test/functional/services/infra_source_configuration_flyout.ts
index 4d84e701bc55d..fb77e2dced045 100644
--- a/x-pack/test/functional/services/infra_source_configuration_flyout.ts
+++ b/x-pack/test/functional/services/infra_source_configuration_flyout.ts
@@ -4,12 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 
-export function InfraSourceConfigurationFlyoutProvider({
-  getService,
-}: KibanaFunctionalTestDefaultProviders) {
+export function InfraSourceConfigurationFlyoutProvider({ getService }: FtrProviderContext) {
   const find = getService('find');
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
diff --git a/x-pack/test/functional/services/machine_learning.ts b/x-pack/test/functional/services/machine_learning.ts
index d2ee72667e9f8..1e62d1bb61265 100644
--- a/x-pack/test/functional/services/machine_learning.ts
+++ b/x-pack/test/functional/services/machine_learning.ts
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export function MachineLearningProvider({
-  getService,
-  getPageObjects,
-}: KibanaFunctionalTestDefaultProviders) {
+export function MachineLearningProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects(['common']);
 
diff --git a/x-pack/test/functional/services/uptime.ts b/x-pack/test/functional/services/uptime.ts
index 919b5aa4dcc78..fd1a61da2c0f5 100644
--- a/x-pack/test/functional/services/uptime.ts
+++ b/x-pack/test/functional/services/uptime.ts
@@ -4,11 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export const UptimeProvider = ({ getService }: KibanaFunctionalTestDefaultProviders) => {
+export function UptimeProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
+
   return {
     async assertExists(key: string) {
       if (!(await testSubjects.exists(key))) {
@@ -30,4 +31,4 @@ export const UptimeProvider = ({ getService }: KibanaFunctionalTestDefaultProvid
       await browser.pressKeys(browser.keys.ENTER);
     },
   };
-};
+}
diff --git a/x-pack/test/kerberos_api_integration/anonymous_access.config.ts b/x-pack/test/kerberos_api_integration/anonymous_access.config.ts
index 4ec217ec95591..90d47ec61a4dc 100644
--- a/x-pack/test/kerberos_api_integration/anonymous_access.config.ts
+++ b/x-pack/test/kerberos_api_integration/anonymous_access.config.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../types/providers';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
 
-// eslint-disable-next-line import/no-default-export
-export default async function({ readConfigFile }: KibanaFunctionalTestDefaultProviders) {
+export default async function({ readConfigFile }: FtrConfigProviderContext) {
   const kerberosAPITestsConfig = await readConfigFile(require.resolve('./config.ts'));
 
   return {
diff --git a/x-pack/test/kerberos_api_integration/apis/index.ts b/x-pack/test/kerberos_api_integration/apis/index.ts
index 5905edfcf59a1..00818c2b59eee 100644
--- a/x-pack/test/kerberos_api_integration/apis/index.ts
+++ b/x-pack/test/kerberos_api_integration/apis/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('apis Kerberos', function() {
     this.tags('ciGroup6');
     loadTestFile(require.resolve('./security'));
diff --git a/x-pack/test/kerberos_api_integration/apis/security/index.ts b/x-pack/test/kerberos_api_integration/apis/security/index.ts
index 3442d4ead1656..5d221b796ca24 100644
--- a/x-pack/test/kerberos_api_integration/apis/security/index.ts
+++ b/x-pack/test/kerberos_api_integration/apis/security/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('security', () => {
     loadTestFile(require.resolve('./kerberos_login'));
   });
diff --git a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
index a05c51b85e4f1..0a3b7f595c66d 100644
--- a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
+++ b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
@@ -7,10 +7,9 @@
 import expect from '@kbn/expect';
 import request, { Cookie } from 'request';
 import { delay } from 'bluebird';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const spnegoToken =
     'YIIChwYGKwYBBQUCoIICezCCAnegDTALBgkqhkiG9xIBAgKiggJkBIICYGCCAlwGCSqGSIb3EgECAgEAboICSzCCAkegAwIBBaEDAgEOogcDBQAAAAAAo4IBW2GCAVcwggFToAMCAQWhERsPVEVTVC5FTEFTVElDLkNPohwwGqADAgEDoRMwERsESFRUUBsJbG9jYWxob3N0o4IBGTCCARWgAwIBEqEDAgECooIBBwSCAQNBN2a1Rso+KEJsDwICYLCt7ACLzdlbhEZF5YNsehO109b/WiZR1VTK6kCQyDdBdQFefyvV8EiC35mz7XnTb239nWz6xBGbdmtjSfF0XzpXKbL/zGzLEKkEXQuqFLPUN6qEJXsh0OoNdj9OWwmTr93FVyugs1hO/E5wjlAe2SDYpBN6uZICXu6dFg9nLQKkb/XgbgKM7ZZvgA/UElWDgHav4nPO1VWppCCLKHqXTRnvpr/AsxeON4qeJLaukxBigfIaJlLFMNQal5H7MyXa0j3Y1sckbURnWoBt6r4XE7c8F8cz0rYoGwoCO+Cs5tNutKY6XcsAFbLh59hjgIkhVBhhyTeypIHSMIHPoAMCARKigccEgcSsXqIRAcHfZivrbHfsnvbFgmzmnrKVPFNtJ9Hl23KunCsNW49nP4VF2dEf9n12prDaIguJDV5LPHpTew9rmCj1GCahKJ9bJbRKIgImLFd+nelm3E2zxRqAhrgM1469oDg0ksE3+5lJBuJlVEECMp0F/gxvEiL7DhasICqw+FOJ/jD9QUYvg+E6BIxWgZyPszaxerzBBszAhIF1rxCHRRL1KLjskNeJlBhH77DkAO6AEmsYGdsgEq7b7uCov9PKPiiPAuFF';
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/kerberos_api_integration/config.ts b/x-pack/test/kerberos_api_integration/config.ts
index f104c5cae190e..a1e1466ae40ed 100644
--- a/x-pack/test/kerberos_api_integration/config.ts
+++ b/x-pack/test/kerberos_api_integration/config.ts
@@ -5,10 +5,10 @@
  */
 
 import { resolve } from 'path';
-import { KibanaFunctionalTestDefaultProviders } from '../types/providers';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { services } from './services';
 
-// eslint-disable-next-line import/no-default-export
-export default async function({ readConfigFile }: KibanaFunctionalTestDefaultProviders) {
+export default async function({ readConfigFile }: FtrConfigProviderContext) {
   const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.js'));
 
   const kerberosKeytabPath = resolve(
@@ -23,11 +23,7 @@ export default async function({ readConfigFile }: KibanaFunctionalTestDefaultPro
   return {
     testFiles: [require.resolve('./apis')],
     servers: xPackAPITestsConfig.get('servers'),
-    services: {
-      es: xPackAPITestsConfig.get('services.es'),
-      esSupertest: xPackAPITestsConfig.get('services.esSupertest'),
-      supertestWithoutAuth: xPackAPITestsConfig.get('services.supertestWithoutAuth'),
-    },
+    services,
     junit: {
       reportName: 'X-Pack Kerberos API Integration Tests',
     },
diff --git a/x-pack/test/kerberos_api_integration/ftr_provider_context.d.ts b/x-pack/test/kerberos_api_integration/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..e3add3748f56d
--- /dev/null
+++ b/x-pack/test/kerberos_api_integration/ftr_provider_context.d.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 { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
diff --git a/x-pack/test/kerberos_api_integration/services.ts b/x-pack/test/kerberos_api_integration/services.ts
new file mode 100644
index 0000000000000..42505994e0602
--- /dev/null
+++ b/x-pack/test/kerberos_api_integration/services.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { services as apiIntegrationServices } from '../api_integration/services';
+
+export const services = {
+  es: apiIntegrationServices.es,
+  esSupertest: apiIntegrationServices.esSupertest,
+  supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,
+};
diff --git a/x-pack/test/types/mocha_decorations.d.ts b/x-pack/test/mocha_decorations.d.ts
similarity index 100%
rename from x-pack/test/types/mocha_decorations.d.ts
rename to x-pack/test/mocha_decorations.d.ts
diff --git a/x-pack/test/plugin_api_integration/config.js b/x-pack/test/plugin_api_integration/config.js
index 0fb38f5a5bb6f..1097cc3ab56aa 100644
--- a/x-pack/test/plugin_api_integration/config.js
+++ b/x-pack/test/plugin_api_integration/config.js
@@ -6,10 +6,10 @@
 
 import path from 'path';
 import fs from 'fs';
+import { services } from './services';
 
 export default async function ({ readConfigFile }) {
   const integrationConfig = await readConfigFile(require.resolve('../api_integration/config'));
-  const kibanaFunctionalConfig = await readConfigFile(require.resolve('../../../test/functional/config.js'));
 
   // Find all folders in ./plugins since we treat all them as plugin folder
   const allFiles = fs.readdirSync(path.resolve(__dirname, 'plugins'));
@@ -20,11 +20,7 @@ export default async function ({ readConfigFile }) {
       require.resolve('./test_suites/task_manager'),
       require.resolve('./test_suites/encrypted_saved_objects'),
     ],
-    services: {
-      retry: kibanaFunctionalConfig.get('services.retry'),
-      ...integrationConfig.get('services'),
-    },
-    pageObjects: integrationConfig.get('pageObjects'),
+    services,
     servers: integrationConfig.get('servers'),
     esTestCluster: integrationConfig.get('esTestCluster'),
     apps: integrationConfig.get('apps'),
diff --git a/x-pack/test/plugin_api_integration/ftr_provider_context.d.ts b/x-pack/test/plugin_api_integration/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..e3add3748f56d
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/ftr_provider_context.d.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 { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metadata/index.ts b/x-pack/test/plugin_api_integration/services.ts
similarity index 81%
rename from x-pack/legacy/plugins/infra/server/lib/adapters/metadata/index.ts
rename to x-pack/test/plugin_api_integration/services.ts
index 4e09b5d0e9e2d..b7398349cce5d 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/metadata/index.ts
+++ b/x-pack/test/plugin_api_integration/services.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './adapter_types';
+export { services } from '../api_integration/services';
diff --git a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
index 40563f5c068c3..e984d2bbcb8bb 100644
--- a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 import { SavedObject } from 'src/core/server';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function({ getService }: FtrProviderContext) {
   const es = getService('es');
   const chance = getService('chance');
   const supertest = getService('supertest');
diff --git a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts
index ec985711ad90d..834e0225d0fb6 100644
--- a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: KibanaFunctionalTestDefaultProviders) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('encrypted_saved_objects', function encryptedSavedObjectsSuite() {
     this.tags('ciGroup2');
     loadTestFile(require.resolve('./encrypted_saved_objects_api'));
diff --git a/x-pack/test/saved_object_api_integration/common/config.ts b/x-pack/test/saved_object_api_integration/common/config.ts
index 8c2a99b975011..dda7934ce875a 100644
--- a/x-pack/test/saved_object_api_integration/common/config.ts
+++ b/x-pack/test/saved_object_api_integration/common/config.ts
@@ -6,10 +6,9 @@
 
 // @ts-ignore
 import { resolveKibanaPath } from '@kbn/plugin-helpers';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
 import path from 'path';
-import { TestInvoker } from './lib/types';
-// @ts-ignore
-import { EsProvider } from './services/es';
+import { services } from './services';
 
 interface CreateTestConfigOptions {
   license: string;
@@ -19,7 +18,7 @@ interface CreateTestConfigOptions {
 export function createTestConfig(name: string, options: CreateTestConfigOptions) {
   const { license = 'trial', disabledPlugins = [] } = options;
 
-  return async ({ readConfigFile }: TestInvoker) => {
+  return async ({ readConfigFile }: FtrConfigProviderContext) => {
     const config = {
       kibana: {
         api: await readConfigFile(resolveKibanaPath('test/api_integration/config.js')),
@@ -33,14 +32,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     return {
       testFiles: [require.resolve(`../${name}/apis/`)],
       servers: config.xpack.api.get('servers'),
-      services: {
-        es: EsProvider,
-        esSupertestWithoutAuth: config.xpack.api.get('services.esSupertestWithoutAuth'),
-        supertest: config.kibana.api.get('services.supertest'),
-        supertestWithoutAuth: config.xpack.api.get('services.supertestWithoutAuth'),
-        esArchiver: config.kibana.functional.get('services.esArchiver'),
-        kibanaServer: config.kibana.functional.get('services.kibanaServer'),
-      },
+      services,
       junit: {
         reportName: 'X-Pack Saved Object API Integration Tests -- ' + name,
       },
diff --git a/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.ts b/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..e3add3748f56d
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.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 { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
diff --git a/x-pack/test/saved_object_api_integration/common/lib/types.ts b/x-pack/test/saved_object_api_integration/common/lib/types.ts
index fc6d3d8745fb9..487afff1494c0 100644
--- a/x-pack/test/saved_object_api_integration/common/lib/types.ts
+++ b/x-pack/test/saved_object_api_integration/common/lib/types.ts
@@ -10,15 +10,3 @@ export interface TestDefinitionAuthentication {
   username?: string;
   password?: string;
 }
-
-export type LoadTestFileFn = (path: string) => string;
-
-export type GetServiceFn = (service: string) => any;
-
-export type ReadConfigFileFn = (path: string) => any;
-
-export interface TestInvoker {
-  getService: GetServiceFn;
-  loadTestFile: LoadTestFileFn;
-  readConfigFile: ReadConfigFileFn;
-}
diff --git a/x-pack/test/saved_object_api_integration/common/services/index.ts b/x-pack/test/saved_object_api_integration/common/services/index.ts
new file mode 100644
index 0000000000000..7c201af3ef469
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/services/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// @ts-ignore not ts yet
+import { EsProvider } from './es';
+
+import { services as apiIntegrationServices } from '../../../api_integration/services';
+import { services as kibanaApiIntegrationServices } from '../../../../../test/api_integration/services';
+import { services as kibanaFunctionalServices } from '../../../../../test/functional/services';
+
+export const services = {
+  es: EsProvider,
+  esSupertestWithoutAuth: apiIntegrationServices.esSupertestWithoutAuth,
+  supertest: kibanaApiIntegrationServices.supertest,
+  supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,
+  esArchiver: kibanaFunctionalServices.esArchiver,
+  kibanaServer: kibanaFunctionalServices.kibanaServer,
+};
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
index 74a333151ced1..7e00d0a9d7f75 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts
index 41651e4ea744e..ec5bce1707569 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts
index a4013c8faf0f5..4cc94bf21f235 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createTestSuiteFactory } from '../../common/suites/create';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const es = getService('es');
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts
index 2507161cf787c..bfd2112428db4 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteTestSuiteFactory } from '../../common/suites/delete';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
index 50dd1dabbd2d2..b64c3ed87c35d 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { exportTestSuiteFactory } from '../../common/suites/export';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts
index 6a1a60ba83e36..92e6ec850dc0e 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { findTestSuiteFactory } from '../../common/suites/find';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts
index e913ec064037c..9667abcc5e57a 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { getTestSuiteFactory } from '../../common/suites/get';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
index d336f65469ef4..f9048d1493cc6 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { importTestSuiteFactory } from '../../common/suites/import';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts
index f95ce1749e45c..3aba796075cd6 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts
@@ -5,10 +5,9 @@
  */
 
 import { createUsersAndRoles } from '../../common/lib/create_users_and_roles';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService, loadTestFile }: TestInvoker) {
+export default function({ getService, loadTestFile }: FtrProviderContext) {
   const es = getService('es');
   const supertest = getService('supertest');
 
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
index 1ff7414b702f9..fa070ac76ce57 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts
index 13bc58ac00274..8eb06e41e2a41 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts
@@ -6,11 +6,10 @@
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { updateTestSuiteFactory } from '../../common/suites/update';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
index 9f6087b9a5699..2a5757fb0cc57 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts
index 11b9ec6fc53af..fde98694fe575 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/create.ts b/x-pack/test/saved_object_api_integration/security_only/apis/create.ts
index f80d0ef851629..bb2bf7e0e0d7a 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/create.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/create.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createTestSuiteFactory } from '../../common/suites/create';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const es = getService('es');
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts b/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts
index 79765b37fd806..f775b5a365d6b 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteTestSuiteFactory } from '../../common/suites/delete';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/export.ts b/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
index f6e1d033218d7..2a2c3a9b90b08 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { exportTestSuiteFactory } from '../../common/suites/export';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/find.ts b/x-pack/test/saved_object_api_integration/security_only/apis/find.ts
index 3d14f7b945a2b..d17dbe6e7b1ed 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/find.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/find.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { findTestSuiteFactory } from '../../common/suites/find';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/get.ts b/x-pack/test/saved_object_api_integration/security_only/apis/get.ts
index 91c9f7cb5cf8e..2a31463fce8b2 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/get.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/get.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { getTestSuiteFactory } from '../../common/suites/get';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/import.ts b/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
index c988b4d006ac7..8ad7e070edf54 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { importTestSuiteFactory } from '../../common/suites/import';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/index.ts b/x-pack/test/saved_object_api_integration/security_only/apis/index.ts
index f08c996d4fd67..fadefd2743b30 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/index.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/index.ts
@@ -5,10 +5,9 @@
  */
 
 import { createUsersAndRoles } from '../../common/lib/create_users_and_roles';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService, loadTestFile }: TestInvoker) {
+export default function({ getService, loadTestFile }: FtrProviderContext) {
   const es = getService('es');
   const supertest = getService('supertest');
 
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
index 08b7a15c292b7..e1d72f8641e93 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/update.ts b/x-pack/test/saved_object_api_integration/security_only/apis/update.ts
index d98c8ae1ef5ee..8564296bdf558 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/update.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/update.ts
@@ -5,11 +5,10 @@
  */
 
 import { AUTHENTICATION } from '../../common/lib/authentication';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { updateTestSuiteFactory } from '../../common/suites/update';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
index 5a1afd28d10f8..6b67c63ed349a 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create';
 
 const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => {
@@ -22,8 +22,7 @@ const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => {
   });
 };
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts
index bbe86109d981b..bed29f8eb39a1 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts
@@ -5,11 +5,10 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts
index edba7ca45f564..d6bd0b497759f 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createTestSuiteFactory } from '../../common/suites/create';
 
 const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => {
@@ -21,8 +21,7 @@ const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => {
   });
 };
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const es = getService('es');
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts
index cb08d5c12aa23..437b3f95024c6 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts
@@ -5,11 +5,10 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteTestSuiteFactory } from '../../common/suites/delete';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts
index 5149888424f17..f4be02c05ac88 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts
@@ -5,11 +5,10 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { exportTestSuiteFactory } from '../../common/suites/export';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts
index 7a9e459ade652..69a2690c61978 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts
@@ -5,11 +5,10 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { findTestSuiteFactory } from '../../common/suites/find';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts
index bd1c3d03a2d31..592bedd92b4d7 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts
@@ -5,11 +5,10 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { getTestSuiteFactory } from '../../common/suites/get';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
index 1e905fee86664..c8b2e68291dc3 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
@@ -5,11 +5,10 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { importTestSuiteFactory } from '../../common/suites/import';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts
index d1f46db0a5f9d..86bc886c81e98 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ loadTestFile }: TestInvoker) {
+export default function({ loadTestFile }: FtrProviderContext) {
   describe('saved objects spaces only enabled', function() {
     this.tags('ciGroup5');
 
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
index e500f555725b0..93d60ebbf4d6d 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
@@ -5,11 +5,10 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts
index bc53c5a0ba7db..6ffbda511d871 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts
@@ -5,11 +5,10 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
-import { TestInvoker } from '../../common/lib/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { updateTestSuiteFactory } from '../../common/suites/update';
 
-// eslint-disable-next-line import/no-default-export
-export default function({ getService }: TestInvoker) {
+export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/types/providers.ts b/x-pack/test/types/providers.ts
deleted file mode 100644
index 34a4fc95f0bc5..0000000000000
--- a/x-pack/test/types/providers.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EsArchiver } from '../../../src/es_archiver';
-import { InfraLogStreamProvider } from '../functional/services/infra_log_stream';
-import { InfraSourceConfigurationFlyoutProvider } from '../functional/services/infra_source_configuration_flyout';
-import { UptimeProvider } from '../functional/services/uptime';
-
-export interface KibanaFunctionalTestDefaultProviders {
-  getService(serviceName: 'esArchiver'): EsArchiver;
-  getService(serviceName: 'infraLogStream'): ReturnType<typeof InfraLogStreamProvider>;
-  getService(
-    serviceName: 'infraSourceConfigurationFlyout'
-  ): ReturnType<typeof InfraSourceConfigurationFlyoutProvider>;
-  getService(serviceName: 'uptime'): ReturnType<typeof UptimeProvider>;
-  getService(serviceName: string): any;
-  getPageObjects(pageObjectNames: string[]): any;
-  loadTestFile(path: string): void;
-  readConfigFile(path: string): any;
-}
diff --git a/x-pack/test/ui_capabilities/common/config.ts b/x-pack/test/ui_capabilities/common/config.ts
index bf770579ca1bd..653aebb91fa8d 100644
--- a/x-pack/test/ui_capabilities/common/config.ts
+++ b/x-pack/test/ui_capabilities/common/config.ts
@@ -5,9 +5,9 @@
  */
 
 import path from 'path';
-import { SecurityServiceProvider, SpacesServiceProvider } from '../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../types/providers';
-import { FeaturesProvider, UICapabilitiesProvider } from './services';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+
+import { services } from './services';
 
 interface CreateTestConfigOptions {
   license: string;
@@ -18,7 +18,7 @@ interface CreateTestConfigOptions {
 export function createTestConfig(name: string, options: CreateTestConfigOptions) {
   const { license = 'trial', disabledPlugins = [] } = options;
 
-  return async ({ readConfigFile }: KibanaFunctionalTestDefaultProviders) => {
+  return async ({ readConfigFile }: FtrConfigProviderContext) => {
     const xPackFunctionalTestsConfig = await readConfigFile(
       require.resolve('../../functional/config.js')
     );
@@ -26,12 +26,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     return {
       testFiles: [require.resolve(`../${name}/tests/`)],
       servers: xPackFunctionalTestsConfig.get('servers'),
-      services: {
-        security: SecurityServiceProvider,
-        spaces: SpacesServiceProvider,
-        uiCapabilities: UICapabilitiesProvider,
-        features: FeaturesProvider,
-      },
+      services,
       junit: {
         reportName: 'X-Pack UI Capabilities Functional Tests',
       },
diff --git a/x-pack/test/ui_capabilities/common/ftr_provider_context.d.ts b/x-pack/test/ui_capabilities/common/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..e3add3748f56d
--- /dev/null
+++ b/x-pack/test/ui_capabilities/common/ftr_provider_context.d.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 { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
diff --git a/x-pack/test/ui_capabilities/common/services/features.ts b/x-pack/test/ui_capabilities/common/services/features.ts
index 571dd901f1c06..774cb59292d3b 100644
--- a/x-pack/test/ui_capabilities/common/services/features.ts
+++ b/x-pack/test/ui_capabilities/common/services/features.ts
@@ -6,14 +6,14 @@
 import axios, { AxiosInstance } from 'axios';
 import { format as formatUrl } from 'url';
 import util from 'util';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
-import { LogService } from '../../../types/services';
+import { ToolingLog } from '@kbn/dev-utils';
+import { FtrProviderContext } from '../ftr_provider_context';
 import { Features } from '../features';
 
 export class FeaturesService {
   private readonly axios: AxiosInstance;
 
-  constructor(url: string, private readonly log: LogService) {
+  constructor(url: string, private readonly log: ToolingLog) {
     this.axios = axios.create({
       headers: { 'kbn-xsrf': 'x-pack/ftr/services/features' },
       baseURL: url,
@@ -47,7 +47,7 @@ export class FeaturesService {
   }
 }
 
-export function FeaturesProvider({ getService }: KibanaFunctionalTestDefaultProviders) {
+export function FeaturesProvider({ getService }: FtrProviderContext) {
   const log = getService('log');
   const config = getService('config');
   const url = formatUrl(config.get('servers.kibana'));
diff --git a/x-pack/test/ui_capabilities/common/services/index.ts b/x-pack/test/ui_capabilities/common/services/index.ts
index 9fe948d509eed..2c36d8a4e2980 100644
--- a/x-pack/test/ui_capabilities/common/services/index.ts
+++ b/x-pack/test/ui_capabilities/common/services/index.ts
@@ -4,5 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { FeaturesProvider, FeaturesService } from './features';
-export { UICapabilitiesProvider } from './ui_capabilities';
+import { FeaturesProvider } from './features';
+import { UICapabilitiesProvider } from './ui_capabilities';
+import { SecurityServiceProvider, SpacesServiceProvider } from '../../../common/services';
+
+export const services = {
+  security: SecurityServiceProvider,
+  spaces: SpacesServiceProvider,
+  uiCapabilities: UICapabilitiesProvider,
+  features: FeaturesProvider,
+};
+
+export { FeaturesService } from './features';
diff --git a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
index 3b843672acfdc..c38bc13684e3d 100644
--- a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
+++ b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
@@ -8,8 +8,8 @@ import cheerio from 'cheerio';
 import { UICapabilities } from 'ui/capabilities';
 import { format as formatUrl } from 'url';
 import util from 'util';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
-import { LogService } from '../../../types/services';
+import { ToolingLog } from '@kbn/dev-utils';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export interface BasicCredentials {
   username: string;
@@ -28,10 +28,10 @@ interface GetUICapabilitiesResult {
 }
 
 export class UICapabilitiesService {
-  private readonly log: LogService;
+  private readonly log: ToolingLog;
   private readonly axios: AxiosInstance;
 
-  constructor(url: string, log: LogService) {
+  constructor(url: string, log: ToolingLog) {
     this.log = log;
     this.axios = axios.create({
       headers: { 'kbn-xsrf': 'x-pack/ftr/services/ui_capabilities' },
@@ -105,7 +105,7 @@ export class UICapabilitiesService {
   }
 }
 
-export function UICapabilitiesProvider({ getService }: KibanaFunctionalTestDefaultProviders) {
+export function UICapabilitiesProvider({ getService }: FtrProviderContext) {
   const log = getService('log');
   const config = getService('config');
   const noAuthUrl = formatUrl({
diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts
index 8c87914b70973..ca27a3401cdf7 100644
--- a/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts
+++ b/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts
@@ -6,15 +6,14 @@
 
 import expect from '@kbn/expect';
 import { mapValues } from 'lodash';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   GetUICapabilitiesFailureReason,
   UICapabilitiesService,
 } from '../../common/services/ui_capabilities';
 import { UserAtSpaceScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function catalogueTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function catalogueTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
 
   describe('catalogue', () => {
diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/foo.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/foo.ts
index 3c52d873ca845..cd96a2192f335 100644
--- a/x-pack/test/ui_capabilities/security_and_spaces/tests/foo.ts
+++ b/x-pack/test/ui_capabilities/security_and_spaces/tests/foo.ts
@@ -5,15 +5,14 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   GetUICapabilitiesFailureReason,
   UICapabilitiesService,
 } from '../../common/services/ui_capabilities';
 import { UserAtSpaceScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function fooTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function fooTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
 
   describe('foo', () => {
diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts
index 0ba3cba6fbc50..e28ea819bfdfc 100644
--- a/x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts
+++ b/x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts
@@ -6,16 +6,12 @@
 
 import { SpacesService } from '../../../common/services';
 import { SecurityService } from '../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { FeaturesService } from '../../common/services';
 import { isCustomRoleSpecification } from '../../common/types';
 import { Spaces, Users } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function uiCapabilitiesTests({
-  loadTestFile,
-  getService,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function uiCapabilitiesTests({ loadTestFile, getService }: FtrProviderContext) {
   const securityService: SecurityService = getService('security');
   const spacesService: SpacesService = getService('spaces');
   const featuresService: FeaturesService = getService('features');
diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/nav_links.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/nav_links.ts
index 5be32e46bb03a..9b54a1b9c925d 100644
--- a/x-pack/test/ui_capabilities/security_and_spaces/tests/nav_links.ts
+++ b/x-pack/test/ui_capabilities/security_and_spaces/tests/nav_links.ts
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { NavLinksBuilder } from '../../common/nav_links_builder';
 import { FeaturesService } from '../../common/services';
 import {
@@ -14,8 +14,7 @@ import {
 } from '../../common/services/ui_capabilities';
 import { UserAtSpaceScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function navLinksTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function navLinksTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
   const featuresService: FeaturesService = getService('features');
 
diff --git a/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts b/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts
index 9c1bf8bf0fc57..9a46820e87f3a 100644
--- a/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts
+++ b/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts
@@ -6,15 +6,14 @@
 
 import expect from '@kbn/expect';
 import { mapValues } from 'lodash';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   GetUICapabilitiesFailureReason,
   UICapabilitiesService,
 } from '../../common/services/ui_capabilities';
 import { UserScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function catalogueTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function catalogueTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
 
   describe('catalogue', () => {
diff --git a/x-pack/test/ui_capabilities/security_only/tests/foo.ts b/x-pack/test/ui_capabilities/security_only/tests/foo.ts
index f36e856e8cd47..a2a663921e6ea 100644
--- a/x-pack/test/ui_capabilities/security_only/tests/foo.ts
+++ b/x-pack/test/ui_capabilities/security_only/tests/foo.ts
@@ -5,15 +5,14 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   GetUICapabilitiesFailureReason,
   UICapabilitiesService,
 } from '../../common/services/ui_capabilities';
 import { UserScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function fooTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function fooTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
 
   describe('foo', () => {
diff --git a/x-pack/test/ui_capabilities/security_only/tests/index.ts b/x-pack/test/ui_capabilities/security_only/tests/index.ts
index d58ae1ef3786f..b84c02f9d65c0 100644
--- a/x-pack/test/ui_capabilities/security_only/tests/index.ts
+++ b/x-pack/test/ui_capabilities/security_only/tests/index.ts
@@ -5,15 +5,11 @@
  */
 
 import { SecurityService } from '../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { isCustomRoleSpecification } from '../../common/types';
 import { UserScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function uiCapabilitesTests({
-  loadTestFile,
-  getService,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function uiCapabilitesTests({ loadTestFile, getService }: FtrProviderContext) {
   const securityService: SecurityService = getService('security');
 
   describe('ui capabilities', function() {
diff --git a/x-pack/test/ui_capabilities/security_only/tests/nav_links.ts b/x-pack/test/ui_capabilities/security_only/tests/nav_links.ts
index 3e2b3a809d73b..f643753a5c37c 100644
--- a/x-pack/test/ui_capabilities/security_only/tests/nav_links.ts
+++ b/x-pack/test/ui_capabilities/security_only/tests/nav_links.ts
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { NavLinksBuilder } from '../../common/nav_links_builder';
 import { FeaturesService } from '../../common/services';
 import {
@@ -14,8 +14,7 @@ import {
 } from '../../common/services/ui_capabilities';
 import { UserScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function navLinksTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function navLinksTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
   const featuresService: FeaturesService = getService('features');
 
diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts b/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts
index d6a42c2b1a291..1625891e1732e 100644
--- a/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts
+++ b/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts
@@ -6,12 +6,11 @@
 
 import expect from '@kbn/expect';
 import { mapValues } from 'lodash';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { UICapabilitiesService } from '../../common/services/ui_capabilities';
 import { SpaceScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function catalogueTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function catalogueTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
 
   describe('catalogue', () => {
diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/foo.ts b/x-pack/test/ui_capabilities/spaces_only/tests/foo.ts
index 2465ab9308baf..2efd56c7d0f6d 100644
--- a/x-pack/test/ui_capabilities/spaces_only/tests/foo.ts
+++ b/x-pack/test/ui_capabilities/spaces_only/tests/foo.ts
@@ -5,12 +5,11 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { UICapabilitiesService } from '../../common/services/ui_capabilities';
 import { SpaceScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function fooTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function fooTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
 
   describe('foo', () => {
diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/index.ts b/x-pack/test/ui_capabilities/spaces_only/tests/index.ts
index fd54528fa61bc..294f545c7d90f 100644
--- a/x-pack/test/ui_capabilities/spaces_only/tests/index.ts
+++ b/x-pack/test/ui_capabilities/spaces_only/tests/index.ts
@@ -5,15 +5,11 @@
  */
 
 import { SpacesService } from '../../../common/services';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { FeaturesService } from '../../common/services';
 import { SpaceScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function uiCapabilitesTests({
-  loadTestFile,
-  getService,
-}: KibanaFunctionalTestDefaultProviders) {
+export default function uiCapabilitesTests({ loadTestFile, getService }: FtrProviderContext) {
   const spacesService: SpacesService = getService('spaces');
   const featuresService: FeaturesService = getService('features');
 
diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts b/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts
index fe08c6960da90..8be7c914b6529 100644
--- a/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts
+++ b/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts
@@ -5,14 +5,13 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { NavLinksBuilder } from '../../common/nav_links_builder';
 import { FeaturesService } from '../../common/services';
 import { UICapabilitiesService } from '../../common/services/ui_capabilities';
 import { SpaceScenarios } from '../scenarios';
 
-// eslint-disable-next-line import/no-default-export
-export default function navLinksTests({ getService }: KibanaFunctionalTestDefaultProviders) {
+export default function navLinksTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
   const featuresService: FeaturesService = getService('features');
 
diff --git a/yarn.lock b/yarn.lock
index 15b0b911e8c63..a09430e3057f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1659,10 +1659,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@13.0.0":
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-13.0.0.tgz#bead6830cff58a2cc617e9e9f1d344768bdd7004"
-  integrity sha512-nU/kgp6c4cH5IdcgD3XXEh0Gkbzf4byacJN62oYr1UGTWC0RT8N09FAQzDFIEGz+lDWTSLhap9RWPH3Kgy+O/A==
+"@elastic/eui@13.1.1":
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-13.1.1.tgz#35ff2bdb4f38b12a2a82108d9b10ba5949eef3a9"
+  integrity sha512-yPqxQYWSIEO4nhgWDHY48Ty9eUD1xLYogKUPXzla3OESOj8vqYLD/fCYX4M3s32NZgLzjvy8AaFiCNsZ3SF6yw==
   dependencies:
     "@types/lodash" "^4.14.116"
     "@types/numeral" "^0.0.25"