diff --git a/.eslintrc.js b/.eslintrc.js
index 03a674993ab507..55ae66c9e5e6aa 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -177,12 +177,6 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/monitoring/**/*.{js,ts,tsx}'],
-      rules: {
-        'jsx-a11y/click-events-have-key-events': 'off',
-      },
-    },
     {
       files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,ts,tsx}'],
       rules: {
@@ -729,15 +723,13 @@ module.exports = {
         'no-unreachable': 'error',
         'no-unsafe-finally': 'error',
         'no-useless-call': 'error',
-        // This will be turned on after bug fixes are mostly complete
-        // 'no-useless-catch': 'warn',
+        'no-useless-catch': 'error',
         'no-useless-concat': 'error',
         'no-useless-computed-key': 'error',
         // This will be turned on after bug fixes are mostly complete
         // 'no-useless-escape': 'warn',
         'no-useless-rename': 'error',
-        // This will be turned on after bug fixes are mostly complete
-        // 'no-useless-return': 'warn',
+        'no-useless-return': 'error',
         // This will be turned on after bug fixers are mostly complete
         // 'no-void': 'warn',
         'one-var-declaration-per-line': 'error',
@@ -751,8 +743,7 @@ module.exports = {
         'react/button-has-type': 'error',
         'react/forbid-dom-props': 'error',
         'react/no-access-state-in-setstate': 'error',
-        // This style will be turned on after most bugs are fixed
-        // 'react/no-children-prop': 'warn',
+        'react/no-children-prop': 'error',
         'react/no-danger-with-children': 'error',
         'react/no-deprecated': 'error',
         'react/no-did-mount-set-state': 'error',
@@ -814,21 +805,6 @@ module.exports = {
       },
     },
 
-    /**
-     * Monitoring overrides
-     */
-    {
-      files: ['x-pack/legacy/plugins/monitoring/**/*.js'],
-      rules: {
-        'no-unused-vars': ['error', { args: 'all', argsIgnorePattern: '^_' }],
-        'no-else-return': 'error',
-      },
-    },
-    {
-      files: ['x-pack/legacy/plugins/monitoring/public/**/*.js'],
-      env: { browser: true },
-    },
-
     /**
      * Canvas overrides
      */
diff --git a/docs/user/reporting/images/shareable-container.png b/docs/user/reporting/images/shareable-container.png
new file mode 100644
index 00000000000000..db5a41dcff471c
Binary files /dev/null and b/docs/user/reporting/images/shareable-container.png differ
diff --git a/docs/user/reporting/index.asciidoc b/docs/user/reporting/index.asciidoc
index 06af9e60384455..fde88130a26b44 100644
--- a/docs/user/reporting/index.asciidoc
+++ b/docs/user/reporting/index.asciidoc
@@ -6,11 +6,11 @@
 
 --
 
-You can generate a report that contains a {kib} dashboard, visualization, 
-saved search, or Canvas workpad. Depending on the object type, you can export the data as 
+You can generate a report that contains a {kib} dashboard, visualization,
+saved search, or Canvas workpad. Depending on the object type, you can export the data as
 a PDF, PNG, or CSV document, which you can keep for yourself, or share with others.
 
-Reporting is available from the *Share* menu 
+Reporting is available from the *Share* menu
 in *Discover*, *Visualize*, *Dashboard*, and *Canvas*.
 
 [role="screenshot"]
@@ -40,9 +40,9 @@ for an example.
 [[manually-generate-reports]]
 == Generate a report manually
 
-. Open the dashboard, visualization, Canvas workpad, or saved search that you want to include in the report. 
+. Open the dashboard, visualization, Canvas workpad, or saved search that you want to include in the report.
 
-. In the {kib} toolbar, click *Share*.  If you are working in Canvas, 
+. In the {kib} toolbar, click *Share*.  If you are working in Canvas,
 click the share icon image:user/reporting/images/canvas-share-button.png["Canvas Share button"].
 
 . Select the option appropriate for your object. You can export:
@@ -55,14 +55,36 @@ click the share icon image:user/reporting/images/canvas-share-button.png["Canvas
 +
 A notification appears when the report is complete.
 
+[float]
+[[reporting-layout-sizing]]
+== Layout and sizing
+The layout and size of the PDF or PNG image depends on the {kib} app
+with which the Reporting plugin is integrated. For Canvas, the
+worksheet dimensions determine the size for Reporting. In other apps,
+the dimensions are taken on the fly by looking at
+the size of the visualization elements or panels on the page.
+
+The size dimensions are part of the reporting job parameters. Therefore, to
+make the report output larger or smaller, you can change the size of the browser.
+This resizes the shareable container before generating the
+report, so the desired dimensions are passed in the job parameters.
+
+In the following {kib} dashboard, the shareable container is highlighted.
+The shareable container is captured when you click the
+*Generate* or *Copy POST URL* button. It might take some trial and error
+before you're satisfied with the layout and dimensions in the resulting
+PNG or PDF image.
+
+[role="screenshot"]
+image::user/reporting/images/shareable-container.png["Shareable Container"]
+
+
+
 [float]
 [[optimize-pdf]]
 == Optimize PDF for print—dashboard only
 
-By default, {kib} creates a PDF  
-using the existing layout and size of the dashboard. To create a 
-printer-friendly PDF with multiple A4 portrait pages and two visualizations 
-per page, turn on *Optimize for printing*.
+To create a printer-friendly PDF with multiple A4 portrait pages and two visualizations per page, turn on *Optimize for printing*.
 
 [role="screenshot"]
 image::user/reporting/images/preserve-layout-switch.png["Share"]
@@ -72,8 +94,8 @@ image::user/reporting/images/preserve-layout-switch.png["Share"]
 [[manage-report-history]]
 == View and manage report history
 
-For a list of your reports, go to *Management > Reporting*.  
-From this view, you can monitor the generation of a report and 
+For a list of your reports, go to *Management > Reporting*.
+From this view, you can monitor the generation of a report and
 download reports that you previously generated.
 
 [float]
diff --git a/docs/user/reporting/reporting-troubleshooting.asciidoc b/docs/user/reporting/reporting-troubleshooting.asciidoc
index ca7fa6abcc9d9c..dc4ffdfebdae9b 100644
--- a/docs/user/reporting/reporting-troubleshooting.asciidoc
+++ b/docs/user/reporting/reporting-troubleshooting.asciidoc
@@ -7,12 +7,20 @@
 
 Having trouble? Here are solutions to common problems you might encounter while using Reporting.
 
+* <<reporting-troubleshooting-system-dependencies>>
+* <<reporting-troubleshooting-text-incorrect>>
+* <<reporting-troubleshooting-missing-data>>
+* <<reporting-troubleshooting-file-permissions>>
+* <<reporting-troubleshooting-error-messages>>
+* <<reporting-troubleshooting-puppeteer-debug-logs>>
+* <<reporting-troubleshooting-system-requirements>>
+
 [float]
 [[reporting-troubleshooting-system-dependencies]]
 === System dependencies
 Reporting launches a "headless" web browser called Chromium on the Kibana server. It is a custom build made by Elastic of an open source
 project, and it is intended to have minimal dependencies on OS libraries. However, the Kibana server OS might still require additional
-dependencies for Chromium.
+dependencies to run the Chromium executable.
 
 Make sure Kibana server OS has the appropriate packages installed for the distribution.
 
@@ -33,19 +41,30 @@ If you are using Ubuntu/Debian systems, install the following packages:
 * `fonts-liberation`
 * `libfontconfig1`
 
+If the system is missing dependencies, then Reporting will fail in a non-deterministic way. {kib} runs a self-test at server startup, and
+if it encounters errors, logs them in the Console. Unfortunately, the error message does not include
+information about why Chromium failed to run. The most common error message is `Error: connect ECONNREFUSED`, which indicates
+that {kib} could not connect to the Chromium process.
+
+To troubleshoot the problem, start the {kib} server with environment variables that tell Chromium to print verbose logs. See the
+<<reporting-troubleshooting-puppeteer-debug-logs, Puppeteer debug method>> for more information.
+
 [float]
-=== Text is rendered incorrectly in generated reports
+[[reporting-troubleshooting-text-incorrect]]
+=== Text rendered incorrectly in generated reports
 
 If a report label is rendered as an empty rectangle, no system fonts are available. Install at least one font package on the system.
 
 If the report is missing certain Chinese, Japanese or Korean characters, ensure that a system font with those characters is installed.
 
 [float]
+[[reporting-troubleshooting-missing-data]]
 === Missing data in PDF report of data table visualization
 There is currently a known limitation with the Data Table visualization that only the first page of data rows, which are the only data
 visible on the screen, are shown in PDF reports.
 
 [float]
+[[reporting-troubleshooting-file-permissions]]
 === File permissions
 Ensure that the `headless_shell` binary located in your Kibana data directory is owned by the user who is running Kibana, that the
 user has the execute permission, and if applicable, that the filesystem is mounted with the `exec` option.
@@ -63,25 +82,25 @@ Whenever possible, a Reporting error message tries to be as self-explanatory as
 along with the solution.
 
 [float]
-==== "Max attempts reached"
+==== Max attempts reached
 There are two primary causes of this error:
 
-. You're creating a PDF of a visualization or dashboard that spans a large amount of data and Kibana is hitting the `xpack.reporting.queue.timeout`
+* You're creating a PDF of a visualization or dashboard that spans a large amount of data and Kibana is hitting the `xpack.reporting.queue.timeout`
 
-. Kibana is hosted behind a reverse-proxy, and the <<reporting-kibana-server-settings, Kibana server settings>> are not configured correctly
+* Kibana is hosted behind a reverse-proxy, and the <<reporting-kibana-server-settings, Kibana server settings>> are not configured correctly
 
 Create a Markdown visualization and then create a PDF report. If this succeeds, increase the `xpack.reporting.queue.timeout` setting. If the
 PDF report fails with "Max attempts reached," check your <<reporting-kibana-server-settings, Kibana server settings>>.
 
 [float]
 [[reporting-troubleshooting-nss-dependency]]
-==== "You must install nss for Reporting to work"
+==== You must install nss for Reporting to work
 Reporting using the Chromium browser relies on the Network Security Service libraries (NSS). Install the appropriate nss package for your
 distribution.
 
 [float]
 [[reporting-troubleshooting-sandbox-dependency]]
-==== "Unable to use Chromium sandbox"
+==== Unable to use Chromium sandbox
 Chromium uses sandboxing techniques that are built on top of operating system primitives. The Linux sandbox depends on user namespaces,
 which were introduced with the 3.8 Linux kernel. However, many distributions don't have user namespaces enabled by default, or they require
 the CAP_SYS_ADMIN capability.
@@ -90,6 +109,7 @@ Elastic recommends that you research the feasibility of enabling unprivileged us
 is if you are running Kibana in Docker because the container runs in a user namespace with the built-in seccomp/bpf filters.
 
 [float]
+[[reporting-troubleshooting-verbose-logs]]
 === Verbose logs
 {kib} server logs have a lot of useful information for troubleshooting and understanding how things work. If you're having any issues at
 all, the full logs from Reporting will be the first place to look. In `kibana.yml`:
@@ -101,10 +121,12 @@ logging.verbose: true
 
 For more information about logging, see <<logging-verbose,Kibana configuration settings>>.
 
+[float]
+[[reporting-troubleshooting-puppeteer-debug-logs]]
 === Puppeteer debug logs
 The Chromium browser that {kib} launches on the server is driven by a NodeJS library for Chromium called Puppeteer. The Puppeteer library
 has its own command-line method to generate its own debug logs, which can sometimes be helpful, particularly to figure out if a problem is
-caused by Kibana or Chromium. See more at https://github.com/GoogleChrome/puppeteer/blob/v1.19.0/README.md#debugging-tips
+caused by Kibana or Chromium. See more at https://github.com/GoogleChrome/puppeteer/blob/v1.19.0/README.md#debugging-tips[debugging tips].
 
 Using Puppeteer's debug method when launching Kibana would look like:
 ```
@@ -114,3 +136,14 @@ The internal DevTools protocol traffic will be logged via the `debug` module und
 
 
 The Puppeteer logs are very verbose and could possibly contain sensitive information. Handle the generated output with care.
+
+[float]
+[[reporting-troubleshooting-system-requirements]]
+=== System requirements
+In Elastic Cloud, the {kib} instances that most configurations provide by default is for 1GB of RAM for the instance. That is enough for
+{kib} Reporting when the visualization or dashboard is relatively simple, such as a single pie chart or a dashboard with
+a few visualizations. However, certain visualization types incur more load than others. For example, a TSVB panel has a lot of network
+requests to render.
+
+If the {kib} instance doesn't have enough memory to run the report, the report fails with an error such as `Error: Page crashed!`
+In this case, try increasing the memory for the {kib} instance to 2GB.
diff --git a/docs/user/security/reporting.asciidoc b/docs/user/security/reporting.asciidoc
index 86599be9af3754..c2ed295e83ce95 100644
--- a/docs/user/security/reporting.asciidoc
+++ b/docs/user/security/reporting.asciidoc
@@ -57,6 +57,30 @@ that provides read and write privileges in
 Go to *Management > Users*, add a new user, and assign the user the built-in
 `reporting_user` role and your new custom role, `custom_reporting_user`.
 
+[float]
+==== With a custom index
+
+If you are using Reporting with a custom index,
+the `xpack.reporting.index` setting should begin 
+with `.reporting-*`. The default {kib} system user has
+`all` privileges against the `.reporting-*` pattern of indices.
+
+[source,js]
+xpack.reporting.index: '.reporting-custom-index'
+
+If you use a different pattern for the `xpack.reporting.index` setting,
+you must create a custom role with appropriate access to the index, similar
+to the following:
+
+. Go to *Management > Roles*, and click *Create role*.
+. Name the role `custom-reporting-user`.
+. Specify the custom index and assign it the `all` index privilege.
+. Go to *Management > Users* and create a new user with
+the `kibana_system` role and the `custom-reporting-user` role.
+. Configure {kib} to use the new account:
+[source,js]
+elasticsearch.username: 'custom_kibana_system'
+
 [float]
 [[reporting-roles-user-api]]
 ==== With the user API
diff --git a/packages/kbn-analytics/src/report.ts b/packages/kbn-analytics/src/report.ts
index 1c0b37966355fb..16c0a3069e5fdb 100644
--- a/packages/kbn-analytics/src/report.ts
+++ b/packages/kbn-analytics/src/report.ts
@@ -78,6 +78,7 @@ export class ReportManager {
   }
   assignReports(newMetrics: Metric | Metric[]) {
     wrapArray(newMetrics).forEach(newMetric => this.assignReport(this.report, newMetric));
+    return { report: this.report };
   }
   static createMetricKey(metric: Metric): string {
     switch (metric.type) {
@@ -101,7 +102,7 @@ export class ReportManager {
       case METRIC_TYPE.USER_AGENT: {
         const { appName, type, userAgent } = metric;
         if (userAgent) {
-          this.report.userAgent = {
+          report.userAgent = {
             [key]: {
               key,
               appName,
@@ -110,23 +111,22 @@ export class ReportManager {
             },
           };
         }
+
         return;
       }
       case METRIC_TYPE.CLICK:
       case METRIC_TYPE.LOADED:
       case METRIC_TYPE.COUNT: {
         const { appName, type, eventName, count } = metric;
-        if (report.uiStatsMetrics) {
-          const existingStats = (report.uiStatsMetrics[key] || {}).stats;
-          this.report.uiStatsMetrics = this.report.uiStatsMetrics || {};
-          this.report.uiStatsMetrics[key] = {
-            key,
-            appName,
-            eventName,
-            type,
-            stats: this.incrementStats(count, existingStats),
-          };
-        }
+        report.uiStatsMetrics = report.uiStatsMetrics || {};
+        const existingStats = (report.uiStatsMetrics[key] || {}).stats;
+        report.uiStatsMetrics[key] = {
+          key,
+          appName,
+          eventName,
+          type,
+          stats: this.incrementStats(count, existingStats),
+        };
         return;
       }
       default:
diff --git a/src/core/server/rendering/views/styles.tsx b/src/core/server/rendering/views/styles.tsx
index f41627bcfe07ff..dfcb4213d90f71 100644
--- a/src/core/server/rendering/views/styles.tsx
+++ b/src/core/server/rendering/views/styles.tsx
@@ -28,8 +28,6 @@ interface Props {
 }
 
 export const Styles: FunctionComponent<Props> = ({ darkMode }) => {
-  const themeBackground = darkMode ? '#25262e' : '#f5f7fa';
-
   return (
     <style
       dangerouslySetInnerHTML={{
@@ -42,11 +40,9 @@ export const Styles: FunctionComponent<Props> = ({ darkMode }) => {
             width: 100%;
             height: 100%;
             margin: 0;
-            background-color: ${themeBackground};
           }
 
           .kibanaWelcomeView {
-            background-color: ${themeBackground};
             height: 100%;
             display: -webkit-box;
             display: -webkit-flex;
diff --git a/src/legacy/core_plugins/console/public/kibana.json b/src/legacy/core_plugins/console/public/kibana.json
index 3363af353912ac..c58a5a90fb9f28 100644
--- a/src/legacy/core_plugins/console/public/kibana.json
+++ b/src/legacy/core_plugins/console/public/kibana.json
@@ -3,5 +3,6 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["home"]
+  "requiredPlugins": ["home"],
+  "optionalPlugins": ["usageCollection"]
 }
diff --git a/src/legacy/core_plugins/console/public/legacy.ts b/src/legacy/core_plugins/console/public/legacy.ts
index c456d777187aad..d151a27d27e5cc 100644
--- a/src/legacy/core_plugins/console/public/legacy.ts
+++ b/src/legacy/core_plugins/console/public/legacy.ts
@@ -22,7 +22,13 @@ import { I18nContext } from 'ui/i18n';
 import chrome from 'ui/chrome';
 import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
 
+import { plugin } from './np_ready';
+import { DevToolsSetup } from '../../../../plugins/dev_tools/public';
+import { HomePublicPluginSetup } from '../../../../plugins/home/public';
+import { UsageCollectionSetup } from '../../../../plugins/usage_collection/public';
+
 export interface XPluginSet {
+  usageCollection: UsageCollectionSetup;
   dev_tools: DevToolsSetup;
   home: HomePublicPluginSetup;
   __LEGACY: {
@@ -32,10 +38,6 @@ export interface XPluginSet {
   };
 }
 
-import { plugin } from './np_ready';
-import { DevToolsSetup } from '../../../../plugins/dev_tools/public';
-import { HomePublicPluginSetup } from '../../../../plugins/home/public';
-
 const pluginInstance = plugin({} as any);
 
 (async () => {
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
index 5df72c0f034966..0ee7998d331f59 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
@@ -22,6 +22,7 @@ jest.mock('../../../../contexts/editor_context/editor_registry.ts', () => ({
     setInputEditor: () => {},
     getInputEditor: () => ({
       getRequestsInRange: async () => [{ test: 'test' }],
+      getCoreEditor: () => ({ getCurrentPosition: jest.fn() }),
     }),
   },
 }));
@@ -52,3 +53,6 @@ jest.mock('../../../../models/sense_editor', () => {
 jest.mock('../../../../hooks/use_send_current_request_to_es/send_request_to_es', () => ({
   sendRequestToES: jest.fn(),
 }));
+jest.mock('../../../../../lib/autocomplete/get_endpoint_from_position', () => ({
+  getEndpointFromPosition: jest.fn(),
+}));
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx
index 6162397ce0650e..73ee6d160613f8 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx
@@ -32,14 +32,18 @@ import {
   ServicesContextProvider,
   EditorContextProvider,
   RequestContextProvider,
+  ContextValue,
 } from '../../../../contexts';
 
+// Mocked functions
 import { sendRequestToES } from '../../../../hooks/use_send_current_request_to_es/send_request_to_es';
+import { getEndpointFromPosition } from '../../../../../lib/autocomplete/get_endpoint_from_position';
+
 import * as consoleMenuActions from '../console_menu_actions';
 import { Editor } from './editor';
 
 describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
-  let mockedAppContextValue: any;
+  let mockedAppContextValue: ContextValue;
   const sandbox = sinon.createSandbox();
 
   const doMount = () =>
@@ -58,11 +62,15 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
   beforeEach(() => {
     document.queryCommandSupported = sinon.fake(() => true);
     mockedAppContextValue = {
+      elasticsearchUrl: 'test',
       services: {
+        trackUiMetric: { count: () => {}, load: () => {} },
+        settings: {} as any,
+        storage: {} as any,
         history: {
-          getSavedEditorState: () => null,
+          getSavedEditorState: () => ({} as any),
           updateCurrentState: jest.fn(),
-        },
+        } as any,
         notifications: notificationServiceMock.createSetupContract(),
       },
       docLinkVersion: 'NA',
@@ -70,10 +78,12 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
   });
 
   afterEach(() => {
+    jest.clearAllMocks();
     sandbox.restore();
   });
 
   it('calls send current request to ES', async () => {
+    (getEndpointFromPosition as jest.Mock).mockReturnValue({ patterns: [] });
     (sendRequestToES as jest.Mock).mockRejectedValue({});
     const editor = doMount();
     act(() => {
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts
index 797ff5744eec31..2bbe49cd53eace 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-// @ts-ignore
-import { getEndpointFromPosition } from '../../../../lib/autocomplete/autocomplete';
+import { getEndpointFromPosition } from '../../../../lib/autocomplete/get_endpoint_from_position';
 import { SenseEditor } from '../../../models/sense_editor';
 
 export async function autoIndent(editor: SenseEditor, event: Event) {
@@ -40,7 +39,7 @@ export function getDocumentation(
     }
     const position = requests[0].range.end;
     position.column = position.column - 1;
-    const endpoint = getEndpointFromPosition(editor, position, editor.parser);
+    const endpoint = getEndpointFromPosition(editor.getCoreEditor(), position, editor.parser);
     if (endpoint && endpoint.documentation && endpoint.documentation.indexOf('http') !== -1) {
       return endpoint.documentation
         .replace('/master/', `/${docLinkVersion}/`)
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts b/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts
index 18234acf15957a..e489bd50c9ce05 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-export { useServicesContext, ServicesContextProvider } from './services_context';
+export { useServicesContext, ServicesContextProvider, ContextValue } from './services_context';
 
 export {
   useRequestActionContext,
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx b/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx
index 77f0924a51842d..f14685ecd4ac74 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx
@@ -20,13 +20,15 @@
 import React, { createContext, useContext } from 'react';
 import { NotificationsSetup } from 'kibana/public';
 import { History, Storage, Settings } from '../../services';
+import { MetricsTracker } from '../../types';
 
-interface ContextValue {
+export interface ContextValue {
   services: {
     history: History;
     storage: Storage;
     settings: Settings;
     notifications: NotificationsSetup;
+    trackUiMetric: MetricsTracker;
   };
   elasticsearchUrl: string;
   docLinkVersion: string;
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
index 11c1f6638e9cf5..10dab65b61d44a 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
@@ -39,7 +39,8 @@ export interface ESRequestResult {
 }
 
 let CURRENT_REQ_ID = 0;
-export function sendRequestToES({ requests }: EsRequestArgs): Promise<ESRequestResult[]> {
+export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]> {
+  const requests = args.requests.slice();
   return new Promise((resolve, reject) => {
     const reqId = ++CURRENT_REQ_ID;
     const results: ESRequestResult[] = [];
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.ts b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.ts
new file mode 100644
index 00000000000000..4d993512c8fa72
--- /dev/null
+++ b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.ts
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SenseEditor } from '../../models/sense_editor';
+import { getEndpointFromPosition } from '../../../lib/autocomplete/get_endpoint_from_position';
+import { MetricsTracker } from '../../../types';
+
+export const track = (requests: any[], editor: SenseEditor, trackUiMetric: MetricsTracker) => {
+  const coreEditor = editor.getCoreEditor();
+  // `getEndpointFromPosition` gets values from the server-side generated JSON files which
+  // are a combination of JS, automatically generated JSON and manual overrides. That means
+  // the metrics reported from here will be tied to the definitions in those files.
+  // See src/legacy/core_plugins/console/server/api_server/spec
+  const endpointDescription = getEndpointFromPosition(
+    coreEditor,
+    coreEditor.getCurrentPosition(),
+    editor.parser
+  );
+
+  if (requests[0] && endpointDescription) {
+    const eventName = `${requests[0].method}_${endpointDescription.id ?? 'unknown'}`;
+    trackUiMetric.count(eventName);
+  }
+};
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
index b51c29f8e9db6c..6bf0b5024376bf 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
@@ -19,15 +19,16 @@
 import { i18n } from '@kbn/i18n';
 import { useCallback } from 'react';
 import { instance as registry } from '../../contexts/editor_context/editor_registry';
-import { useServicesContext } from '../../contexts';
+import { useRequestActionContext, useServicesContext } from '../../contexts';
 import { sendRequestToES } from './send_request_to_es';
-import { useRequestActionContext } from '../../contexts';
+import { track } from './track';
+
 // @ts-ignore
 import mappings from '../../../lib/mappings/mappings';
 
 export const useSendCurrentRequestToES = () => {
   const {
-    services: { history, settings, notifications },
+    services: { history, settings, notifications, trackUiMetric },
   } = useServicesContext();
 
   const dispatch = useRequestActionContext();
@@ -45,9 +46,10 @@ export const useSendCurrentRequestToES = () => {
         return;
       }
 
-      const results = await sendRequestToES({
-        requests,
-      });
+      // Fire and forget
+      setTimeout(() => track(requests, editor, trackUiMetric), 0);
+
+      const results = await sendRequestToES({ requests });
 
       results.forEach(({ request: { path, method, data } }) => {
         history.addToHistory(path, method, data);
@@ -82,5 +84,5 @@ export const useSendCurrentRequestToES = () => {
         });
       }
     }
-  }, [dispatch, settings, history, notifications]);
+  }, [dispatch, settings, history, notifications, trackUiMetric]);
 };
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/index.tsx b/src/legacy/core_plugins/console/public/np_ready/application/index.tsx
index 239e4320f00f8f..89756513b2b22c 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/index.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/index.tsx
@@ -22,6 +22,7 @@ import { NotificationsSetup } from 'kibana/public';
 import { ServicesContextProvider, EditorContextProvider, RequestContextProvider } from './contexts';
 import { Main } from './containers';
 import { createStorage, createHistory, createSettings, Settings } from '../services';
+import { createUsageTracker } from '../services/tracker';
 
 let settingsRef: Settings;
 export function legacyBackDoorToSettings() {
@@ -36,6 +37,9 @@ export function boot(deps: {
 }) {
   const { I18nContext, notifications, docLinkVersion, elasticsearchUrl } = deps;
 
+  const trackUiMetric = createUsageTracker();
+  trackUiMetric.load('opened_app');
+
   const storage = createStorage({
     engine: window.localStorage,
     prefix: 'sense:',
@@ -50,7 +54,13 @@ export function boot(deps: {
         value={{
           elasticsearchUrl,
           docLinkVersion,
-          services: { storage, history, settings, notifications },
+          services: {
+            storage,
+            history,
+            settings,
+            notifications,
+            trackUiMetric,
+          },
         }}
       >
         <RequestContextProvider>
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts b/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts
index 9310de2724fbef..f2102d75685fd4 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts
@@ -21,3 +21,4 @@ export * from './create';
 export * from '../legacy_core_editor/create_readonly';
 export { MODE } from '../../../lib/row_parser';
 export { SenseEditor } from './sense_editor';
+export { getEndpointFromPosition } from '../../../lib/autocomplete/get_endpoint_from_position';
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts
index 7520807ca77f58..ac8fa1ea48caae 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts
@@ -38,7 +38,6 @@ import { URL_PATH_END_MARKER } from './components/index';
 import { createTokenIterator } from '../../application/factories';
 
 import { Position, Token, Range, CoreEditor } from '../../types';
-import { SenseEditor } from '../../application/models/sense_editor';
 
 let LAST_EVALUATED_TOKEN: any = null;
 
@@ -54,11 +53,20 @@ function isUrlParamsToken(token: any) {
       return false;
   }
 }
-function getCurrentMethodAndTokenPaths(
+
+/**
+ * Get the method and token paths for a specific position in the current editor buffer.
+ *
+ * This function can be used for getting autocomplete information or for getting more information
+ * about the endpoint associated with autocomplete. In future, these concerns should be better
+ * separated.
+ *
+ */
+export function getCurrentMethodAndTokenPaths(
   editor: CoreEditor,
   pos: Position,
   parser: any,
-  forceEndOfUrl?: boolean
+  forceEndOfUrl?: boolean /* Flag for indicating whether we want to avoid early escape optimization. */
 ) {
   const tokenIter = createTokenIterator({
     editor,
@@ -186,7 +194,7 @@ function getCurrentMethodAndTokenPaths(
     }
   }
 
-  if (walkedSomeBody && (!bodyTokenPath || bodyTokenPath.length === 0)) {
+  if (walkedSomeBody && (!bodyTokenPath || bodyTokenPath.length === 0) && !forceEndOfUrl) {
     // we had some content and still no path -> the cursor is position after a closed body -> no auto complete
     return {};
   }
@@ -298,20 +306,6 @@ function getCurrentMethodAndTokenPaths(
   }
   return ret;
 }
-export function getEndpointFromPosition(senseEditor: SenseEditor, pos: Position, parser: any) {
-  const editor = senseEditor.getCoreEditor();
-  const context = {
-    ...getCurrentMethodAndTokenPaths(
-      editor,
-      { column: pos.column, lineNumber: pos.lineNumber },
-      parser,
-      true
-    ),
-  };
-  const components = getTopLevelUrlCompleteComponents(context.method);
-  populateContext(context.urlTokenPath, context, editor, true, components);
-  return context.endpoint;
-}
 
 // eslint-disable-next-line
 export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor; parser: any }) {
@@ -812,7 +806,6 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     if (!ret.urlTokenPath) {
       // zero length tokenPath is true
 
-      // console.log("Can't extract a valid url token path.");
       return context;
     }
 
@@ -825,13 +818,11 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     );
 
     if (!context.endpoint) {
-      // console.log("couldn't resolve an endpoint.");
       return context;
     }
 
     if (!ret.urlParamsTokenPath) {
       // zero length tokenPath is true
-      // console.log("Can't extract a valid urlParams token path.");
       return context;
     }
     let tokenPath: any[] = [];
@@ -859,7 +850,6 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     context.requestStartRow = ret.requestStartRow;
     if (!ret.urlTokenPath) {
       // zero length tokenPath is true
-      // console.log("Can't extract a valid url token path.");
       return context;
     }
 
@@ -875,7 +865,6 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     if (!ret.bodyTokenPath) {
       // zero length tokenPath is true
 
-      // console.log("Can't extract a valid body token path.");
       return context;
     }
 
diff --git a/src/legacy/core_plugins/kbn_doc_views/index.js b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts
similarity index 51%
rename from src/legacy/core_plugins/kbn_doc_views/index.js
rename to src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts
index 9078a82d633811..cb037e29e33f64 100644
--- a/src/legacy/core_plugins/kbn_doc_views/index.js
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts
@@ -17,10 +17,25 @@
  * under the License.
  */
 
-export default function(kibana) {
-  return new kibana.Plugin({
-    uiExports: {
-      docViews: ['plugins/kbn_doc_views/kbn_doc_views'],
-    },
-  });
+import { CoreEditor, Position } from '../../types';
+import { getCurrentMethodAndTokenPaths } from './autocomplete';
+
+// @ts-ignore
+import { getTopLevelUrlCompleteComponents } from '../kb/kb';
+// @ts-ignore
+import { populateContext } from './engine';
+
+export function getEndpointFromPosition(editor: CoreEditor, pos: Position, parser: any) {
+  const lineValue = editor.getLineValue(pos.lineNumber);
+  const context = {
+    ...getCurrentMethodAndTokenPaths(
+      editor,
+      { column: lineValue.length, lineNumber: pos.lineNumber },
+      parser,
+      true
+    ),
+  };
+  const components = getTopLevelUrlCompleteComponents(context.method);
+  populateContext(context.urlTokenPath, context, editor, true, components);
+  return context.endpoint;
 }
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js b/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js
index 9012b875e0f2be..e36976fb7acee7 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js
@@ -18,7 +18,6 @@
  */
 
 import { stringify as formatQueryString } from 'querystring';
-
 import $ from 'jquery';
 
 const esVersion = [];
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table.ts b/src/legacy/core_plugins/console/public/np_ready/services/tracker.ts
similarity index 62%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table.ts
rename to src/legacy/core_plugins/console/public/np_ready/services/tracker.ts
index f90840f1950039..13d5f875b3c6fb 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/services/tracker.ts
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-import _ from 'lodash';
-import { addDocView } from 'ui/registry/doc_views';
-import { i18n } from '@kbn/i18n';
-import { DocViewTable } from './table/table';
+import { METRIC_TYPE } from '@kbn/analytics';
+import { MetricsTracker } from '../types';
+import { createUiStatsReporter } from '../../../../ui_metric/public';
 
-addDocView({
-  title: i18n.translate('kbnDocViews.table.tableTitle', {
-    defaultMessage: 'Table',
-  }),
-  order: 10,
-  component: DocViewTable,
-});
+const APP_TRACKER_NAME = 'console';
+export const createUsageTracker = (): MetricsTracker => {
+  const track = createUiStatsReporter(APP_TRACKER_NAME);
+  return {
+    count: (eventName: string) => track(METRIC_TYPE.COUNT, eventName),
+    load: (eventName: string) => track(METRIC_TYPE.LOADED, eventName),
+  };
+};
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/common.ts b/src/legacy/core_plugins/console/public/np_ready/types/common.ts
index ad9ed10d4188fb..e44969cd9e80a9 100644
--- a/src/legacy/core_plugins/console/public/np_ready/types/common.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/types/common.ts
@@ -17,6 +17,11 @@
  * under the License.
  */
 
+export interface MetricsTracker {
+  count: (eventName: string) => void;
+  load: (eventName: string) => void;
+}
+
 export type BaseResponseType =
   | 'application/json'
   | 'text/csv'
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/index.ts b/src/legacy/core_plugins/console/public/np_ready/types/index.ts
index 9d82237d667b3a..78c6b6c8f55cc3 100644
--- a/src/legacy/core_plugins/console/public/np_ready/types/index.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/types/index.ts
@@ -20,3 +20,4 @@
 export * from './core_editor';
 export * from './token';
 export * from './tokens_provider';
+export * from './common';
diff --git a/src/legacy/core_plugins/kbn_doc_views/package.json b/src/legacy/core_plugins/kbn_doc_views/package.json
deleted file mode 100644
index efad9ec42f1f29..00000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "kbn_doc_views",
-  "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/kbn_doc_views.js b/src/legacy/core_plugins/kbn_doc_views/public/kbn_doc_views.js
deleted file mode 100644
index 2608e60e70742f..00000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/public/kbn_doc_views.js
+++ /dev/null
@@ -1,21 +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 './views/table';
-import './views/json';
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/json.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/json.tsx
deleted file mode 100644
index 73167b56bddeaa..00000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/json.tsx
+++ /dev/null
@@ -1,33 +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 { addDocView } from 'ui/registry/doc_views';
-import { i18n } from '@kbn/i18n';
-import { JsonCodeBlock } from './json_code_block';
-
-/*
- * Registration of the the doc view: json
- * - used to display an ES hit as pretty printed JSON at Discover
- */
-addDocView({
-  title: i18n.translate('kbnDocViews.json.jsonTitle', {
-    defaultMessage: 'JSON',
-  }),
-  order: 20,
-  component: JsonCodeBlock,
-});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/__snapshots__/dashboard_empty_screen.test.tsx.snap
index f611ec978b6b36..f7fc3b0891feff 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/__snapshots__/dashboard_empty_screen.test.tsx.snap
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/__snapshots__/dashboard_empty_screen.test.tsx.snap
@@ -1,5 +1,367 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`DashboardEmptyScreen renders correctly with readonly mode 1`] = `
+<DashboardEmptyScreen
+  http={
+    Object {
+      "addLoadingCountSource": [MockFunction],
+      "anonymousPaths": Object {
+        "isAnonymous": [MockFunction],
+        "register": [MockFunction],
+      },
+      "basePath": BasePath {
+        "basePath": "",
+        "get": [Function],
+        "prepend": [Function],
+        "remove": [Function],
+      },
+      "delete": [MockFunction],
+      "fetch": [MockFunction],
+      "get": [MockFunction],
+      "getLoadingCount$": [MockFunction],
+      "head": [MockFunction],
+      "intercept": [MockFunction],
+      "options": [MockFunction],
+      "patch": [MockFunction],
+      "post": [MockFunction],
+      "put": [MockFunction],
+    }
+  }
+  intl={
+    Object {
+      "defaultFormats": Object {},
+      "defaultLocale": "en",
+      "formatDate": [Function],
+      "formatHTMLMessage": [Function],
+      "formatMessage": [Function],
+      "formatNumber": [Function],
+      "formatPlural": [Function],
+      "formatRelative": [Function],
+      "formatTime": [Function],
+      "formats": Object {
+        "date": Object {
+          "full": Object {
+            "day": "numeric",
+            "month": "long",
+            "weekday": "long",
+            "year": "numeric",
+          },
+          "long": Object {
+            "day": "numeric",
+            "month": "long",
+            "year": "numeric",
+          },
+          "medium": Object {
+            "day": "numeric",
+            "month": "short",
+            "year": "numeric",
+          },
+          "short": Object {
+            "day": "numeric",
+            "month": "numeric",
+            "year": "2-digit",
+          },
+        },
+        "number": Object {
+          "currency": Object {
+            "style": "currency",
+          },
+          "percent": Object {
+            "style": "percent",
+          },
+        },
+        "relative": Object {
+          "days": Object {
+            "units": "day",
+          },
+          "hours": Object {
+            "units": "hour",
+          },
+          "minutes": Object {
+            "units": "minute",
+          },
+          "months": Object {
+            "units": "month",
+          },
+          "seconds": Object {
+            "units": "second",
+          },
+          "years": Object {
+            "units": "year",
+          },
+        },
+        "time": Object {
+          "full": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+            "timeZoneName": "short",
+          },
+          "long": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+            "timeZoneName": "short",
+          },
+          "medium": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+          },
+          "short": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+          },
+        },
+      },
+      "formatters": Object {
+        "getDateTimeFormat": [Function],
+        "getMessageFormat": [Function],
+        "getNumberFormat": [Function],
+        "getPluralFormat": [Function],
+        "getRelativeFormat": [Function],
+      },
+      "locale": "en",
+      "messages": Object {},
+      "now": [Function],
+      "onError": [Function],
+      "textComponent": Symbol(react.fragment),
+      "timeZone": null,
+    }
+  }
+  isReadonlyMode={true}
+  onLinkClick={[MockFunction]}
+  showLinkToVisualize={true}
+  uiSettings={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [
+            "theme:darkMode",
+          ],
+          Array [
+            "theme:darkMode",
+          ],
+          Array [
+            "theme:darkMode",
+          ],
+          Array [
+            "theme:darkMode",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          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],
+    }
+  }
+>
+  <I18nProvider>
+    <IntlProvider
+      defaultLocale="en"
+      formats={
+        Object {
+          "date": Object {
+            "full": Object {
+              "day": "numeric",
+              "month": "long",
+              "weekday": "long",
+              "year": "numeric",
+            },
+            "long": Object {
+              "day": "numeric",
+              "month": "long",
+              "year": "numeric",
+            },
+            "medium": Object {
+              "day": "numeric",
+              "month": "short",
+              "year": "numeric",
+            },
+            "short": Object {
+              "day": "numeric",
+              "month": "numeric",
+              "year": "2-digit",
+            },
+          },
+          "number": Object {
+            "currency": Object {
+              "style": "currency",
+            },
+            "percent": Object {
+              "style": "percent",
+            },
+          },
+          "relative": Object {
+            "days": Object {
+              "units": "day",
+            },
+            "hours": Object {
+              "units": "hour",
+            },
+            "minutes": Object {
+              "units": "minute",
+            },
+            "months": Object {
+              "units": "month",
+            },
+            "seconds": Object {
+              "units": "second",
+            },
+            "years": Object {
+              "units": "year",
+            },
+          },
+          "time": Object {
+            "full": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+              "timeZoneName": "short",
+            },
+            "long": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+              "timeZoneName": "short",
+            },
+            "medium": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+            },
+            "short": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+            },
+          },
+        }
+      }
+      locale="en"
+      messages={Object {}}
+      textComponent={Symbol(react.fragment)}
+    >
+      <PseudoLocaleWrapper>
+        <EuiPage
+          className="dshStartScreen"
+          restrictWidth="500px"
+        >
+          <div
+            className="euiPage euiPage--restrictWidth-custom dshStartScreen"
+            style={
+              Object {
+                "maxWidth": "500px",
+              }
+            }
+          >
+            <EuiPageBody>
+              <main
+                className="euiPageBody"
+              >
+                <EuiPageContent
+                  className="dshStartScreen__pageContent"
+                  horizontalPosition="center"
+                  paddingSize="none"
+                  verticalPosition="center"
+                >
+                  <EuiPanel
+                    className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter dshStartScreen__pageContent"
+                    paddingSize="none"
+                  >
+                    <div
+                      className="euiPanel euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter dshStartScreen__pageContent"
+                    >
+                      <EuiImage
+                        alt=""
+                        url="/plugins/kibana/home/assets/welcome_graphic_light_2x.png"
+                      >
+                        <figure
+                          className="euiImage"
+                          role="figure"
+                        >
+                          <img
+                            alt=""
+                            className="euiImage__img"
+                            src="/plugins/kibana/home/assets/welcome_graphic_light_2x.png"
+                          />
+                        </figure>
+                      </EuiImage>
+                      <EuiText
+                        size="m"
+                      >
+                        <div
+                          className="euiText euiText--medium"
+                        >
+                          <p
+                            style={
+                              Object {
+                                "fontWeight": "bold",
+                              }
+                            }
+                          >
+                            This dashboard is empty.
+                          </p>
+                        </div>
+                      </EuiText>
+                      <EuiText
+                        color="subdued"
+                        size="m"
+                      >
+                        <div
+                          className="euiText euiText--medium"
+                        >
+                          <EuiTextColor
+                            color="subdued"
+                            component="div"
+                          >
+                            <div
+                              className="euiTextColor euiTextColor--subdued"
+                            >
+                              You need additional privileges to edit this dashboard.
+                            </div>
+                          </EuiTextColor>
+                        </div>
+                      </EuiText>
+                    </div>
+                  </EuiPanel>
+                </EuiPageContent>
+              </main>
+            </EuiPageBody>
+          </div>
+        </EuiPage>
+      </PseudoLocaleWrapper>
+    </IntlProvider>
+  </I18nProvider>
+</DashboardEmptyScreen>
+`;
+
 exports[`DashboardEmptyScreen renders correctly with visualize paragraph 1`] = `
 <DashboardEmptyScreen
   http={
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
index 381ced2efd8e3e..347502c2560ab9 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
@@ -38,8 +38,7 @@ describe('DashboardEmptyScreen', () => {
 
   function mountComponent(props?: DashboardEmptyScreenProps) {
     const compProps = props || defaultProps;
-    const comp = mountWithIntl(<DashboardEmptyScreen {...compProps} />);
-    return comp;
+    return mountWithIntl(<DashboardEmptyScreen {...compProps} />);
   }
 
   test('renders correctly with visualize paragraph', () => {
@@ -52,8 +51,10 @@ describe('DashboardEmptyScreen', () => {
   test('renders correctly without visualize paragraph', () => {
     const component = mountComponent({ ...defaultProps, ...{ showLinkToVisualize: false } });
     expect(component).toMatchSnapshot();
-    const paragraph = findTestSubject(component, 'linkToVisualizeParagraph');
-    expect(paragraph.length).toBe(0);
+    const linkToVisualizeParagraph = findTestSubject(component, 'linkToVisualizeParagraph');
+    expect(linkToVisualizeParagraph.length).toBe(0);
+    const enterEditModeParagraph = component.find('.dshStartScreen__panelDesc');
+    expect(enterEditModeParagraph.length).toBe(1);
   });
 
   test('when specified, prop onVisualizeClick is called correctly', () => {
@@ -66,4 +67,11 @@ describe('DashboardEmptyScreen', () => {
     button.simulate('click');
     expect(onVisualizeClick).toHaveBeenCalled();
   });
+
+  test('renders correctly with readonly mode', () => {
+    const component = mountComponent({ ...defaultProps, ...{ isReadonlyMode: true } });
+    expect(component).toMatchSnapshot();
+    const paragraph = component.find('.dshStartScreen__panelDesc');
+    expect(paragraph.length).toBe(0);
+  });
 });
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index 8fcc7e4c263210..2523d1e60a7412 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -161,6 +161,12 @@ export class DashboardAppController {
       dashboardStateManager.getIsViewMode() &&
       !dashboardConfig.getHideWriteControls();
 
+    const getIsEmptyInReadonlyMode = () =>
+      !dashboardStateManager.getPanels().length &&
+      !getShouldShowEditHelp() &&
+      !getShouldShowViewHelp() &&
+      dashboardConfig.getHideWriteControls();
+
     const addVisualization = () => {
       navActions[TopNavIds.VISUALIZE]();
     };
@@ -193,7 +199,10 @@ export class DashboardAppController {
       }
     };
 
-    const getEmptyScreenProps = (shouldShowEditHelp: boolean): DashboardEmptyScreenProps => {
+    const getEmptyScreenProps = (
+      shouldShowEditHelp: boolean,
+      isEmptyInReadOnlyMode: boolean
+    ): DashboardEmptyScreenProps => {
       const emptyScreenProps: DashboardEmptyScreenProps = {
         onLinkClick: shouldShowEditHelp ? $scope.showAddPanel : $scope.enterEditMode,
         showLinkToVisualize: shouldShowEditHelp,
@@ -203,6 +212,9 @@ export class DashboardAppController {
       if (shouldShowEditHelp) {
         emptyScreenProps.onVisualizeClick = addVisualization;
       }
+      if (isEmptyInReadOnlyMode) {
+        emptyScreenProps.isReadonlyMode = true;
+      }
       return emptyScreenProps;
     };
 
@@ -219,6 +231,7 @@ export class DashboardAppController {
       }
       const shouldShowEditHelp = getShouldShowEditHelp();
       const shouldShowViewHelp = getShouldShowViewHelp();
+      const isEmptyInReadonlyMode = getIsEmptyInReadonlyMode();
       return {
         id: dashboardStateManager.savedDashboard.id || '',
         filters: queryFilter.getFilters(),
@@ -231,7 +244,7 @@ export class DashboardAppController {
         viewMode: dashboardStateManager.getViewMode(),
         panels: embeddablesMap,
         isFullScreenMode: dashboardStateManager.getFullScreenMode(),
-        isEmptyState: shouldShowEditHelp || shouldShowViewHelp,
+        isEmptyState: shouldShowEditHelp || shouldShowViewHelp || isEmptyInReadonlyMode,
         useMargins: dashboardStateManager.getUseMargins(),
         lastReloadRequestTime,
         title: dashboardStateManager.getTitle(),
@@ -275,9 +288,12 @@ export class DashboardAppController {
           dashboardContainer.renderEmpty = () => {
             const shouldShowEditHelp = getShouldShowEditHelp();
             const shouldShowViewHelp = getShouldShowViewHelp();
-            const isEmptyState = shouldShowEditHelp || shouldShowViewHelp;
+            const isEmptyInReadOnlyMode = getIsEmptyInReadonlyMode();
+            const isEmptyState = shouldShowEditHelp || shouldShowViewHelp || isEmptyInReadOnlyMode;
             return isEmptyState ? (
-              <DashboardEmptyScreen {...getEmptyScreenProps(shouldShowEditHelp)} />
+              <DashboardEmptyScreen
+                {...getEmptyScreenProps(shouldShowEditHelp, isEmptyInReadOnlyMode)}
+              />
             ) : null;
           };
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx
index ae5319c560ab95..3ef87fda7236b7 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx
@@ -37,6 +37,7 @@ export interface DashboardEmptyScreenProps {
   onVisualizeClick?: () => void;
   uiSettings: IUiSettingsClient;
   http: HttpStart;
+  isReadonlyMode?: boolean;
 }
 
 export function DashboardEmptyScreen({
@@ -45,6 +46,7 @@ export function DashboardEmptyScreen({
   onVisualizeClick,
   uiSettings,
   http,
+  isReadonlyMode,
 }: DashboardEmptyScreenProps) {
   const IS_DARK_THEME = uiSettings.get('theme:darkMode');
   const emptyStateGraphicURL = IS_DARK_THEME
@@ -98,25 +100,42 @@ export function DashboardEmptyScreen({
     constants.addExistingVisualizationLinkText,
     constants.addExistingVisualizationLinkAriaLabel
   );
-  const viewMode = (
-    <EuiPage className="dshStartScreen" restrictWidth="500px">
-      <EuiPageBody>
-        <EuiPageContent
-          verticalPosition="center"
-          horizontalPosition="center"
-          paddingSize="none"
-          className="dshStartScreen__pageContent"
-        >
-          <EuiImage url={http.basePath.prepend(emptyStateGraphicURL)} alt="" />
-          <EuiText size="m">
-            <p style={{ fontWeight: 'bold' }}>{constants.fillDashboardTitle}</p>
-          </EuiText>
-          <EuiSpacer size="m" />
-          <div className="dshStartScreen__panelDesc">{enterEditModeParagraph}</div>
-        </EuiPageContent>
-      </EuiPageBody>
-    </EuiPage>
+  const page = (mainText: string, showAdditionalParagraph?: boolean, additionalText?: string) => {
+    return (
+      <EuiPage className="dshStartScreen" restrictWidth="500px">
+        <EuiPageBody>
+          <EuiPageContent
+            verticalPosition="center"
+            horizontalPosition="center"
+            paddingSize="none"
+            className="dshStartScreen__pageContent"
+          >
+            <EuiImage url={http.basePath.prepend(emptyStateGraphicURL)} alt="" />
+            <EuiText size="m">
+              <p style={{ fontWeight: 'bold' }}>{mainText}</p>
+            </EuiText>
+            {additionalText ? (
+              <EuiText size="m" color="subdued">
+                {additionalText}
+              </EuiText>
+            ) : null}
+            {showAdditionalParagraph ? (
+              <React.Fragment>
+                <EuiSpacer size="m" />
+                <div className="dshStartScreen__panelDesc">{enterEditModeParagraph}</div>
+              </React.Fragment>
+            ) : null}
+          </EuiPageContent>
+        </EuiPageBody>
+      </EuiPage>
+    );
+  };
+  const readonlyMode = page(
+    constants.emptyDashboardTitle,
+    false,
+    constants.emptyDashboardAdditionalPrivilege
   );
+  const viewMode = page(constants.fillDashboardTitle, true);
   const editMode = (
     <div data-test-subj="emptyDashboardWidget" className="dshEmptyWidget">
       {enterViewModeParagraph}
@@ -124,5 +143,6 @@ export function DashboardEmptyScreen({
       {linkToVisualizeParagraph}
     </div>
   );
-  return <I18nProvider>{showLinkToVisualize ? editMode : viewMode}</I18nProvider>;
+  const actionableMode = showLinkToVisualize ? editMode : viewMode;
+  return <I18nProvider>{isReadonlyMode ? readonlyMode : actionableMode}</I18nProvider>;
 }
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx
index 513e6cb685a7ac..51fe31913662a5 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx
@@ -19,6 +19,16 @@
 
 import { i18n } from '@kbn/i18n';
 
+/** READONLY VIEW CONSTANTS **/
+export const emptyDashboardTitle: string = i18n.translate('kbn.dashboard.emptyDashboardTitle', {
+  defaultMessage: 'This dashboard is empty.',
+});
+export const emptyDashboardAdditionalPrivilege = i18n.translate(
+  'kbn.dashboard.emptyDashboardAdditionalPrivilege',
+  {
+    defaultMessage: 'You need additional privileges to edit this dashboard.',
+  }
+);
 /** VIEW MODE CONSTANTS **/
 export const fillDashboardTitle: string = i18n.translate('kbn.dashboard.fillDashboardTitle', {
   defaultMessage: 'This dashboard is empty. Let\u2019s fill it up!',
diff --git a/src/legacy/core_plugins/kibana/public/discover/build_services.ts b/src/legacy/core_plugins/kibana/public/discover/build_services.ts
index aaacde7e4060f7..1fb8b4abb21c4d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/build_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/build_services.ts
@@ -24,24 +24,27 @@ import {
   ToastsStart,
   IUiSettingsClient,
 } from 'kibana/public';
-import * as docViewsRegistry from 'ui/registry/doc_views';
-import { FilterManager, TimefilterContract, IndexPatternsContract } from 'src/plugins/data/public';
+import {
+  FilterManager,
+  TimefilterContract,
+  IndexPatternsContract,
+  DataPublicPluginStart,
+} from 'src/plugins/data/public';
 import { createSavedSearchesService } from './saved_searches';
-// @ts-ignore
 import { DiscoverStartPlugins } from './plugin';
-import { DataStart } from '../../../data/public';
 import { EuiUtilsStart } from '../../../../../plugins/eui_utils/public';
 import { SharePluginStart } from '../../../../../plugins/share/public';
 import { SavedSearch } from './np_ready/types';
+import { DocViewsRegistry } from './np_ready/doc_views/doc_views_registry';
 
 export interface DiscoverServices {
   addBasePath: (path: string) => string;
   capabilities: Capabilities;
   chrome: ChromeStart;
   core: CoreStart;
-  data: DataStart;
+  data: DataPublicPluginStart;
   docLinks: DocLinksStart;
-  docViewsRegistry: docViewsRegistry.DocViewsRegistry;
+  docViewsRegistry: DocViewsRegistry;
   eui_utils: EuiUtilsStart;
   filterManager: FilterManager;
   indexPatterns: IndexPatternsContract;
@@ -54,7 +57,11 @@ export interface DiscoverServices {
   getSavedSearchUrlById: (id: string) => Promise<string>;
   uiSettings: IUiSettingsClient;
 }
-export async function buildServices(core: CoreStart, plugins: DiscoverStartPlugins) {
+export async function buildServices(
+  core: CoreStart,
+  plugins: DiscoverStartPlugins,
+  docViewsRegistry: DocViewsRegistry
+): Promise<DiscoverServices> {
   const services = {
     savedObjectsClient: core.savedObjects.client,
     indexPatterns: plugins.data.indexPatterns,
diff --git a/src/legacy/core_plugins/kibana/public/discover/index.ts b/src/legacy/core_plugins/kibana/public/discover/index.ts
index 347f545dea4c95..7bde30e0d0f0ef 100644
--- a/src/legacy/core_plugins/kibana/public/discover/index.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/index.ts
@@ -16,20 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import chrome from 'ui/chrome';
+import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
-import { DiscoverPlugin, DiscoverSetup, DiscoverStart } from './plugin';
+import { DiscoverPlugin } from './plugin';
 
 // Core will be looking for this when loading our plugin in the new platform
-export const plugin: PluginInitializer<DiscoverSetup, DiscoverStart> = () => {
+export const plugin = (context: PluginInitializerContext) => {
   return new DiscoverPlugin();
 };
 
 // Legacy compatiblity part - to be removed at cutover, replaced by a kibana.json file
 export const pluginInstance = plugin({} as PluginInitializerContext);
-(async () => {
-  pluginInstance.setup(npSetup.core, npSetup.plugins);
-  pluginInstance.start(npStart.core, npStart.plugins);
-})();
+export const setup = pluginInstance.setup(npSetup.core, {
+  ...npSetup.plugins,
+  __LEGACY: {
+    chrome,
+  },
+});
+export const start = pluginInstance.start(npStart.core, npStart.plugins);
 
 export { createSavedSearchesService } from './saved_searches/saved_searches';
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index ca169e5f803ab6..d2eefba2cecdd9 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -94,11 +94,11 @@ export {
   IndexPatternsContract,
   IIndexPattern,
   IndexPattern,
+  indexPatterns,
   IFieldType,
 } from '../../../../../plugins/data/public';
-export { ElasticSearchHit } from 'ui/registry/doc_views_types';
-export { DocViewRenderProps, DocViewRenderFn } from 'ui/registry/doc_views';
+export { ElasticSearchHit } from './np_ready/doc_views/doc_views_types';
 export { Adapters } from 'ui/inspector/types';
-export { DocView, DocViewInput } from 'ui/registry/doc_views_types';
+export { Chrome, IInjector } from 'ui/chrome';
 export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
-export { IInjector } from 'ui/chrome';
+export { FieldName } from 'ui/directives/field_name/field_name';
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
index 656e8598aa12ff..e09f26311e4e32 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
@@ -25,7 +25,7 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { Doc, DocProps } from './doc';
 
 jest.mock('../doc_viewer/doc_viewer', () => ({
-  DocViewer: 'test',
+  DocViewer: () => null,
 }));
 
 jest.mock('../../../kibana_services', () => {
@@ -67,7 +67,7 @@ async function mountDoc(search: () => void, update = false, indexPatternGetter:
     indexPatternService,
   } as DocProps;
   let comp!: ReactWrapper;
-  act(() => {
+  await act(async () => {
     comp = mountWithIntl(<Doc {...props} />);
     if (update) comp.update();
   });
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx
index 2420eb2cd22bb7..a8fe8de833315a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx
@@ -43,7 +43,7 @@ describe('Test of <Doc /> helper / hook', () => {
     `);
   });
 
-  test('useEsDocSearch', () => {
+  test('useEsDocSearch', async () => {
     const indexPattern = {
       getComputedFields: () => [],
     };
@@ -53,16 +53,16 @@ describe('Test of <Doc /> helper / hook', () => {
     const props = {
       id: '1',
       index: 'index1',
-      esClient: { search: jest.fn() },
+      esClient: { search: jest.fn(() => new Promise(() => {})) },
       indexPatternId: 'xyz',
       indexPatternService,
     } as DocProps;
     let hook;
-    act(() => {
+    await act(async () => {
       hook = renderHook((p: DocProps) => useEsDocSearch(p), { initialProps: props });
     });
     // @ts-ignore
-    expect(hook.result.current).toEqual([ElasticRequestState.Loading, null, null]);
+    expect(hook.result.current).toEqual([ElasticRequestState.Loading, null, indexPattern]);
     expect(indexPatternService.get).toHaveBeenCalled();
   });
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
index c0644a6458694b..15f0f40700abc7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
@@ -21,23 +21,23 @@ import { mount, shallow } from 'enzyme';
 import { DocViewer } from './doc_viewer';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { DocViewRenderProps, DocViewInput, getServices } from '../../../kibana_services';
+import { getServices } from '../../../kibana_services';
+import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 jest.mock('../../../kibana_services', () => {
-  const docViews: DocViewInput[] = [];
-
-  function addDocView(docView: DocViewInput) {
-    docViews.push(docView);
-  }
-
+  let registry: any[] = [];
   return {
     getServices: () => ({
       docViewsRegistry: {
-        getDocViewsSorted: () => {
-          return docViews;
+        addDocView(view: any) {
+          registry.push(view);
+        },
+        getDocViewsSorted() {
+          return registry;
         },
-        addDocView,
-        docViews,
+      },
+      resetRegistry: () => {
+        registry = [];
       },
     }),
     formatMsg: (x: any) => String(x),
@@ -45,23 +45,16 @@ jest.mock('../../../kibana_services', () => {
   };
 });
 
-const {
-  docViewsRegistry: { docViews, addDocView },
-} = getServices();
-
-function emptyDocViews() {
-  docViews.length = 0;
-}
-
 beforeEach(() => {
-  emptyDocViews();
+  (getServices() as any).resetRegistry();
   jest.clearAllMocks();
 });
 
 test('Render <DocViewer/> with 3 different tabs', () => {
-  addDocView({ order: 10, title: 'Render function', render: jest.fn() });
-  addDocView({ order: 20, title: 'React component', component: () => <div>test</div> });
-  addDocView({ order: 30, title: 'Invalid doc view' });
+  const registry = getServices().docViewsRegistry;
+  registry.addDocView({ order: 10, title: 'Render function', render: jest.fn() });
+  registry.addDocView({ order: 20, title: 'React component', component: () => <div>test</div> });
+  registry.addDocView({ order: 30, title: 'Invalid doc view' });
 
   const renderProps = { hit: {} } as DocViewRenderProps;
 
@@ -76,7 +69,8 @@ test('Render <DocViewer/> with 1 tab displaying error message', () => {
     return null;
   }
 
-  addDocView({
+  const registry = getServices().docViewsRegistry;
+  registry.addDocView({
     order: 10,
     title: 'React component',
     component: SomeComponent,
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
index 00926d70db25c3..a177d8c29304c4 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
@@ -18,8 +18,9 @@
  */
 import React from 'react';
 import { EuiTabbedContent } from '@elastic/eui';
-import { getServices, DocViewRenderProps, DocView } from '../../../kibana_services';
+import { getServices } from '../../../kibana_services';
 import { DocViewerTab } from './doc_viewer_tab';
+import { DocView, DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 /**
  * Rendering tabs with different views of 1 Elasticsearch hit in Discover.
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
index c100e71b5f2b52..79f185452164ff 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { DocViewRenderTab } from './doc_viewer_render_tab';
-import { DocViewRenderProps } from '../../../kibana_services';
+import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 test('Mounting and unmounting DocViewerRenderTab', () => {
   const unmountFn = jest.fn();
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
index 31a8808a3a1c92..0b1a02f1987c24 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useRef, useEffect } from 'react';
-import { DocViewRenderFn, DocViewRenderProps } from '../../../kibana_services';
+import { DocViewRenderFn, DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 interface Props {
   render: DocViewRenderFn;
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
index e08b0b2323d813..0c21fafc91d69a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
@@ -18,9 +18,9 @@
  */
 import React from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
-import { DocViewRenderProps, DocViewRenderFn } from '../../../kibana_services';
 import { DocViewRenderTab } from './doc_viewer_render_tab';
 import { DocViewerError } from './doc_viewer_render_error';
+import { DocViewRenderFn, DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 interface Props {
   component?: React.ComponentType<DocViewRenderProps>;
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/__snapshots__/json_code_block.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/__snapshots__/json_code_block.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx
similarity index 94%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx
index ea11ea7b7df108..9cab7974c9eb28 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { JsonCodeBlock } from './json_code_block';
-import { IndexPattern } from '../../../../../plugins/data/public';
+import { IndexPattern } from '../../../kibana_services';
 
 it('returns the `JsonCodeEditor` component', () => {
   const props = {
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx
similarity index 88%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx
index 3f412b05005235..3331969e351ab2 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx
@@ -19,10 +19,10 @@
 import React from 'react';
 import { EuiCodeBlock } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DocViewRenderProps } from 'ui/registry/doc_views';
+import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 export function JsonCodeBlock({ hit }: DocViewRenderProps) {
-  const label = i18n.translate('kbnDocViews.json.codeEditorAriaLabel', {
+  const label = i18n.translate('kbn.discover.docViews.json.codeEditorAriaLabel', {
     defaultMessage: 'Read only JSON view of an elasticsearch document',
   });
   return (
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx
index 91b98865a02079..f816b33bcd0ae3 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx
@@ -22,7 +22,7 @@ import { mount } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { DocViewTable } from './table';
 
-import { IndexPattern, indexPatterns } from '../../../../../../plugins/data/public';
+import { IndexPattern, indexPatterns } from '../../../kibana_services';
 
 jest.mock('ui/new_platform');
 
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx
similarity index 97%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx
index 7158739e5d4375..4bb2f83016c22e 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 import React, { useState } from 'react';
-import { DocViewRenderProps } from 'ui/registry/doc_views';
 import { DocViewTableRow } from './table_row';
 import { arrayContainsObjects, trimAngularSpan } from './table_helper';
+import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 const COLLAPSE_LINE_LENGTH = 350;
 
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.test.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.test.ts
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.tsx
similarity index 100%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.tsx
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
similarity index 96%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
index 045e8093124a6c..ffcb20f0767364 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { ReactNode } from 'react';
-import { FieldName } from 'ui/directives/field_name/field_name';
-import { FieldMapping, DocViewFilterFn } from 'ui/registry/doc_views_types';
 import classNames from 'classnames';
+import React, { ReactNode } from 'react';
+import { FieldName } from '../../../kibana_services';
+import { FieldMapping, DocViewFilterFn } from '../../doc_views/doc_views_types';
 import { DocViewTableRowBtnFilterAdd } from './table_row_btn_filter_add';
 import { DocViewTableRowBtnFilterRemove } from './table_row_btn_filter_remove';
 import { DocViewTableRowBtnToggleColumn } from './table_row_btn_toggle_column';
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_collapse.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx
similarity index 94%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_collapse.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx
index cb6b522ba95592..e59f607329d4ae 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_collapse.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx
@@ -26,7 +26,7 @@ export interface Props {
 }
 
 export function DocViewTableRowBtnCollapse({ onClick, isCollapsed }: Props) {
-  const label = i18n.translate('kbnDocViews.table.toggleFieldDetails', {
+  const label = i18n.translate('kbn.discover.docViews.table.toggleFieldDetails', {
     defaultMessage: 'Toggle field details',
   });
   return (
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_add.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx
similarity index 87%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_add.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx
index df4572c5bb53be..8e2668e26cf080 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_add.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx
@@ -29,12 +29,12 @@ export interface Props {
 export function DocViewTableRowBtnFilterAdd({ onClick, disabled = false }: Props) {
   const tooltipContent = disabled ? (
     <FormattedMessage
-      id="kbnDocViews.table.unindexedFieldsCanNotBeSearchedTooltip"
+      id="kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip"
       defaultMessage="Unindexed fields can not be searched"
     />
   ) : (
     <FormattedMessage
-      id="kbnDocViews.table.filterForValueButtonTooltip"
+      id="kbn.discover.docViews.table.filterForValueButtonTooltip"
       defaultMessage="Filter for value"
     />
   );
@@ -42,7 +42,7 @@ export function DocViewTableRowBtnFilterAdd({ onClick, disabled = false }: Props
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.filterForValueButtonAriaLabel', {
+        aria-label={i18n.translate('kbn.discover.docViews.table.filterForValueButtonAriaLabel', {
           defaultMessage: 'Filter for value',
         })}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_exists.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx
similarity index 80%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_exists.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx
index ae387ef1c4fa11..ba1cb4a4db4cf3 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_exists.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx
@@ -35,18 +35,18 @@ export function DocViewTableRowBtnFilterExists({
   const tooltipContent = disabled ? (
     scripted ? (
       <FormattedMessage
-        id="kbnDocViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip"
+        id="kbn.discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip"
         defaultMessage="Unable to filter for presence of scripted fields"
       />
     ) : (
       <FormattedMessage
-        id="kbnDocViews.table.unableToFilterForPresenceOfMetaFieldsTooltip"
+        id="kbn.discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip"
         defaultMessage="Unable to filter for presence of meta fields"
       />
     )
   ) : (
     <FormattedMessage
-      id="kbnDocViews.table.filterForFieldPresentButtonTooltip"
+      id="kbn.discover.docViews.table.filterForFieldPresentButtonTooltip"
       defaultMessage="Filter for field present"
     />
   );
@@ -54,9 +54,12 @@ export function DocViewTableRowBtnFilterExists({
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.filterForFieldPresentButtonAriaLabel', {
-          defaultMessage: 'Filter for field present',
-        })}
+        aria-label={i18n.translate(
+          'kbn.discover.docViews.table.filterForFieldPresentButtonAriaLabel',
+          {
+            defaultMessage: 'Filter for field present',
+          }
+        )}
         onClick={onClick}
         className="kbnDocViewer__actionButton"
         data-test-subj="addExistsFilterButton"
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_remove.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx
similarity index 87%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_remove.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx
index eda66365829778..78538f337ba9e3 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_remove.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx
@@ -29,12 +29,12 @@ export interface Props {
 export function DocViewTableRowBtnFilterRemove({ onClick, disabled = false }: Props) {
   const tooltipContent = disabled ? (
     <FormattedMessage
-      id="kbnDocViews.table.unindexedFieldsCanNotBeSearchedTooltip"
+      id="kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip"
       defaultMessage="Unindexed fields can not be searched"
     />
   ) : (
     <FormattedMessage
-      id="kbnDocViews.table.filterOutValueButtonTooltip"
+      id="kbn.discover.docViews.table.filterOutValueButtonTooltip"
       defaultMessage="Filter out value"
     />
   );
@@ -42,7 +42,7 @@ export function DocViewTableRowBtnFilterRemove({ onClick, disabled = false }: Pr
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.filterOutValueButtonAriaLabel', {
+        aria-label={i18n.translate('kbn.discover.docViews.table.filterOutValueButtonAriaLabel', {
           defaultMessage: 'Filter out value',
         })}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_toggle_column.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx
similarity index 79%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_toggle_column.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx
index 55864f6567fe99..7a8fca529ec5ed 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_toggle_column.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx
@@ -31,9 +31,12 @@ export function DocViewTableRowBtnToggleColumn({ onClick, active, disabled = fal
   if (disabled) {
     return (
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.toggleColumnInTableButtonAriaLabel', {
-          defaultMessage: 'Toggle column in table',
-        })}
+        aria-label={i18n.translate(
+          'kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel',
+          {
+            defaultMessage: 'Toggle column in table',
+          }
+        )}
         className="kbnDocViewer__actionButton"
         data-test-subj="toggleColumnButton"
         disabled
@@ -46,15 +49,18 @@ export function DocViewTableRowBtnToggleColumn({ onClick, active, disabled = fal
     <EuiToolTip
       content={
         <FormattedMessage
-          id="kbnDocViews.table.toggleColumnInTableButtonTooltip"
+          id="kbn.discover.docViews.table.toggleColumnInTableButtonTooltip"
           defaultMessage="Toggle column in table"
         />
       }
     >
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.toggleColumnInTableButtonAriaLabel', {
-          defaultMessage: 'Toggle column in table',
-        })}
+        aria-label={i18n.translate(
+          'kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel',
+          {
+            defaultMessage: 'Toggle column in table',
+          }
+        )}
         aria-pressed={active}
         onClick={onClick}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_no_mapping.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx
similarity index 74%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_no_mapping.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx
index ab22ba7bea7bd4..347deb842c0bc5 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_no_mapping.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx
@@ -21,13 +21,19 @@ import { EuiIconTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 export function DocViewTableRowIconNoMapping() {
-  const ariaLabel = i18n.translate('kbnDocViews.table.noCachedMappingForThisFieldAriaLabel', {
-    defaultMessage: 'Warning',
-  });
-  const tooltipContent = i18n.translate('kbnDocViews.table.noCachedMappingForThisFieldTooltip', {
-    defaultMessage:
-      'No cached mapping for this field. Refresh field list from the Management > Index Patterns page',
-  });
+  const ariaLabel = i18n.translate(
+    'kbn.discover.docViews.table.noCachedMappingForThisFieldAriaLabel',
+    {
+      defaultMessage: 'Warning',
+    }
+  );
+  const tooltipContent = i18n.translate(
+    'kbn.discover.docViews.table.noCachedMappingForThisFieldTooltip',
+    {
+      defaultMessage:
+        'No cached mapping for this field. Refresh field list from the Management > Index Patterns page',
+    }
+  );
   return (
     <EuiIconTip
       aria-label={ariaLabel}
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_underscore.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx
similarity index 89%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_underscore.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx
index b527714014dae6..724b5712cf1fe9 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_underscore.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx
@@ -22,13 +22,13 @@ import { i18n } from '@kbn/i18n';
 
 export function DocViewTableRowIconUnderscore() {
   const ariaLabel = i18n.translate(
-    'kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel',
+    'kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel',
     {
       defaultMessage: 'Warning',
     }
   );
   const tooltipContent = i18n.translate(
-    'kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip',
+    'kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip',
     {
       defaultMessage: 'Field names beginning with {underscoreSign} are not supported',
       values: { underscoreSign: '_' },
diff --git a/src/legacy/ui/public/registry/doc_views_helpers.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_helpers.tsx
similarity index 92%
rename from src/legacy/ui/public/registry/doc_views_helpers.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_helpers.tsx
index 61545609f205da..fb4f0c6056a832 100644
--- a/src/legacy/ui/public/registry/doc_views_helpers.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_helpers.tsx
@@ -19,14 +19,14 @@
 import React from 'react';
 import { render } from 'react-dom';
 import angular, { ICompileService } from 'angular';
-import chrome from 'ui/chrome';
 import {
   DocViewRenderProps,
   AngularScope,
   AngularController,
   AngularDirective,
 } from './doc_views_types';
-import { DocViewerError } from '../../../core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error';
+import { DocViewerError } from '../components/doc_viewer/doc_viewer_render_error';
+import { Chrome } from '../../kibana_services';
 
 /**
  * Compiles and injects the give angular template into the given dom node
@@ -36,7 +36,8 @@ export async function injectAngularElement(
   domNode: Element,
   template: string,
   scopeProps: DocViewRenderProps,
-  Controller: AngularController
+  Controller: AngularController,
+  chrome: Chrome
 ): Promise<() => void> {
   const $injector = await chrome.dangerouslyGetActiveInjector();
   const rootScope: AngularScope = $injector.get('$rootScope');
@@ -68,7 +69,7 @@ export async function injectAngularElement(
  * Converts a given legacy angular directive to a render function
  * for usage in a react component. Note that the rendering is async
  */
-export function convertDirectiveToRenderFn(directive: AngularDirective) {
+export function convertDirectiveToRenderFn(directive: AngularDirective, chrome: Chrome) {
   return (domNode: Element, props: DocViewRenderProps) => {
     let rejected = false;
 
@@ -76,7 +77,8 @@ export function convertDirectiveToRenderFn(directive: AngularDirective) {
       domNode,
       directive.template,
       props,
-      directive.controller
+      directive.controller,
+      chrome
     );
     cleanupFnPromise.catch(e => {
       rejected = true;
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts
new file mode 100644
index 00000000000000..1952ec3af2f6cd
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts
@@ -0,0 +1,50 @@
+/*
+ * 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 { convertDirectiveToRenderFn } from './doc_views_helpers';
+import { DocView, DocViewInput, ElasticSearchHit, DocViewInputFn } from './doc_views_types';
+import { Chrome } from '../../kibana_services';
+
+export class DocViewsRegistry {
+  private docViews: DocView[] = [];
+
+  constructor(private legacyChrome: Chrome) {}
+
+  /**
+   * Extends and adds the given doc view to the registry array
+   */
+  addDocView(docViewRaw: DocViewInput | DocViewInputFn) {
+    const docView = typeof docViewRaw === 'function' ? docViewRaw() : docViewRaw;
+    if (docView.directive) {
+      // convert angular directive to render function for backwards compatibility
+      docView.render = convertDirectiveToRenderFn(docView.directive, this.legacyChrome);
+    }
+    if (typeof docView.shouldShow !== 'function') {
+      docView.shouldShow = () => true;
+    }
+    this.docViews.push(docView as DocView);
+  }
+  /**
+   * Returns a sorted array of doc_views for rendering tabs
+   */
+  getDocViewsSorted(hit: ElasticSearchHit) {
+    return this.docViews
+      .filter(docView => docView.shouldShow(hit))
+      .sort((a, b) => (Number(a.order) > Number(b.order) ? 1 : -1));
+  }
+}
diff --git a/src/legacy/ui/public/registry/doc_views_types.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts
similarity index 97%
rename from src/legacy/ui/public/registry/doc_views_types.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts
index eb2a5bdc4b3b75..92e18e7ea7b888 100644
--- a/src/legacy/ui/public/registry/doc_views_types.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts
@@ -18,7 +18,7 @@
  */
 import { ComponentType } from 'react';
 import { IScope } from 'angular';
-import { IndexPattern } from '../../../../plugins/data/public';
+import { IndexPattern } from '../../kibana_services';
 
 export interface AngularDirective {
   controller: (scope: AngularScope) => void;
diff --git a/src/legacy/core_plugins/kibana/public/discover/plugin.ts b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
index 0cff1e66f3636c..8f1eb7ef755597 100644
--- a/src/legacy/core_plugins/kibana/public/discover/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
@@ -16,20 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { i18n } from '@kbn/i18n';
 import { AppMountParameters, CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import angular from 'angular';
-import { IUiActionsStart } from 'src/plugins/ui_actions/public';
+import { IUiActionsSetup, IUiActionsStart } from 'src/plugins/ui_actions/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { registerFeature } from './np_ready/register_feature';
 import './kibana_services';
 import { IEmbeddableStart, IEmbeddableSetup } from '../../../../../plugins/embeddable/public';
 import { getInnerAngularModule, getInnerAngularModuleEmbeddable } from './get_inner_angular';
-import { setAngularModule, setServices } from './kibana_services';
+import { Chrome, setAngularModule, setServices } from './kibana_services';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
 import { EuiUtilsStart } from '../../../../../plugins/eui_utils/public';
 import { buildServices } from './build_services';
 import { SharePluginStart } from '../../../../../plugins/share/public';
 import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
+import { DocViewsRegistry } from './np_ready/doc_views/doc_views_registry';
+import { DocViewInput, DocViewInputFn } from './np_ready/doc_views/doc_views_types';
+import { DocViewTable } from './np_ready/components/table/table';
+import { JsonCodeBlock } from './np_ready/components/json_code_block/json_code_block';
 import { HomePublicPluginSetup } from '../../../../../plugins/home/public';
 
 /**
@@ -37,12 +42,17 @@ import { HomePublicPluginSetup } from '../../../../../plugins/home/public';
  * for other plugins to use in _their_ `SetupDeps`/`StartDeps` interfaces.
  * @public
  */
-export type DiscoverSetup = void;
+export interface DiscoverSetup {
+  addDocView(docViewRaw: DocViewInput | DocViewInputFn): void;
+}
 export type DiscoverStart = void;
 export interface DiscoverSetupPlugins {
-  uiActions: IUiActionsStart;
+  uiActions: IUiActionsSetup;
   embeddable: IEmbeddableSetup;
   kibana_legacy: KibanaLegacySetup;
+  __LEGACY: {
+    chrome: Chrome;
+  };
   home: HomePublicPluginSetup;
 }
 export interface DiscoverStartPlugins {
@@ -65,13 +75,30 @@ const embeddableAngularName = 'app/discoverEmbeddable';
 export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
   private servicesInitialized: boolean = false;
   private innerAngularInitialized: boolean = false;
+  private docViewsRegistry: DocViewsRegistry | null = null;
   /**
    * why are those functions public? they are needed for some mocha tests
    * can be removed once all is Jest
    */
   public initializeInnerAngular?: () => void;
   public initializeServices?: () => void;
+
   setup(core: CoreSetup, plugins: DiscoverSetupPlugins): DiscoverSetup {
+    this.docViewsRegistry = new DocViewsRegistry(plugins.__LEGACY.chrome);
+    this.docViewsRegistry.addDocView({
+      title: i18n.translate('kbn.discover.docViews.table.tableTitle', {
+        defaultMessage: 'Table',
+      }),
+      order: 10,
+      component: DocViewTable,
+    });
+    this.docViewsRegistry.addDocView({
+      title: i18n.translate('kbn.discover.docViews.json.jsonTitle', {
+        defaultMessage: 'JSON',
+      }),
+      order: 20,
+      component: JsonCodeBlock,
+    });
     plugins.kibana_legacy.registerLegacyApp({
       id: 'discover',
       title: 'Discover',
@@ -91,6 +118,10 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
       },
     });
     registerFeature(plugins.home);
+
+    return {
+      addDocView: this.docViewsRegistry.addDocView.bind(this.docViewsRegistry),
+    };
   }
 
   start(core: CoreStart, plugins: DiscoverStartPlugins): DiscoverStart {
@@ -112,7 +143,7 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
       if (this.servicesInitialized) {
         return;
       }
-      const services = await buildServices(core, plugins);
+      const services = await buildServices(core, plugins, this.docViewsRegistry!);
       setServices(services);
       this.servicesInitialized = true;
     };
diff --git a/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/envoyproxy.svg b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/envoyproxy.svg
new file mode 100644
index 00000000000000..45c995b19603be
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/envoyproxy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" width="300" height="300" font-family="Roboto" font-size="14px" text-anchor="middle"><defs><style type="text/css"></style></defs><use xlink:href="#A" x=".5" y=".5"></use><symbol id="A" overflow="visible"><svg width="64" height="64" stroke="initial" fill="initial" fill-rule="initial"><defs><clipPath id="B"><use xlink:href="#C"></use></clipPath><path id="C" d="M22.9 13.6h271.8v296.2H22.9z"></path></defs><g transform="matrix(.283424 0 0 .283424 -13.064191 3.213972)"><path clip-path="url(#B)" d="M116.7 107.6l-14.3-8.9.3 13.6 14.3 8.9zm20.6 47.6l-.3-13.3-12.5-7.8c-.2-.1-.4-.3-.5-.4l.3 13.4zm-44.7 17.9l-32.7-20.3-.8-34 16-6.9-.3-13.6-25.6 11c-2 .9-3.2 2.7-3.1 4.8l1 40.8c0 2.1 1.3 4.2 3.3 5.4l39.2 24.3c1.8 1.1 4 1.4 5.9.9.2-.1.4-.1.6-.2l24.1-10.4-13.1-8.1z" fill="#b31aab"></path><path d="M198.3 97.9c-.1-2.4-1.5-4.9-3.9-6.3l-47.6-29.5-1.5.6.3 14.3 37.7 23.4.9 38.2 14.4 8.9.8-.3zm-57 67.1L97 137.6l-1.1-46 20.2-8.7-.4-15.9-31.3 13.5c-2.3 1-3.7 3.1-3.6 5.6l1.3 54c0 2.5 1.5 4.9 3.9 6.3l51.9 32.2c2.1 1.3 4.7 1.7 6.9 1 .2-.1.4-.2.6-.2l30.6-13.2-15.2-9.4z" clip-path="url(#B)" fill="#d163ce"></path><path d="M265.8 60.1l-66.5-41.2c-2.5-1.5-5.4-1.9-7.9-1.1-.2.1-.5.2-.7.3l-64.9 28c-2.6 1.1-4.2 3.5-4.1 6.4l1.6 69.2c.1 2.8 1.8 5.6 4.5 7.2l66.5 41.2c2.4 1.5 5.4 1.9 7.9 1.1.2-.1.5-.2.7-.3l64.9-28c2.6-1.1 4.2-3.6 4.1-6.4l-1.6-69.2c-.1-2.8-1.8-5.5-4.5-7.2m-67.6 94.5l-57.8-35.8-1.4-60.1 56.4-24.3 57.8 35.8 1.4 60.1z" clip-path="url(#B)" fill="#e13eaf"></path></g></svg></symbol></svg>
\ No newline at end of file
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/apm/index_pattern.json b/src/legacy/core_plugins/kibana/server/tutorials/apm/index_pattern.json
index 25ce0cb58a0ca8..090586a612d4fa 100644
--- a/src/legacy/core_plugins/kibana/server/tutorials/apm/index_pattern.json
+++ b/src/legacy/core_plugins/kibana/server/tutorials/apm/index_pattern.json
@@ -1,7 +1,7 @@
 {
   "attributes": {
     "fieldFormatMap": "{\"client.bytes\":{\"id\":\"bytes\"},\"client.nat.port\":{\"id\":\"string\"},\"client.port\":{\"id\":\"string\"},\"destination.bytes\":{\"id\":\"bytes\"},\"destination.nat.port\":{\"id\":\"string\"},\"destination.port\":{\"id\":\"string\"},\"event.duration\":{\"id\":\"duration\",\"params\":{\"inputFormat\":\"nanoseconds\",\"outputFormat\":\"asMilliseconds\",\"outputPrecision\":1}},\"event.sequence\":{\"id\":\"string\"},\"event.severity\":{\"id\":\"string\"},\"http.request.body.bytes\":{\"id\":\"bytes\"},\"http.request.bytes\":{\"id\":\"bytes\"},\"http.response.body.bytes\":{\"id\":\"bytes\"},\"http.response.bytes\":{\"id\":\"bytes\"},\"http.response.status_code\":{\"id\":\"string\"},\"log.syslog.facility.code\":{\"id\":\"string\"},\"log.syslog.priority\":{\"id\":\"string\"},\"network.bytes\":{\"id\":\"bytes\"},\"package.size\":{\"id\":\"string\"},\"process.pgid\":{\"id\":\"string\"},\"process.pid\":{\"id\":\"string\"},\"process.ppid\":{\"id\":\"string\"},\"process.thread.id\":{\"id\":\"string\"},\"server.bytes\":{\"id\":\"bytes\"},\"server.nat.port\":{\"id\":\"string\"},\"server.port\":{\"id\":\"string\"},\"source.bytes\":{\"id\":\"bytes\"},\"source.nat.port\":{\"id\":\"string\"},\"source.port\":{\"id\":\"string\"},\"system.cpu.total.norm.pct\":{\"id\":\"percent\"},\"system.memory.actual.free\":{\"id\":\"bytes\"},\"system.memory.total\":{\"id\":\"bytes\"},\"system.process.cpu.total.norm.pct\":{\"id\":\"percent\"},\"system.process.memory.rss.bytes\":{\"id\":\"bytes\"},\"system.process.memory.size\":{\"id\":\"bytes\"},\"url.port\":{\"id\":\"string\"},\"view spans\":{\"id\":\"url\",\"params\":{\"labelTemplate\":\"View Spans\"}}}",
-    "fields": "[{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"@timestamp\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.account.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.availability_zone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.machine.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.region\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.tag\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.runtime\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.data\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.ttl\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.header_flags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.op_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.subdomain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.resolved_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.response_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"ecs.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.stack_trace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.dataset\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.end\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.kind\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.outcome\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score_norm\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.sequence\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.severity\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.timezone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.accessed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.ctime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.device\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.gid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.group\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.inode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mtime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.owner\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.target_path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.method\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.referrer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.status_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.logger\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.priority\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.application\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.community_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.direction\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.forwarded_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.iana_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.transport\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.serial_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.vendor\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.checksum\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.install_scope\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.installed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.license\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.args\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.executable\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pgid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.ppid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.id\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.title\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.working_directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.state\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.framework\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.fragment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.password\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.query\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.scheme\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.username\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.device.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"fields\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"timeseries.instance\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.project.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.image.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"docker.container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.containerized\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.build\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.codename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.namespace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.labels.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.annotations.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.replicaset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.deployment.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.statefulset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.image\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.event\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"timestamp.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.request.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.finished\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.response.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.environment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.sampled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.breakdown.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.subtype\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"parent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.listening\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version_major\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"experimental\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.culprit\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.grouping_key\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.handled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.logger_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.param_message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.total\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.actual.free\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.rss.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.cpu.ns\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.samples.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.bundle_filepath\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"view spans\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.start.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.sync\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.link\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.resource\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.result\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks.*.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.span_count.dropped\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_id\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_index\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_score\",\"scripted\":false,\"searchable\":false,\"type\":\"number\"}]",
+    "fields": "[{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"@timestamp\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.account.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.availability_zone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.machine.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.region\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.tag\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.runtime\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.data\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.ttl\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.header_flags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.op_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.subdomain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.resolved_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.response_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"ecs.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.stack_trace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.dataset\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.end\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.kind\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.outcome\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score_norm\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.sequence\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.severity\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.timezone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.accessed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.ctime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.device\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.gid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.group\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.inode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mtime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.owner\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.target_path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.method\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.referrer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.status_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.logger\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.priority\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.application\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.community_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.direction\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.forwarded_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.iana_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.transport\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.serial_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.vendor\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.checksum\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.install_scope\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.installed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.license\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.args\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.executable\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pgid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.ppid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.id\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.title\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.working_directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.state\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.framework\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.fragment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.password\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.query\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.scheme\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.username\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.device.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"fields\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"timeseries.instance\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.project.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.image.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"docker.container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.containerized\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.build\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.codename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.namespace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.labels.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.annotations.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.replicaset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.deployment.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.statefulset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.image\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.event\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"timestamp.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.request.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.finished\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.response.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.environment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.sampled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.breakdown.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.subtype\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"parent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.listening\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version_major\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"experimental\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.culprit\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.grouping_key\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.handled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.logger_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.param_message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.total\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.actual.free\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.rss.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.cpu.ns\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.samples.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.bundle_filepath\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"view spans\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.start.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.sync\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.link\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.rows_affected\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.resource\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.message.queue.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.message.age.ms\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.result\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks.*.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.span_count.dropped\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.message.queue.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.message.age.ms\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_id\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_index\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_score\",\"scripted\":false,\"searchable\":false,\"type\":\"number\"}]",
     "sourceFilters": "[{\"value\":\"sourcemap.sourcemap\"}]",
     "timeFieldName": "@timestamp"
   },
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/envoyproxy_metrics/index.js b/src/legacy/core_plugins/kibana/server/tutorials/envoyproxy_metrics/index.js
new file mode 100644
index 00000000000000..4e5301149b35b0
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/server/tutorials/envoyproxy_metrics/index.js
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category';
+import {
+  onPremInstructions,
+  cloudInstructions,
+  onPremCloudInstructions,
+} from '../../../common/tutorials/metricbeat_instructions';
+
+export function envoyproxyMetricsSpecProvider(server, context) {
+  const moduleName = 'envoyproxy';
+  return {
+    id: 'envoyproxyMetrics',
+    name: i18n.translate('kbn.server.tutorials.envoyproxyMetrics.nameTitle', {
+      defaultMessage: 'Envoy Proxy metrics',
+    }),
+    category: TUTORIAL_CATEGORY.METRICS,
+    shortDescription: i18n.translate('kbn.server.tutorials.envoyproxyMetrics.shortDescription', {
+      defaultMessage: 'Fetch monitoring metrics from Envoy Proxy.',
+    }),
+    longDescription: i18n.translate('kbn.server.tutorials.envoyproxyMetrics.longDescription', {
+      defaultMessage:
+        'The `envoyproxy` Metricbeat module fetches monitoring metrics from Envoy Proxy. \
+[Learn more]({learnMoreLink}).',
+      values: {
+        learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-envoyproxy.html',
+      },
+    }),
+    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/envoyproxy.svg',
+    artifacts: {
+      dashboards: [],
+      exportedFields: {
+        documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-envoyproxy.html',
+      },
+    },
+    completionTimeMinutes: 10,
+    // previewImagePath: '/plugins/kibana/home/tutorial_resources/envoyproxy_metrics/screenshot.png',
+    onPrem: onPremInstructions(moduleName, null, null, null, context),
+    elasticCloud: cloudInstructions(moduleName),
+    onPremElasticCloud: onPremCloudInstructions(moduleName),
+  };
+}
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/register.js b/src/legacy/core_plugins/kibana/server/tutorials/register.js
index eb06c97629b178..ecc2d1df8c3883 100644
--- a/src/legacy/core_plugins/kibana/server/tutorials/register.js
+++ b/src/legacy/core_plugins/kibana/server/tutorials/register.js
@@ -83,6 +83,7 @@ import { awsLogsSpecProvider } from './aws_logs';
 import { activemqLogsSpecProvider } from './activemq_logs';
 import { activemqMetricsSpecProvider } from './activemq_metrics';
 import { azureMetricsSpecProvider } from './azure_metrics';
+import { envoyproxyMetricsSpecProvider } from './envoyproxy_metrics';
 
 export function registerTutorials(server) {
   server.newPlatform.setup.plugins.home.tutorials.registerTutorial(systemLogsSpecProvider);
@@ -154,4 +155,5 @@ export function registerTutorials(server) {
   server.newPlatform.setup.plugins.home.tutorials.registerTutorial(activemqLogsSpecProvider);
   server.newPlatform.setup.plugins.home.tutorials.registerTutorial(activemqMetricsSpecProvider);
   server.newPlatform.setup.plugins.home.tutorials.registerTutorial(azureMetricsSpecProvider);
+  server.newPlatform.setup.plugins.home.tutorials.registerTutorial(envoyproxyMetricsSpecProvider);
 }
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 3d4292cef27f4c..06424ea48a40f9 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
@@ -148,6 +148,8 @@ export const npStart = {
       legacy: {
         getSection: () => ({
           register: sinon.fake(),
+          deregister: sinon.fake(),
+          hasItem: sinon.fake(),
         }),
       },
     },
diff --git a/src/legacy/ui/public/registry/doc_views.ts b/src/legacy/ui/public/registry/doc_views.ts
deleted file mode 100644
index bf1e8416ae66d8..00000000000000
--- a/src/legacy/ui/public/registry/doc_views.ts
+++ /dev/null
@@ -1,69 +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 { convertDirectiveToRenderFn } from './doc_views_helpers';
-import { DocView, DocViewInput, ElasticSearchHit, DocViewInputFn } from './doc_views_types';
-
-export { DocViewRenderProps, DocView, DocViewRenderFn } from './doc_views_types';
-
-export interface DocViewsRegistry {
-  docViews: DocView[];
-  addDocView: (docView: DocViewInput) => void;
-  getDocViewsSorted: (hit: ElasticSearchHit) => DocView[];
-}
-
-export const docViews: DocView[] = [];
-
-/**
- * Extends and adds the given doc view to the registry array
- */
-export function addDocView(docView: DocViewInput) {
-  if (docView.directive) {
-    // convert angular directive to render function for backwards compatibility
-    docView.render = convertDirectiveToRenderFn(docView.directive);
-  }
-  if (typeof docView.shouldShow !== 'function') {
-    docView.shouldShow = () => true;
-  }
-  docViews.push(docView as DocView);
-}
-
-/**
- * Empty array of doc views for testing
- */
-export function emptyDocViews() {
-  docViews.length = 0;
-}
-
-/**
- * Returns a sorted array of doc_views for rendering tabs
- */
-export function getDocViewsSorted(hit: ElasticSearchHit): DocView[] {
-  return docViews
-    .filter(docView => docView.shouldShow(hit))
-    .sort((a, b) => (Number(a.order) > Number(b.order) ? 1 : -1));
-}
-/**
- * Provider for compatibility with 3rd Party plugins
- */
-export const DocViewsRegistryProvider = {
-  register: (docViewRaw: DocViewInput | DocViewInputFn) => {
-    const docView = typeof docViewRaw === 'function' ? docViewRaw() : docViewRaw;
-    addDocView(docView);
-  },
-};
diff --git a/src/plugins/inspector/public/views/data/components/download_options.tsx b/src/plugins/inspector/public/views/data/components/download_options.tsx
index 6d21dcdafa84d5..e7bfbed23c0746 100644
--- a/src/plugins/inspector/public/views/data/components/download_options.tsx
+++ b/src/plugins/inspector/public/views/data/components/download_options.tsx
@@ -20,6 +20,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 
 import { EuiButton, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
 import { DataViewColumn, DataViewRow } from '../types';
@@ -66,8 +67,14 @@ class DataDownloadOptions extends Component<DataDownloadOptionsProps, DataDownlo
   };
 
   exportCsv = (customParams: any = {}) => {
+    let filename = this.props.title;
+    if (!filename || filename.length === 0) {
+      filename = i18n.translate('inspector.data.downloadOptionsUnsavedFilename', {
+        defaultMessage: 'unsaved',
+      });
+    }
     exportAsCsv({
-      filename: `${this.props.title}.csv`,
+      filename: `${filename}.csv`,
       columns: this.props.columns,
       rows: this.props.rows,
       csvSeparator: this.props.csvSeparator,
diff --git a/test/api_integration/apis/ui_metric/ui_metric.js b/test/api_integration/apis/ui_metric/ui_metric.js
index 5b02ba7e72430f..5ddbd8649589c7 100644
--- a/test/api_integration/apis/ui_metric/ui_metric.js
+++ b/test/api_integration/apis/ui_metric/ui_metric.js
@@ -25,15 +25,13 @@ export default function({ getService }) {
   const es = getService('legacyEs');
 
   const createStatsMetric = eventName => ({
-    key: ReportManager.createMetricKey({ appName: 'myApp', type: METRIC_TYPE.CLICK, eventName }),
     eventName,
     appName: 'myApp',
     type: METRIC_TYPE.CLICK,
-    stats: { sum: 1, avg: 1, min: 1, max: 1 },
+    count: 1,
   });
 
   const createUserAgentMetric = appName => ({
-    key: ReportManager.createMetricKey({ appName, type: METRIC_TYPE.USER_AGENT }),
     appName,
     type: METRIC_TYPE.USER_AGENT,
     userAgent:
@@ -42,12 +40,9 @@ export default function({ getService }) {
 
   describe('ui_metric API', () => {
     it('increments the count field in the document defined by the {app}/{action_type} path', async () => {
+      const reportManager = new ReportManager();
       const uiStatsMetric = createStatsMetric('myEvent');
-      const report = {
-        uiStatsMetrics: {
-          [uiStatsMetric.key]: uiStatsMetric,
-        },
-      };
+      const { report } = reportManager.assignReports([uiStatsMetric]);
       await supertest
         .post('/api/ui_metric/report')
         .set('kbn-xsrf', 'kibana')
@@ -61,21 +56,18 @@ export default function({ getService }) {
     });
 
     it('supports multiple events', async () => {
+      const reportManager = new ReportManager();
       const userAgentMetric = createUserAgentMetric('kibana');
       const uiStatsMetric1 = createStatsMetric('myEvent');
       const hrTime = process.hrtime();
       const nano = hrTime[0] * 1000000000 + hrTime[1];
       const uniqueEventName = `myEvent${nano}`;
       const uiStatsMetric2 = createStatsMetric(uniqueEventName);
-      const report = {
-        userAgent: {
-          [userAgentMetric.key]: userAgentMetric,
-        },
-        uiStatsMetrics: {
-          [uiStatsMetric1.key]: uiStatsMetric1,
-          [uiStatsMetric2.key]: uiStatsMetric2,
-        },
-      };
+      const { report } = reportManager.assignReports([
+        userAgentMetric,
+        uiStatsMetric1,
+        uiStatsMetric2,
+      ]);
       await supertest
         .post('/api/ui_metric/report')
         .set('kbn-xsrf', 'kibana')
diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js
index 3caab3db44cb33..3b9e404e9b94d1 100644
--- a/test/functional/apps/dashboard/dashboard_state.js
+++ b/test/functional/apps/dashboard/dashboard_state.js
@@ -27,7 +27,14 @@ import {
 } from '../../../../src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants';
 
 export default function({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['dashboard', 'visualize', 'header', 'discover']);
+  const PageObjects = getPageObjects([
+    'dashboard',
+    'visualize',
+    'header',
+    'discover',
+    'tileMap',
+    'visChart',
+  ]);
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
   const queryBar = getService('queryBar');
@@ -58,14 +65,14 @@ export default function({ getService, getPageObjects }) {
 
       await PageObjects.dashboard.switchToEditMode();
 
-      await PageObjects.visualize.openLegendOptionColors('Count');
-      await PageObjects.visualize.selectNewLegendColorChoice('#EA6460');
+      await PageObjects.visChart.openLegendOptionColors('Count');
+      await PageObjects.visChart.selectNewLegendColorChoice('#EA6460');
 
       await PageObjects.dashboard.saveDashboard('Overridden colors');
 
       await PageObjects.dashboard.gotoDashboardLandingPage();
       await PageObjects.dashboard.loadSavedDashboard('Overridden colors');
-      const colorChoiceRetained = await PageObjects.visualize.doesSelectedLegendColorExist(
+      const colorChoiceRetained = await PageObjects.visChart.doesSelectedLegendColorExist(
         '#EA6460'
       );
 
@@ -153,10 +160,10 @@ export default function({ getService, getPageObjects }) {
       await dashboardPanelActions.openContextMenu();
       await dashboardPanelActions.clickEdit();
 
-      await PageObjects.visualize.clickMapZoomIn();
-      await PageObjects.visualize.clickMapZoomIn();
-      await PageObjects.visualize.clickMapZoomIn();
-      await PageObjects.visualize.clickMapZoomIn();
+      await PageObjects.tileMap.clickMapZoomIn();
+      await PageObjects.tileMap.clickMapZoomIn();
+      await PageObjects.tileMap.clickMapZoomIn();
+      await PageObjects.tileMap.clickMapZoomIn();
 
       await PageObjects.visualize.saveVisualizationExpectSuccess('Visualization TileMap');
 
@@ -225,8 +232,8 @@ export default function({ getService, getPageObjects }) {
       describe('for embeddable config color parameters on a visualization', () => {
         it('updates a pie slice color on a soft refresh', async function() {
           await dashboardAddPanel.addVisualization(PIE_CHART_VIS_NAME);
-          await PageObjects.visualize.openLegendOptionColors('80,000');
-          await PageObjects.visualize.selectNewLegendColorChoice('#F9D9F9');
+          await PageObjects.visChart.openLegendOptionColors('80,000');
+          await PageObjects.visChart.selectNewLegendColorChoice('#F9D9F9');
           const currentUrl = await browser.getCurrentUrl();
           const newUrl = currentUrl.replace('F9D9F9', 'FFFFFF');
           await browser.get(newUrl.toString(), false);
@@ -248,7 +255,7 @@ export default function({ getService, getPageObjects }) {
         // Unskip once https://github.com/elastic/kibana/issues/15736 is fixed.
         it.skip('and updates the pie slice legend color', async function() {
           await retry.try(async () => {
-            const colorExists = await PageObjects.visualize.doesSelectedLegendColorExist('#FFFFFF');
+            const colorExists = await PageObjects.visChart.doesSelectedLegendColorExist('#FFFFFF');
             expect(colorExists).to.be(true);
           });
         });
@@ -269,7 +276,7 @@ export default function({ getService, getPageObjects }) {
         // Unskip once https://github.com/elastic/kibana/issues/15736 is fixed.
         it.skip('resets the legend color as well', async function() {
           await retry.try(async () => {
-            const colorExists = await PageObjects.visualize.doesSelectedLegendColorExist('#57c17b');
+            const colorExists = await PageObjects.visChart.doesSelectedLegendColorExist('#57c17b');
             expect(colorExists).to.be(true);
           });
         });
diff --git a/test/functional/apps/getting_started/_shakespeare.js b/test/functional/apps/getting_started/_shakespeare.js
index 04d81f4b46083d..5af1676cf423fb 100644
--- a/test/functional/apps/getting_started/_shakespeare.js
+++ b/test/functional/apps/getting_started/_shakespeare.js
@@ -23,7 +23,14 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const esArchiver = getService('esArchiver');
   const retry = getService('retry');
-  const PageObjects = getPageObjects(['console', 'common', 'settings', 'visualize']);
+  const PageObjects = getPageObjects([
+    'console',
+    'common',
+    'settings',
+    'visualize',
+    'visEditor',
+    'visChart',
+  ]);
 
   // https://www.elastic.co/guide/en/kibana/current/tutorial-load-dataset.html
 
@@ -63,11 +70,11 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickVerticalBarChart();
       await PageObjects.visualize.clickNewSearch('shakes*');
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
 
       const expectedChartValues = [111396];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Count');
+        const data = await PageObjects.visChart.getBarChartData('Count');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data[0] - expectedChartValues[0]).to.be.lessThan(5);
@@ -84,22 +91,22 @@ export default function({ getService, getPageObjects }) {
     it('should configure metric Unique Count Speaking Parts', async function() {
       log.debug('Metric = Unique Count, speaker, Speaking Parts');
       // this first change to the YAxis metric agg uses the default aggIndex of 1
-      await PageObjects.visualize.selectYAxisAggregation(
+      await PageObjects.visEditor.selectYAxisAggregation(
         'Unique Count',
         'speaker',
         'Speaking Parts'
       );
       // then increment the aggIndex for the next one we create
       aggIndex = aggIndex + 1;
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
       const expectedChartValues = [935];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
       });
-      const title = await PageObjects.visualize.getYAxisTitle();
+      const title = await PageObjects.visChart.getYAxisTitle();
       expect(title).to.be('Speaking Parts');
     });
 
@@ -110,23 +117,23 @@ export default function({ getService, getPageObjects }) {
     5. Click Apply changes images/apply-changes-button.png to view the results.
     */
     it('should configure Terms aggregation on play_name', async function() {
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Aggregation = Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       aggIndex = aggIndex + 1;
       log.debug('Field = play_name');
-      await PageObjects.visualize.selectField('play_name');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('play_name');
+      await PageObjects.visEditor.clickGo();
 
       const expectedChartValues = [71, 65, 62, 55, 55];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
       });
 
-      const labels = await PageObjects.visualize.getXAxisLabels();
+      const labels = await PageObjects.visChart.getXAxisLabels();
       expect(labels).to.eql([
         'Richard III',
         'Henry VI Part 2',
@@ -145,21 +152,21 @@ export default function({ getService, getPageObjects }) {
     2. Choose the Max aggregation and select the speech_number field.
     */
     it('should configure Max aggregation metric on speech_number', async function() {
-      await PageObjects.visualize.clickBucket('Y-axis', 'metrics');
+      await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
       log.debug('Aggregation = Max');
-      await PageObjects.visualize.selectYAxisAggregation(
+      await PageObjects.visEditor.selectYAxisAggregation(
         'Max',
         'speech_number',
         'Max Speaking Parts',
         aggIndex
       );
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
 
       const expectedChartValues = [71, 65, 62, 55, 55];
       const expectedChartValues2 = [177, 106, 153, 132, 162];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
-        const data2 = await PageObjects.visualize.getBarChartData('Max Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
+        const data2 = await PageObjects.visChart.getBarChartData('Max Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         log.debug('data2=' + data2);
@@ -168,7 +175,7 @@ export default function({ getService, getPageObjects }) {
         expect(data2).to.eql(expectedChartValues2);
       });
 
-      const labels = await PageObjects.visualize.getXAxisLabels();
+      const labels = await PageObjects.visChart.getXAxisLabels();
       expect(labels).to.eql([
         'Richard III',
         'Henry VI Part 2',
@@ -184,15 +191,15 @@ export default function({ getService, getPageObjects }) {
     4. Click Apply changes images/apply-changes-button.png. Your chart should now look like this:
     */
     it('should configure change options to normal bars', async function() {
-      await PageObjects.visualize.clickMetricsAndAxes();
-      await PageObjects.visualize.selectChartMode('normal');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickMetricsAndAxes();
+      await PageObjects.visEditor.selectChartMode('normal');
+      await PageObjects.visEditor.clickGo();
 
       const expectedChartValues = [71, 65, 62, 55, 55];
       const expectedChartValues2 = [177, 106, 153, 132, 162];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
-        const data2 = await PageObjects.visualize.getBarChartData('Max Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
+        const data2 = await PageObjects.visChart.getBarChartData('Max Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         log.debug('data2=' + data2);
@@ -210,15 +217,15 @@ export default function({ getService, getPageObjects }) {
     Save this chart with the name Bar Example.
     */
     it('should change the Y-Axis extents', async function() {
-      await PageObjects.visualize.setAxisExtents('50', '250');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setAxisExtents('50', '250');
+      await PageObjects.visEditor.clickGo();
 
       // same values as previous test except scaled down by the 50 for Y-Axis min
       const expectedChartValues = [21, 15, 12, 5, 5];
       const expectedChartValues2 = [127, 56, 103, 82, 112];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
-        const data2 = await PageObjects.visualize.getBarChartData('Max Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
+        const data2 = await PageObjects.visChart.getBarChartData('Max Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         log.debug('data2=' + data2);
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
index b8fa253f721047..e52cfdf478c33c 100644
--- a/test/functional/apps/visualize/_area_chart.js
+++ b/test/functional/apps/visualize/_area_chart.js
@@ -24,7 +24,14 @@ export default function({ getService, getPageObjects }) {
   const inspector = getService('inspector');
   const browser = getService('browser');
   const retry = getService('retry');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'header',
+    'timePicker',
+  ]);
 
   describe('area charts', function indexPatternCreation() {
     const vizName1 = 'Visualization AreaChart Name Test';
@@ -38,17 +45,17 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Click X-axis');
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Click Date Histogram');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
       log.debug('Check field value');
-      const fieldValues = await PageObjects.visualize.getField();
+      const fieldValues = await PageObjects.visEditor.getField();
       log.debug('fieldValue = ' + fieldValues);
       expect(fieldValues[0]).to.be('@timestamp');
-      const intervalValue = await PageObjects.visualize.getInterval();
+      const intervalValue = await PageObjects.visEditor.getInterval();
       log.debug('intervalValue = ' + intervalValue);
       expect(intervalValue[0]).to.be('Auto');
-      return PageObjects.visualize.clickGo();
+      return PageObjects.visEditor.clickGo();
     };
 
     before(initAreaChart);
@@ -70,7 +77,7 @@ export default function({ getService, getPageObjects }) {
     it('should save and load', async function() {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -113,14 +120,14 @@ export default function({ getService, getPageObjects }) {
       ];
 
       await retry.try(async function tryingForTime() {
-        const labels = await PageObjects.visualize.getXAxisLabels();
+        const labels = await PageObjects.visChart.getXAxisLabels();
         log.debug('X-Axis labels = ' + labels);
         expect(labels).to.eql(xAxisLabels);
       });
-      const labels = await PageObjects.visualize.getYAxisLabels();
+      const labels = await PageObjects.visChart.getYAxisLabels();
       log.debug('Y-Axis labels = ' + labels);
       expect(labels).to.eql(yAxisLabels);
-      const paths = await PageObjects.visualize.getAreaChartData('Count');
+      const paths = await PageObjects.visChart.getAreaChartData('Count');
       log.debug('expectedAreaChartData = ' + expectedAreaChartData);
       log.debug('actual chart data =     ' + paths);
       expect(paths).to.eql(expectedAreaChartData);
@@ -185,9 +192,9 @@ export default function({ getService, getPageObjects }) {
           ['2015-09-20 19:00', '55'],
         ];
 
-        await PageObjects.visualize.toggleOpenEditor(2);
-        await PageObjects.visualize.setInterval('Second');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(2);
+        await PageObjects.visEditor.setInterval('Second');
+        await PageObjects.visEditor.clickGo();
         await inspector.open();
         await inspector.expectTableData(expectedTableData);
         await inspector.close();
@@ -217,9 +224,9 @@ export default function({ getService, getPageObjects }) {
           ['2015-09-20 19:00', '0.015'],
         ];
 
-        await PageObjects.visualize.toggleAdvancedParams('2');
-        await PageObjects.visualize.toggleScaleMetrics();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleAdvancedParams('2');
+        await PageObjects.visEditor.toggleScaleMetrics();
+        await PageObjects.visEditor.clickGo();
         await inspector.open();
         await inspector.expectTableData(expectedTableData);
         await inspector.close();
@@ -249,11 +256,11 @@ export default function({ getService, getPageObjects }) {
           ['2015-09-20 19:00', '55', '2.053KB'],
         ];
 
-        await PageObjects.visualize.clickBucket('Y-axis', 'metrics');
-        await PageObjects.visualize.selectAggregation('Top Hit', 'metrics');
-        await PageObjects.visualize.selectField('bytes', 'metrics');
-        await PageObjects.visualize.selectAggregateWith('average');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
+        await PageObjects.visEditor.selectAggregation('Top Hit', 'metrics');
+        await PageObjects.visEditor.selectField('bytes', 'metrics');
+        await PageObjects.visEditor.selectAggregateWith('average');
+        await PageObjects.visEditor.clickGo();
         await inspector.open();
         await inspector.expectTableData(expectedTableData);
         await inspector.close();
@@ -285,13 +292,13 @@ export default function({ getService, getPageObjects }) {
       const axisId = 'ValueAxis-1';
 
       it('should show ticks on selecting log scale', async () => {
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
-        await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.clickYAxisAdvancedOptions(axisId);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -317,9 +324,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -345,10 +352,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'square root');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '0',
           '200',
@@ -364,18 +371,18 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'linear');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         log.debug(labels);
         const expectedLabels = [
           '0',
@@ -392,9 +399,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
@@ -412,16 +419,16 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch('long-window-logstash-*');
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
         log.debug('Click X-axis');
-        await PageObjects.visualize.clickBucket('X-axis');
+        await PageObjects.visEditor.clickBucket('X-axis');
         log.debug('Click Date Histogram');
-        await PageObjects.visualize.selectAggregation('Date Histogram');
-        await PageObjects.visualize.selectField('@timestamp');
-        await PageObjects.visualize.setInterval('Yearly');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.selectAggregation('Date Histogram');
+        await PageObjects.visEditor.selectField('@timestamp');
+        await PageObjects.visEditor.setInterval('Yearly');
+        await PageObjects.visEditor.clickGo();
         // This svg area is composed by 7 years (2013 - 2019).
         // 7 points are used to draw the upper line (usually called y1)
         // 7 points compose the lower line (usually called y0)
-        const paths = await PageObjects.visualize.getAreaChartPaths('Count');
+        const paths = await PageObjects.visChart.getAreaChartPaths('Count');
         log.debug('actual chart data =     ' + paths);
         const numberOfSegments = 7 * 2;
         expect(paths.length).to.eql(numberOfSegments);
@@ -435,17 +442,17 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch('long-window-logstash-*');
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
         log.debug('Click X-axis');
-        await PageObjects.visualize.clickBucket('X-axis');
+        await PageObjects.visEditor.clickBucket('X-axis');
         log.debug('Click Date Histogram');
-        await PageObjects.visualize.selectAggregation('Date Histogram');
-        await PageObjects.visualize.selectField('@timestamp');
-        await PageObjects.visualize.setInterval('Monthly');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.selectAggregation('Date Histogram');
+        await PageObjects.visEditor.selectField('@timestamp');
+        await PageObjects.visEditor.setInterval('Monthly');
+        await PageObjects.visEditor.clickGo();
         // This svg area is composed by 67 months 3 (2013) + 5 * 12 + 4 (2019)
         // 67 points are used to draw the upper line (usually called y1)
         // 67 points compose the lower line (usually called y0)
         const numberOfSegments = 67 * 2;
-        const paths = await PageObjects.visualize.getAreaChartPaths('Count');
+        const paths = await PageObjects.visChart.getAreaChartPaths('Count');
         log.debug('actual chart data =     ' + paths);
         expect(paths.length).to.eql(numberOfSegments);
       });
diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
index e8fe8fb656877f..0a9ff1e77a2ef1 100644
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@@ -22,9 +22,10 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const inspector = getService('inspector');
+  const testSubjects = getService('testSubjects');
   const retry = getService('retry');
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'timePicker', 'visEditor', 'visChart']);
 
   describe('data table', function indexPatternCreation() {
     const vizName1 = 'Visualization DataTable';
@@ -38,27 +39,27 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = Split rows');
-      await PageObjects.visualize.clickBucket('Split rows');
+      await PageObjects.visEditor.clickBucket('Split rows');
       log.debug('Aggregation = Histogram');
-      await PageObjects.visualize.selectAggregation('Histogram');
+      await PageObjects.visEditor.selectAggregation('Histogram');
       log.debug('Field = bytes');
-      await PageObjects.visualize.selectField('bytes');
+      await PageObjects.visEditor.selectField('bytes');
       log.debug('Interval = 2000');
-      await PageObjects.visualize.setNumericInterval('2000');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setInterval('2000', { type: 'numeric' });
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should allow applying changed params', async () => {
-      await PageObjects.visualize.setNumericInterval('1', { append: true });
-      const interval = await PageObjects.visualize.getNumericInterval();
+      await PageObjects.visEditor.setInterval('1', { type: 'numeric', append: true });
+      const interval = await PageObjects.visEditor.getNumericInterval();
       expect(interval).to.be('20001');
-      const isApplyButtonEnabled = await PageObjects.visualize.isApplyEnabled();
+      const isApplyButtonEnabled = await PageObjects.visEditor.isApplyEnabled();
       expect(isApplyButtonEnabled).to.be(true);
     });
 
     it('should allow reseting changed params', async () => {
-      await PageObjects.visualize.clickReset();
-      const interval = await PageObjects.visualize.getNumericInterval();
+      await PageObjects.visEditor.clickReset();
+      const interval = await PageObjects.visEditor.getNumericInterval();
       expect(interval).to.be('2000');
     });
 
@@ -66,7 +67,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -96,7 +97,7 @@ export default function({ getService, getPageObjects }) {
 
     it('should show percentage columns', async () => {
       async function expectValidTableData() {
-        const data = await PageObjects.visualize.getTableVisData();
+        const data = await PageObjects.visChart.getTableVisData();
         expect(data.trim().split('\n')).to.be.eql([
           '≥ 0 and < 1000',
           '1,351 64.7%',
@@ -110,16 +111,16 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Range');
-      await PageObjects.visualize.selectField('bytes');
-      await PageObjects.visualize.clickGo();
-      await PageObjects.visualize.clickOptionsTab();
-      await PageObjects.visualize.setSelectByOptionText(
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Range');
+      await PageObjects.visEditor.selectField('bytes');
+      await PageObjects.visEditor.clickGo();
+      await PageObjects.visEditor.clickOptionsTab();
+      await PageObjects.visEditor.setSelectByOptionText(
         'datatableVisualizationPercentageCol',
         'Count'
       );
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
 
       await expectValidTableData();
 
@@ -128,20 +129,20 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(SAVE_NAME);
 
       await PageObjects.visualize.loadSavedVisualization(SAVE_NAME);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
 
       await expectValidTableData();
 
       // check that it works after selecting a column that's deleted
-      await PageObjects.visualize.clickData();
-      await PageObjects.visualize.clickBucket('Metric', 'metrics');
-      await PageObjects.visualize.selectAggregation('Average', 'metrics');
-      await PageObjects.visualize.selectField('bytes', 'metrics');
-      await PageObjects.visualize.removeDimension(1);
-      await PageObjects.visualize.clickGo();
-      await PageObjects.visualize.clickOptionsTab();
-
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickDataTab();
+      await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Average', 'metrics');
+      await PageObjects.visEditor.selectField('bytes', 'metrics');
+      await PageObjects.visEditor.removeDimension(1);
+      await PageObjects.visEditor.clickGo();
+      await PageObjects.visEditor.clickOptionsTab();
+
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
         '≥ 0 and < 1000',
         '344.094B',
@@ -155,12 +156,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Metric', 'metrics');
-      await PageObjects.visualize.selectAggregation('Average Bucket', 'metrics');
-      await PageObjects.visualize.selectAggregation('Terms', 'metrics', 'buckets');
-      await PageObjects.visualize.selectField('geo.src', 'metrics', 'buckets');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Average Bucket', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Terms', 'metrics', 'buckets');
+      await PageObjects.visEditor.selectField('geo.src', 'metrics', 'buckets');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data.split('\n'));
       expect(data.trim().split('\n')).to.be.eql(['14,004 1,412.6']);
     });
@@ -170,12 +171,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setInterval('Daily');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('Daily');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data.split('\n'));
       expect(data.trim().split('\n')).to.be.eql([
         '2015-09-20',
@@ -192,12 +193,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setInterval('Daily');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('Daily');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
         '2015-09-20',
         '4,757',
@@ -210,15 +211,15 @@ export default function({ getService, getPageObjects }) {
 
     it('should correctly filter for applied time filter on the main timefield', async () => {
       await filterBar.addFilter('@timestamp', 'is between', '2015-09-19', '2015-09-21');
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql(['2015-09-20', '4,757']);
     });
 
     it('should correctly filter for pinned filters', async () => {
       await filterBar.toggleFilterPinned('@timestamp');
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql(['2015-09-20', '4,757']);
     });
 
@@ -227,11 +228,11 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickMetricEditor();
-      await PageObjects.visualize.selectAggregation('Top Hit', 'metrics');
-      await PageObjects.visualize.selectField('agent.raw', 'metrics');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickMetricEditor();
+      await PageObjects.visEditor.selectAggregation('Top Hit', 'metrics');
+      await PageObjects.visEditor.selectField('agent.raw', 'metrics');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data);
       expect(data.length).to.be.greaterThan(0);
     });
@@ -241,11 +242,11 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Range');
-      await PageObjects.visualize.selectField('bytes');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Range');
+      await PageObjects.visEditor.selectField('bytes');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
         '≥ 0 and < 1000',
         '1,351',
@@ -260,19 +261,19 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickDataTable();
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('extension.raw');
-        await PageObjects.visualize.setSize(2);
-        await PageObjects.visualize.clickGo();
-
-        await PageObjects.visualize.toggleOtherBucket();
-        await PageObjects.visualize.toggleMissingBucket();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('extension.raw');
+        await PageObjects.visEditor.setSize(2);
+        await PageObjects.visEditor.clickGo();
+
+        await PageObjects.visEditor.toggleOtherBucket();
+        await PageObjects.visEditor.toggleMissingBucket();
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should show correct data', async () => {
-        const data = await PageObjects.visualize.getTableVisContent();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', '9,109'],
           ['css', '2,159'],
@@ -281,9 +282,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should apply correct filter', async () => {
-        await PageObjects.visualize.filterOnTableCell(1, 3);
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visChart.filterOnTableCell(1, 3);
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['png', '1,373'],
           ['gif', '918'],
@@ -298,20 +299,20 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickDataTable();
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('extension.raw');
-        await PageObjects.visualize.setSize(2);
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.dest');
-        await PageObjects.visualize.toggleOpenEditor(3, 'false');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('extension.raw');
+        await PageObjects.visEditor.setSize(2);
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.dest');
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should show correct data without showMetricsAtAllLevels', async () => {
-        const data = await PageObjects.visualize.getTableVisContent();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', 'CN', '1,718'],
           ['jpg', 'IN', '1,511'],
@@ -327,10 +328,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show correct data without showMetricsAtAllLevels even if showPartialRows is selected', async () => {
-        await PageObjects.visualize.clickOptionsTab();
-        await PageObjects.visualize.checkCheckbox('showPartialRows');
-        await PageObjects.visualize.clickGo();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visEditor.clickOptionsTab();
+        await testSubjects.setCheckbox('showPartialRows', 'check');
+        await PageObjects.visEditor.clickGo();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', 'CN', '1,718'],
           ['jpg', 'IN', '1,511'],
@@ -346,10 +347,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show metrics on each level', async () => {
-        await PageObjects.visualize.clickOptionsTab();
-        await PageObjects.visualize.checkCheckbox('showMetricsAtAllLevels');
-        await PageObjects.visualize.clickGo();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visEditor.clickOptionsTab();
+        await testSubjects.setCheckbox('showMetricsAtAllLevels', 'check');
+        await PageObjects.visEditor.clickGo();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', '9,109', 'CN', '1,718'],
           ['jpg', '9,109', 'IN', '1,511'],
@@ -365,12 +366,12 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show metrics other than count on each level', async () => {
-        await PageObjects.visualize.clickData();
-        await PageObjects.visualize.clickBucket('Metric', 'metrics');
-        await PageObjects.visualize.selectAggregation('Average', 'metrics');
-        await PageObjects.visualize.selectField('bytes', 'metrics');
-        await PageObjects.visualize.clickGo();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visEditor.clickDataTab();
+        await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+        await PageObjects.visEditor.selectAggregation('Average', 'metrics');
+        await PageObjects.visEditor.selectField('bytes', 'metrics');
+        await PageObjects.visEditor.clickGo();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', '9,109', '5.469KB', 'CN', '1,718', '5.477KB'],
           ['jpg', '9,109', '5.469KB', 'IN', '1,511', '5.456KB'],
@@ -392,26 +393,26 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickDataTable();
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.clickBucket('Split table');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('extension.raw');
-        await PageObjects.visualize.setSize(2);
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.dest');
-        await PageObjects.visualize.setSize(3, 3);
-        await PageObjects.visualize.toggleOpenEditor(3, 'false');
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.src');
-        await PageObjects.visualize.setSize(3, 4);
-        await PageObjects.visualize.toggleOpenEditor(4, 'false');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split table');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('extension.raw');
+        await PageObjects.visEditor.setSize(2);
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.dest');
+        await PageObjects.visEditor.setSize(3, 3);
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.src');
+        await PageObjects.visEditor.setSize(3, 4);
+        await PageObjects.visEditor.toggleOpenEditor(4, 'false');
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should have a splitted table', async () => {
-        const data = await PageObjects.visualize.getTableVisContent();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           [
             ['CN', 'CN', '330'],
@@ -439,10 +440,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show metrics for split bucket when using showMetricsAtAllLevels', async () => {
-        await PageObjects.visualize.clickOptionsTab();
-        await PageObjects.visualize.checkCheckbox('showMetricsAtAllLevels');
-        await PageObjects.visualize.clickGo();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visEditor.clickOptionsTab();
+        await testSubjects.setCheckbox('showMetricsAtAllLevels', 'check');
+        await PageObjects.visEditor.clickGo();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           [
             ['CN', '1,718', 'CN', '330'],
diff --git a/test/functional/apps/visualize/_data_table_nontimeindex.js b/test/functional/apps/visualize/_data_table_nontimeindex.js
index 77478f5d10edcb..3db3cd094a81b4 100644
--- a/test/functional/apps/visualize/_data_table_nontimeindex.js
+++ b/test/functional/apps/visualize/_data_table_nontimeindex.js
@@ -25,7 +25,7 @@ export default function({ getService, getPageObjects }) {
   const retry = getService('retry');
   const filterBar = getService('filterBar');
   const renderable = getService('renderable');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'header', 'visChart']);
 
   describe.skip('data table with index without time filter', function indexPatternCreation() {
     const vizName1 = 'Visualization DataTable without time filter';
@@ -40,27 +40,27 @@ export default function({ getService, getPageObjects }) {
         PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED
       );
       log.debug('Bucket = Split Rows');
-      await PageObjects.visualize.clickBucket('Split rows');
+      await PageObjects.visEditor.clickBucket('Split rows');
       log.debug('Aggregation = Histogram');
-      await PageObjects.visualize.selectAggregation('Histogram');
+      await PageObjects.visEditor.selectAggregation('Histogram');
       log.debug('Field = bytes');
-      await PageObjects.visualize.selectField('bytes');
+      await PageObjects.visEditor.selectField('bytes');
       log.debug('Interval = 2000');
-      await PageObjects.visualize.setNumericInterval('2000');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setInterval('2000', { type: 'numeric' });
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should allow applying changed params', async () => {
-      await PageObjects.visualize.setNumericInterval('1', { append: true });
-      const interval = await PageObjects.visualize.getNumericInterval();
+      await PageObjects.visEditor.setInterval('1', { type: 'numeric', append: true });
+      const interval = await PageObjects.visEditor.getNumericInterval();
       expect(interval).to.be('20001');
-      const isApplyButtonEnabled = await PageObjects.visualize.isApplyEnabled();
+      const isApplyButtonEnabled = await PageObjects.visEditor.isApplyEnabled();
       expect(isApplyButtonEnabled).to.be(true);
     });
 
     it('should allow reseting changed params', async () => {
-      await PageObjects.visualize.clickReset();
-      const interval = await PageObjects.visualize.getNumericInterval();
+      await PageObjects.visEditor.clickReset();
+      const interval = await PageObjects.visEditor.getNumericInterval();
       expect(interval).to.be('2000');
     });
 
@@ -68,7 +68,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -102,12 +102,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch(
         PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED
       );
-      await PageObjects.visualize.clickBucket('Metric', 'metrics');
-      await PageObjects.visualize.selectAggregation('Average Bucket', 'metrics');
-      await PageObjects.visualize.selectAggregation('Terms', 'metrics', 'buckets');
-      await PageObjects.visualize.selectField('geo.src', 'metrics', 'buckets');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Average Bucket', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Terms', 'metrics', 'buckets');
+      await PageObjects.visEditor.selectField('geo.src', 'metrics', 'buckets');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data.split('\n'));
       expect(data.trim().split('\n')).to.be.eql(['14,004 1,412.6']);
     });
@@ -118,12 +118,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch(
         PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED
       );
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setInterval('Daily');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('Daily');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data.split('\n'));
       expect(data.trim().split('\n')).to.be.eql([
         '2015-09-20',
@@ -141,12 +141,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch(
         PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED
       );
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setInterval('Daily');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('Daily');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
         '2015-09-20',
         '4,757',
@@ -161,7 +161,7 @@ export default function({ getService, getPageObjects }) {
       await filterBar.addFilter('@timestamp', 'is between', '2015-09-19', '2015-09-21');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await renderable.waitForRender();
-      const data = await PageObjects.visualize.getTableVisData();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql(['2015-09-20', '4,757']);
     });
 
@@ -169,7 +169,7 @@ export default function({ getService, getPageObjects }) {
       await filterBar.toggleFilterPinned('@timestamp');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await renderable.waitForRender();
-      const data = await PageObjects.visualize.getTableVisData();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql(['2015-09-20', '4,757']);
     });
   });
diff --git a/test/functional/apps/visualize/_embedding_chart.js b/test/functional/apps/visualize/_embedding_chart.js
index c16dc3b1279ff7..940aa3eb5d4628 100644
--- a/test/functional/apps/visualize/_embedding_chart.js
+++ b/test/functional/apps/visualize/_embedding_chart.js
@@ -24,7 +24,13 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const renderable = getService('renderable');
   const embedding = getService('embedding');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'visualize',
+    'visEditor',
+    'visChart',
+    'header',
+    'timePicker',
+  ]);
 
   describe('embedding', () => {
     describe('a data table', () => {
@@ -33,22 +39,22 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickDataTable();
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Date Histogram');
-        await PageObjects.visualize.selectField('@timestamp');
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Histogram');
-        await PageObjects.visualize.selectField('bytes');
-        await PageObjects.visualize.setNumericInterval('2000', undefined, 3);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Date Histogram');
+        await PageObjects.visEditor.selectField('@timestamp');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Histogram');
+        await PageObjects.visEditor.selectField('bytes');
+        await PageObjects.visEditor.setInterval('2000', { type: 'numeric', aggNth: 3 });
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should allow opening table vis in embedded mode', async () => {
         await embedding.openInEmbeddedMode();
         await renderable.waitForRender();
 
-        const data = await PageObjects.visualize.getTableVisData();
+        const data = await PageObjects.visChart.getTableVisData();
         log.debug(data.split('\n'));
         expect(data.trim().split('\n')).to.be.eql([
           '2015-09-20 00:00',
@@ -89,7 +95,7 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
 
-        const data = await PageObjects.visualize.getTableVisData();
+        const data = await PageObjects.visChart.getTableVisData();
         log.debug(data.split('\n'));
         expect(data.trim().split('\n')).to.be.eql([
           '2015-09-21 00:00',
@@ -126,11 +132,11 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should allow to change timerange from the visualization in embedded mode', async () => {
-        await PageObjects.visualize.filterOnTableCell(1, 7);
+        await PageObjects.visChart.filterOnTableCell(1, 7);
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
 
-        const data = await PageObjects.visualize.getTableVisData();
+        const data = await PageObjects.visChart.getTableVisData();
         log.debug(data.split('\n'));
         expect(data.trim().split('\n')).to.be.eql([
           '03:00',
diff --git a/test/functional/apps/visualize/_experimental_vis.js b/test/functional/apps/visualize/_experimental_vis.js
index ae364244b4f5c0..2ce15cf913eff1 100644
--- a/test/functional/apps/visualize/_experimental_vis.js
+++ b/test/functional/apps/visualize/_experimental_vis.js
@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default ({ getService, getPageObjects }) => {
   const log = getService('log');
-  const PageObjects = getPageObjects(['common', 'visualize']);
+  const PageObjects = getPageObjects(['visualize']);
 
   describe('visualize app', function() {
     this.tags('smoke');
diff --git a/test/functional/apps/visualize/_gauge_chart.js b/test/functional/apps/visualize/_gauge_chart.js
index 2b9033d1ae9d2b..7ebb4548f967ba 100644
--- a/test/functional/apps/visualize/_gauge_chart.js
+++ b/test/functional/apps/visualize/_gauge_chart.js
@@ -24,7 +24,7 @@ export default function({ getService, getPageObjects }) {
   const retry = getService('retry');
   const inspector = getService('inspector');
   const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   // FLAKY: https://github.com/elastic/kibana/issues/45089
   describe('gauge chart', function indexPatternCreation() {
@@ -50,24 +50,24 @@ export default function({ getService, getPageObjects }) {
 
       // initial metric of "Count" is selected by default
       return retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getGaugeValue();
+        const metricValue = await PageObjects.visChart.getGaugeValue();
         expect(expectedCount).to.eql(metricValue);
       });
     });
 
     it('should show Split Gauges', async function() {
       log.debug('Bucket = Split Group');
-      await PageObjects.visualize.clickBucket('Split group');
+      await PageObjects.visEditor.clickBucket('Split group');
       log.debug('Aggregation = Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       log.debug('Field = machine.os.raw');
-      await PageObjects.visualize.selectField('machine.os.raw');
+      await PageObjects.visEditor.selectField('machine.os.raw');
       log.debug('Size = 4');
-      await PageObjects.visualize.setSize('4');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setSize('4');
+      await PageObjects.visEditor.clickGo();
 
       await retry.try(async () => {
-        expect(await PageObjects.visualize.getGaugeValue()).to.eql([
+        expect(await PageObjects.visChart.getGaugeValue()).to.eql([
           '2,904',
           'win 8',
           '2,858',
@@ -83,34 +83,34 @@ export default function({ getService, getPageObjects }) {
     it('should show correct values for fields with fieldFormatters', async function() {
       const expectedTexts = ['2,904', 'win 8: Count', '0B', 'win 8: Min bytes'];
 
-      await PageObjects.visualize.selectAggregation('Terms');
-      await PageObjects.visualize.selectField('machine.os.raw');
-      await PageObjects.visualize.setSize('1');
-      await PageObjects.visualize.clickBucket('Metric', 'metrics');
-      await PageObjects.visualize.selectAggregation('Min', 'metrics');
-      await PageObjects.visualize.selectField('bytes', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectAggregation('Terms');
+      await PageObjects.visEditor.selectField('machine.os.raw');
+      await PageObjects.visEditor.setSize('1');
+      await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Min', 'metrics');
+      await PageObjects.visEditor.selectField('bytes', 'metrics');
+      await PageObjects.visEditor.clickGo();
 
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getGaugeValue();
+        const metricValue = await PageObjects.visChart.getGaugeValue();
         expect(expectedTexts).to.eql(metricValue);
       });
     });
 
     it('should format the metric correctly in percentage mode', async function() {
       await initGaugeVis();
-      await PageObjects.visualize.clickMetricEditor();
-      await PageObjects.visualize.selectAggregation('Average', 'metrics');
-      await PageObjects.visualize.selectField('bytes', 'metrics');
-      await PageObjects.visualize.clickOptionsTab();
+      await PageObjects.visEditor.clickMetricEditor();
+      await PageObjects.visEditor.selectAggregation('Average', 'metrics');
+      await PageObjects.visEditor.selectField('bytes', 'metrics');
+      await PageObjects.visEditor.clickOptionsTab();
       await testSubjects.setValue('gaugeColorRange2__to', '10000');
       await testSubjects.click('gaugePercentageMode');
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      await PageObjects.visEditor.clickGo();
 
       await retry.try(async function tryingForTime() {
         const expectedTexts = ['57.273%', 'Average bytes'];
-        const metricValue = await PageObjects.visualize.getGaugeValue();
+        const metricValue = await PageObjects.visChart.getGaugeValue();
         expect(expectedTexts).to.eql(metricValue);
       });
     });
diff --git a/test/functional/apps/visualize/_heatmap_chart.js b/test/functional/apps/visualize/_heatmap_chart.js
index 226e490a6b2321..2cea861d0f64df 100644
--- a/test/functional/apps/visualize/_heatmap_chart.js
+++ b/test/functional/apps/visualize/_heatmap_chart.js
@@ -22,7 +22,7 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('heatmap chart', function indexPatternCreation() {
     this.tags('smoke');
@@ -36,20 +36,20 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = X-Axis');
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Aggregation = Date Histogram');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
       log.debug('Field = @timestamp');
-      await PageObjects.visualize.selectField('@timestamp');
+      await PageObjects.visEditor.selectField('@timestamp');
       // leaving Interval set to Auto
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should save and load', async function() {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -87,16 +87,16 @@ export default function({ getService, getPageObjects }) {
     });
 
     it('should show 4 color ranges as default colorNumbers param', async function() {
-      const legends = await PageObjects.visualize.getLegendEntries();
+      const legends = await PageObjects.visChart.getLegendEntries();
       const expectedLegends = ['0 - 400', '400 - 800', '800 - 1,200', '1,200 - 1,600'];
       expect(legends).to.eql(expectedLegends);
     });
 
     it('should show 6 color ranges if changed on options', async function() {
-      await PageObjects.visualize.clickOptionsTab();
-      await PageObjects.visualize.changeHeatmapColorNumbers(6);
-      await PageObjects.visualize.clickGo();
-      const legends = await PageObjects.visualize.getLegendEntries();
+      await PageObjects.visEditor.clickOptionsTab();
+      await PageObjects.visEditor.changeHeatmapColorNumbers(6);
+      await PageObjects.visEditor.clickGo();
+      const legends = await PageObjects.visChart.getLegendEntries();
       const expectedLegends = [
         '0 - 267',
         '267 - 534',
@@ -108,23 +108,23 @@ export default function({ getService, getPageObjects }) {
       expect(legends).to.eql(expectedLegends);
     });
     it('should show 6 custom color ranges', async function() {
-      await PageObjects.visualize.clickOptionsTab();
-      await PageObjects.visualize.clickEnableCustomRanges();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
+      await PageObjects.visEditor.clickOptionsTab();
+      await PageObjects.visEditor.clickEnableCustomRanges();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
 
       log.debug('customize 2 last ranges');
-      await PageObjects.visualize.setCustomRangeByIndex(6, '650', '720');
-      await PageObjects.visualize.setCustomRangeByIndex(7, '800', '905');
+      await PageObjects.visEditor.setCustomRangeByIndex(6, '650', '720');
+      await PageObjects.visEditor.setCustomRangeByIndex(7, '800', '905');
 
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-      await PageObjects.visualize.clickGo();
-      const legends = await PageObjects.visualize.getLegendEntries();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      await PageObjects.visEditor.clickGo();
+      const legends = await PageObjects.visChart.getLegendEntries();
       const expectedLegends = [
         '0 - 100',
         '100 - 200',
diff --git a/test/functional/apps/visualize/_histogram_request_start.js b/test/functional/apps/visualize/_histogram_request_start.js
index a601e370a568f6..a74fa8856a3b3c 100644
--- a/test/functional/apps/visualize/_histogram_request_start.js
+++ b/test/functional/apps/visualize/_histogram_request_start.js
@@ -22,7 +22,13 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'timePicker',
+  ]);
 
   describe('histogram agg onSearchRequestStart', function() {
     before(async function() {
@@ -33,21 +39,21 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = Split Rows');
-      await PageObjects.visualize.clickBucket('Split rows');
+      await PageObjects.visEditor.clickBucket('Split rows');
       log.debug('Aggregation = Histogram');
-      await PageObjects.visualize.selectAggregation('Histogram');
+      await PageObjects.visEditor.selectAggregation('Histogram');
       log.debug('Field = machine.ram');
-      await PageObjects.visualize.selectField('machine.ram');
+      await PageObjects.visEditor.selectField('machine.ram');
     });
 
     describe('interval parameter uses autoBounds', function() {
       it('should use provided value when number of generated buckets is less than histogram:maxBars', async function() {
         const providedInterval = 2400000000;
         log.debug(`Interval = ${providedInterval}`);
-        await PageObjects.visualize.setNumericInterval(providedInterval);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.setInterval(providedInterval, { type: 'numeric' });
+        await PageObjects.visEditor.clickGo();
         await retry.try(async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           const dataArray = data.replace(/,/g, '').split('\n');
           expect(dataArray.length).to.eql(20);
           const bucketStart = parseInt(dataArray[0], 10);
@@ -60,11 +66,11 @@ export default function({ getService, getPageObjects }) {
       it('should scale value to round number when number of generated buckets is greater than histogram:maxBars', async function() {
         const providedInterval = 100;
         log.debug(`Interval = ${providedInterval}`);
-        await PageObjects.visualize.setNumericInterval(providedInterval);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.setInterval(providedInterval, { type: 'numeric' });
+        await PageObjects.visEditor.clickGo();
         await PageObjects.common.sleep(1000); //fix this
         await retry.try(async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           const dataArray = data.replace(/,/g, '').split('\n');
           expect(dataArray.length).to.eql(20);
           const bucketStart = parseInt(dataArray[0], 10);
diff --git a/test/functional/apps/visualize/_inspector.js b/test/functional/apps/visualize/_inspector.js
index 76b75f62b5f2ab..84f955d9c78792 100644
--- a/test/functional/apps/visualize/_inspector.js
+++ b/test/functional/apps/visualize/_inspector.js
@@ -21,7 +21,7 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const inspector = getService('inspector');
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('inspector', function describeIndexTests() {
     this.tags('smoke');
@@ -39,10 +39,10 @@ export default function({ getService, getPageObjects }) {
         await inspector.expectTableHeaders(['Count']);
 
         log.debug('Add Average Metric on machine.ram field');
-        await PageObjects.visualize.clickBucket('Y-axis', 'metrics');
-        await PageObjects.visualize.selectAggregation('Average', 'metrics');
-        await PageObjects.visualize.selectField('machine.ram', 'metrics');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
+        await PageObjects.visEditor.selectAggregation('Average', 'metrics');
+        await PageObjects.visEditor.selectField('machine.ram', 'metrics');
+        await PageObjects.visEditor.clickGo();
         await inspector.open();
         await inspector.expectTableHeaders(['Count', 'Average machine.ram']);
       });
@@ -50,23 +50,23 @@ export default function({ getService, getPageObjects }) {
       describe('filtering on inspector table values', function() {
         before(async function() {
           log.debug('Add X-axis terms agg on machine.os.raw');
-          await PageObjects.visualize.clickBucket('X-axis');
-          await PageObjects.visualize.selectAggregation('Terms');
-          await PageObjects.visualize.selectField('machine.os.raw');
-          await PageObjects.visualize.setSize(2);
-          await PageObjects.visualize.toggleOtherBucket(3);
-          await PageObjects.visualize.clickGo();
+          await PageObjects.visEditor.clickBucket('X-axis');
+          await PageObjects.visEditor.selectAggregation('Terms');
+          await PageObjects.visEditor.selectField('machine.os.raw');
+          await PageObjects.visEditor.setSize(2);
+          await PageObjects.visEditor.toggleOtherBucket(3);
+          await PageObjects.visEditor.clickGo();
         });
 
         beforeEach(async function() {
           await inspector.open();
-          await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+          await PageObjects.visChart.waitForVisualizationRenderingStabilized();
         });
 
         afterEach(async function() {
           await inspector.close();
           await filterBar.removeFilter('machine.os.raw');
-          await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+          await PageObjects.visChart.waitForVisualizationRenderingStabilized();
         });
 
         it('should allow filtering for values', async function() {
diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
index 6a0a21e76924de..becf66f0fd5b1b 100644
--- a/test/functional/apps/visualize/_line_chart.js
+++ b/test/functional/apps/visualize/_line_chart.js
@@ -24,7 +24,13 @@ export default function({ getService, getPageObjects }) {
   const inspector = getService('inspector');
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'timePicker',
+  ]);
 
   describe('line charts', function() {
     const vizName1 = 'Visualization LineChart';
@@ -37,14 +43,14 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = Split chart');
-      await PageObjects.visualize.clickBucket('Split chart');
+      await PageObjects.visEditor.clickBucket('Split chart');
       log.debug('Aggregation = Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       log.debug('Field = extension');
-      await PageObjects.visualize.selectField('extension.raw');
+      await PageObjects.visEditor.selectField('extension.raw');
       log.debug('switch from Rows to Columns');
-      await PageObjects.visualize.clickSplitDirection('Columns');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickSplitDirection('Columns');
+      await PageObjects.visEditor.clickGo();
     };
 
     before(initLineChart);
@@ -60,7 +66,7 @@ export default function({ getService, getPageObjects }) {
 
       // sleep a bit before trying to get the chart data
       await PageObjects.common.sleep(3000);
-      const data = await PageObjects.visualize.getLineChartData();
+      const data = await PageObjects.visChart.getLineChartData();
       log.debug('data=' + data);
       const tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
       for (let x = 0; x < data.length; x++) {
@@ -91,10 +97,10 @@ export default function({ getService, getPageObjects }) {
       const expectedChartData = ['png 1,373', 'php 445', 'jpg 9,109', 'gif 918', 'css 2,159'];
 
       log.debug('Order By = Term');
-      await PageObjects.visualize.selectOrderByMetric(2, '_key');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectOrderByMetric(2, '_key');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function() {
-        const data = await PageObjects.visualize.getLineChartData();
+        const data = await PageObjects.visChart.getLineChartData();
         log.debug('data=' + data);
         const tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
         for (let x = 0; x < data.length; x++) {
@@ -172,7 +178,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     describe.skip('switch between Y axis scale types', () => {
@@ -180,13 +186,13 @@ export default function({ getService, getPageObjects }) {
       const axisId = 'ValueAxis-1';
 
       it('should show ticks on selecting log scale', async () => {
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
-        await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.clickYAxisAdvancedOptions(axisId);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -212,9 +218,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -240,36 +246,36 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'square root');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['0', '2,000', '4,000', '6,000', '8,000', '10,000'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show filtered ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['2,000', '4,000', '6,000', '8,000'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'linear');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         log.debug(labels);
         const expectedLabels = ['0', '2,000', '4,000', '6,000', '8,000', '10,000'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show filtered ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['2,000', '4,000', '6,000', '8,000'];
         expect(labels).to.eql(expectedLabels);
       });
diff --git a/test/functional/apps/visualize/_linked_saved_searches.js b/test/functional/apps/visualize/_linked_saved_searches.js
index 9bbe8c9d2147cc..37ec3f06f2ecd0 100644
--- a/test/functional/apps/visualize/_linked_saved_searches.js
+++ b/test/functional/apps/visualize/_linked_saved_searches.js
@@ -22,7 +22,14 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
   const retry = getService('retry');
-  const PageObjects = getPageObjects(['common', 'discover', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'discover',
+    'visualize',
+    'header',
+    'timePicker',
+    'visChart',
+  ]);
 
   describe('visualize app', function describeIndexTests() {
     describe('linked saved searched', () => {
@@ -43,7 +50,7 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickSavedSearch(savedSearchName);
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         await retry.waitFor('wait for count to equal 9,109', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '9,109';
         });
       });
@@ -54,7 +61,7 @@ export default function({ getService, getPageObjects }) {
           'Sep 21, 2015 @ 10:00:00.000'
         );
         await retry.waitFor('wait for count to equal 3,950', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '3,950';
         });
       });
@@ -63,7 +70,7 @@ export default function({ getService, getPageObjects }) {
         await filterBar.addFilter('bytes', 'is between', '100', '3000');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await retry.waitFor('wait for count to equal 707', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '707';
         });
       });
@@ -71,7 +78,7 @@ export default function({ getService, getPageObjects }) {
       it('should allow unlinking from a linked search', async () => {
         await PageObjects.visualize.clickUnlinkSavedSearch();
         await retry.waitFor('wait for count to equal 707', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '707';
         });
         // The filter on the saved search should now be in the editor
@@ -82,7 +89,7 @@ export default function({ getService, getPageObjects }) {
         await filterBar.toggleFilterEnabled('extension.raw');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await retry.waitFor('wait for count to equal 1,293', async () => {
-          const unfilteredData = await PageObjects.visualize.getTableVisData();
+          const unfilteredData = await PageObjects.visChart.getTableVisData();
           return unfilteredData.trim() === '1,293';
         });
       });
@@ -91,7 +98,7 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.saveVisualizationExpectSuccess('Unlinked before saved');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await retry.waitFor('wait for count to equal 1,293', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '1,293';
         });
       });
diff --git a/test/functional/apps/visualize/_markdown_vis.js b/test/functional/apps/visualize/_markdown_vis.js
index 870c465f2de37a..51c03c90f507b8 100644
--- a/test/functional/apps/visualize/_markdown_vis.js
+++ b/test/functional/apps/visualize/_markdown_vis.js
@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 
 export default function({ getPageObjects, getService }) {
-  const PageObjects = getPageObjects(['common', 'visualize', 'header']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'header']);
   const find = getService('find');
   const inspector = getService('inspector');
   const markdown = `
@@ -33,8 +33,8 @@ export default function({ getPageObjects, getService }) {
     before(async function() {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickMarkdownWidget();
-      await PageObjects.visualize.setMarkdownTxt(markdown);
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setMarkdownTxt(markdown);
+      await PageObjects.visEditor.clickGo();
     });
 
     describe('markdown vis', () => {
@@ -43,29 +43,29 @@ export default function({ getPageObjects, getService }) {
       });
 
       it('should render markdown as html', async function() {
-        const h1Txt = await PageObjects.visualize.getMarkdownBodyDescendentText('h1');
+        const h1Txt = await PageObjects.visChart.getMarkdownBodyDescendentText('h1');
         expect(h1Txt).to.equal('Heading 1');
       });
 
       it('should not render html in markdown as html', async function() {
         const expected = 'Heading 1\n<h3>Inline HTML that should not be rendered as html</h3>';
-        const actual = await PageObjects.visualize.getMarkdownText();
+        const actual = await PageObjects.visChart.getMarkdownText();
         expect(actual).to.equal(expected);
       });
 
       it('should auto apply changes if auto mode is turned on', async function() {
         const markdown2 = '## Heading 2';
-        await PageObjects.visualize.toggleAutoMode();
-        await PageObjects.visualize.setMarkdownTxt(markdown2);
+        await PageObjects.visEditor.toggleAutoMode();
+        await PageObjects.visEditor.setMarkdownTxt(markdown2);
         await PageObjects.header.waitUntilLoadingHasFinished();
-        const h1Txt = await PageObjects.visualize.getMarkdownBodyDescendentText('h2');
+        const h1Txt = await PageObjects.visChart.getMarkdownBodyDescendentText('h2');
         expect(h1Txt).to.equal('Heading 2');
       });
 
       it('should resize the editor', async function() {
         const editorSidebar = await find.byCssSelector('.visEditor__sidebar');
         const initialSize = await editorSidebar.getSize();
-        await PageObjects.visualize.sizeUpEditor();
+        await PageObjects.visEditor.sizeUpEditor();
         const afterSize = await editorSidebar.getSize();
         expect(afterSize.width).to.be.greaterThan(initialSize.width);
       });
diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js
index 31140a1718cfe1..6a95f7553943c6 100644
--- a/test/functional/apps/visualize/_metric_chart.js
+++ b/test/functional/apps/visualize/_metric_chart.js
@@ -24,7 +24,7 @@ export default function({ getService, getPageObjects }) {
   const retry = getService('retry');
   const filterBar = getService('filterBar');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('metric chart', function() {
     before(async function() {
@@ -45,21 +45,21 @@ export default function({ getService, getPageObjects }) {
 
       // initial metric of "Count" is selected by default
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(expectedCount).to.eql(metricValue);
       });
     });
 
     it('should show Average', async function() {
       const avgMachineRam = ['13,104,036,080.615', 'Average machine.ram'];
-      await PageObjects.visualize.clickMetricEditor();
+      await PageObjects.visEditor.clickMetricEditor();
       log.debug('Aggregation = Average');
-      await PageObjects.visualize.selectAggregation('Average', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Average', 'metrics');
       log.debug('Field = machine.ram');
-      await PageObjects.visualize.selectField('machine.ram', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('machine.ram', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(avgMachineRam).to.eql(metricValue);
       });
     });
@@ -67,12 +67,12 @@ export default function({ getService, getPageObjects }) {
     it('should show Sum', async function() {
       const sumPhpMemory = ['85,865,880', 'Sum of phpmemory'];
       log.debug('Aggregation = Sum');
-      await PageObjects.visualize.selectAggregation('Sum', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Sum', 'metrics');
       log.debug('Field = phpmemory');
-      await PageObjects.visualize.selectField('phpmemory', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('phpmemory', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(sumPhpMemory).to.eql(metricValue);
       });
     });
@@ -81,12 +81,12 @@ export default function({ getService, getPageObjects }) {
       const medianBytes = ['5,565.263', '50th percentile of bytes'];
       //  For now, only comparing the text label part of the metric
       log.debug('Aggregation = Median');
-      await PageObjects.visualize.selectAggregation('Median', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Median', 'metrics');
       log.debug('Field = bytes');
-      await PageObjects.visualize.selectField('bytes', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('bytes', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         // only comparing the text label!
         expect(medianBytes[1]).to.eql(metricValue[1]);
       });
@@ -95,12 +95,12 @@ export default function({ getService, getPageObjects }) {
     it('should show Min', async function() {
       const minTimestamp = ['Sep 20, 2015 @ 00:00:00.000', 'Min @timestamp'];
       log.debug('Aggregation = Min');
-      await PageObjects.visualize.selectAggregation('Min', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Min', 'metrics');
       log.debug('Field = @timestamp');
-      await PageObjects.visualize.selectField('@timestamp', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('@timestamp', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(minTimestamp).to.eql(metricValue);
       });
     });
@@ -111,12 +111,12 @@ export default function({ getService, getPageObjects }) {
         'Max relatedContent.article:modified_time',
       ];
       log.debug('Aggregation = Max');
-      await PageObjects.visualize.selectAggregation('Max', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Max', 'metrics');
       log.debug('Field = relatedContent.article:modified_time');
-      await PageObjects.visualize.selectField('relatedContent.article:modified_time', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('relatedContent.article:modified_time', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(maxRelatedContentArticleModifiedTime).to.eql(metricValue);
       });
     });
@@ -124,12 +124,12 @@ export default function({ getService, getPageObjects }) {
     it('should show Unique Count', async function() {
       const uniqueCountClientip = ['1,000', 'Unique count of clientip'];
       log.debug('Aggregation = Unique Count');
-      await PageObjects.visualize.selectAggregation('Unique Count', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Unique Count', 'metrics');
       log.debug('Field = clientip');
-      await PageObjects.visualize.selectField('clientip', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('clientip', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(uniqueCountClientip).to.eql(metricValue);
       });
     });
@@ -153,12 +153,12 @@ export default function({ getService, getPageObjects }) {
       ];
 
       log.debug('Aggregation = Percentiles');
-      await PageObjects.visualize.selectAggregation('Percentiles', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Percentiles', 'metrics');
       log.debug('Field =  machine.ram');
-      await PageObjects.visualize.selectField('machine.ram', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('machine.ram', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(percentileMachineRam).to.eql(metricValue);
       });
     });
@@ -166,14 +166,14 @@ export default function({ getService, getPageObjects }) {
     it('should show Percentile Ranks', async function() {
       const percentileRankBytes = ['2.036%', 'Percentile rank 99 of "memory"'];
       log.debug('Aggregation = Percentile Ranks');
-      await PageObjects.visualize.selectAggregation('Percentile Ranks', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Percentile Ranks', 'metrics');
       log.debug('Field =  bytes');
-      await PageObjects.visualize.selectField('memory', 'metrics');
+      await PageObjects.visEditor.selectField('memory', 'metrics');
       log.debug('Values =  99');
-      await PageObjects.visualize.setValue('99');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setValue('99');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(percentileRankBytes).to.eql(metricValue);
       });
     });
@@ -183,7 +183,7 @@ export default function({ getService, getPageObjects }) {
         let filterCount = 0;
         await retry.try(async function tryingForTime() {
           // click first metric bucket
-          await PageObjects.visualize.clickMetricByIndex(0);
+          await PageObjects.visEditor.clickMetricByIndex(0);
           filterCount = await filterBar.getFilterCount();
         });
         expect(filterCount).to.equal(0);
@@ -191,17 +191,17 @@ export default function({ getService, getPageObjects }) {
 
       it('should allow filtering with buckets', async function() {
         log.debug('Bucket = Split Group');
-        await PageObjects.visualize.clickBucket('Split group');
+        await PageObjects.visEditor.clickBucket('Split group');
         log.debug('Aggregation = Terms');
-        await PageObjects.visualize.selectAggregation('Terms');
+        await PageObjects.visEditor.selectAggregation('Terms');
         log.debug('Field = machine.os.raw');
-        await PageObjects.visualize.selectField('machine.os.raw');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.selectField('machine.os.raw');
+        await PageObjects.visEditor.clickGo();
 
         let filterCount = 0;
         await retry.try(async function tryingForTime() {
           // click first metric bucket
-          await PageObjects.visualize.clickMetricByIndex(0);
+          await PageObjects.visEditor.clickMetricByIndex(0);
           filterCount = await filterBar.getFilterCount();
         });
         await filterBar.removeAllFilters();
diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
index 03067bb2182c5c..313a4e39e50302 100644
--- a/test/functional/apps/visualize/_pie_chart.js
+++ b/test/functional/apps/visualize/_pie_chart.js
@@ -24,7 +24,14 @@ export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
   const pieChart = getService('pieChart');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'header',
+    'timePicker',
+  ]);
 
   describe('pie chart', function() {
     const vizName1 = 'Visualization PieChart';
@@ -36,24 +43,24 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('select bucket Split slices');
-      await PageObjects.visualize.clickBucket('Split slices');
+      await PageObjects.visEditor.clickBucket('Split slices');
       log.debug('Click aggregation Histogram');
-      await PageObjects.visualize.selectAggregation('Histogram');
+      await PageObjects.visEditor.selectAggregation('Histogram');
       log.debug('Click field memory');
-      await PageObjects.visualize.selectField('memory');
+      await PageObjects.visEditor.selectField('memory');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.common.sleep(1003);
       log.debug('setNumericInterval 4000');
-      await PageObjects.visualize.setNumericInterval('40000');
+      await PageObjects.visEditor.setInterval('40000', { type: 'numeric' });
       log.debug('clickGo');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should save and load', async function() {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -93,15 +100,15 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Terms');
-        await PageObjects.visualize.selectAggregation('Terms');
+        await PageObjects.visEditor.selectAggregation('Terms');
         log.debug('Click field machine.os.raw');
-        await PageObjects.visualize.selectField('machine.os.raw');
-        await PageObjects.visualize.toggleOtherBucket(2);
-        await PageObjects.visualize.toggleMissingBucket(2);
+        await PageObjects.visEditor.selectField('machine.os.raw');
+        await PageObjects.visEditor.toggleOtherBucket(2);
+        await PageObjects.visEditor.toggleMissingBucket(2);
         log.debug('clickGo');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await pieChart.expectPieChartLabels(expectedTableData);
       });
 
@@ -109,20 +116,20 @@ export default function({ getService, getPageObjects }) {
         const expectedTableData = ['Missing', 'osx'];
 
         await pieChart.filterOnPieSlice('Other');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
         await pieChart.expectPieChartLabels(expectedTableData);
         await filterBar.removeFilter('machine.os.raw');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
 
       it('should apply correct filter on other bucket by clicking on a legend', async () => {
         const expectedTableData = ['Missing', 'osx'];
 
-        await PageObjects.visualize.filterLegend('Other');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.filterLegend('Other');
+        await PageObjects.visChart.waitForVisualization();
         await pieChart.expectPieChartLabels(expectedTableData);
         await filterBar.removeFilter('machine.os.raw');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
 
       it('should show two levels of other buckets', async () => {
@@ -171,15 +178,15 @@ export default function({ getService, getPageObjects }) {
           'Other',
         ];
 
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split slices');
-        await PageObjects.visualize.selectAggregation('Terms');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split slices');
+        await PageObjects.visEditor.selectAggregation('Terms');
         log.debug('Click field geo.src');
-        await PageObjects.visualize.selectField('geo.src');
-        await PageObjects.visualize.toggleOtherBucket(3);
-        await PageObjects.visualize.toggleMissingBucket(3);
+        await PageObjects.visEditor.selectField('geo.src');
+        await PageObjects.visEditor.toggleOtherBucket(3);
+        await PageObjects.visEditor.toggleMissingBucket(3);
         log.debug('clickGo');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await pieChart.expectPieChartLabels(expectedTableData);
       });
     });
@@ -187,17 +194,17 @@ export default function({ getService, getPageObjects }) {
     describe('disabled aggs', () => {
       before(async () => {
         await PageObjects.visualize.loadSavedVisualization(vizName1);
-        await PageObjects.visualize.waitForRenderingCount();
+        await PageObjects.visChart.waitForRenderingCount();
       });
 
       it('should show correct result with one agg disabled', async () => {
         const expectedTableData = ['win 8', 'win xp', 'win 7', 'ios', 'osx'];
 
-        await PageObjects.visualize.clickBucket('Split slices');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('machine.os.raw');
-        await PageObjects.visualize.toggleDisabledAgg(2);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split slices');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os.raw');
+        await PageObjects.visEditor.toggleDisabledAgg(2);
+        await PageObjects.visEditor.clickGo();
 
         await pieChart.expectPieChartLabels(expectedTableData);
       });
@@ -206,15 +213,15 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
         await PageObjects.visualize.loadSavedVisualization(vizName1);
-        await PageObjects.visualize.waitForRenderingCount();
+        await PageObjects.visChart.waitForRenderingCount();
 
         const expectedTableData = ['win 8', 'win xp', 'win 7', 'ios', 'osx'];
         await pieChart.expectPieChartLabels(expectedTableData);
       });
 
       it('should show correct result when agg is re-enabled', async () => {
-        await PageObjects.visualize.toggleDisabledAgg(2);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleDisabledAgg(2);
+        await PageObjects.visEditor.clickGo();
 
         const expectedTableData = [
           '0',
@@ -291,24 +298,24 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Filters');
-        await PageObjects.visualize.selectAggregation('Filters');
+        await PageObjects.visEditor.selectAggregation('Filters');
         log.debug('Set the 1st filter value');
-        await PageObjects.visualize.setFilterAggregationValue('geo.dest:"US"');
+        await PageObjects.visEditor.setFilterAggregationValue('geo.dest:"US"');
         log.debug('Add new filter');
-        await PageObjects.visualize.addNewFilterAggregation();
+        await PageObjects.visEditor.addNewFilterAggregation();
         log.debug('Set the 2nd filter value');
-        await PageObjects.visualize.setFilterAggregationValue('geo.dest:"CN"', 1);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.setFilterAggregationValue('geo.dest:"CN"', 1);
+        await PageObjects.visEditor.clickGo();
         const emptyFromTime = 'Sep 19, 2016 @ 06:31:44.000';
         const emptyToTime = 'Sep 23, 2016 @ 18:31:44.000';
         log.debug(
           'Switch to a different time range from "' + emptyFromTime + '" to "' + emptyToTime + '"'
         );
         await PageObjects.timePicker.setAbsoluteRange(emptyFromTime, emptyToTime);
-        await PageObjects.visualize.waitForVisualization();
-        await PageObjects.visualize.expectError();
+        await PageObjects.visChart.waitForVisualization();
+        await PageObjects.visChart.expectError();
       });
     });
     describe('multi series slice', () => {
@@ -327,22 +334,22 @@ export default function({ getService, getPageObjects }) {
         );
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Histogram');
-        await PageObjects.visualize.selectAggregation('Histogram');
+        await PageObjects.visEditor.selectAggregation('Histogram');
         log.debug('Click field memory');
-        await PageObjects.visualize.selectField('memory');
+        await PageObjects.visEditor.selectField('memory');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.common.sleep(1003);
         log.debug('setNumericInterval 4000');
-        await PageObjects.visualize.setNumericInterval('40000');
+        await PageObjects.visEditor.setInterval('40000', { type: 'numeric' });
         log.debug('Toggle previous editor');
-        await PageObjects.visualize.toggleAggregationEditor(2);
+        await PageObjects.visEditor.toggleAggregationEditor(2);
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.dest');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split slices');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.dest');
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should show correct chart', async () => {
@@ -428,11 +435,11 @@ export default function({ getService, getPageObjects }) {
           '360,000',
           'CN',
         ];
-        await PageObjects.visualize.filterLegend('CN');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.filterLegend('CN');
+        await PageObjects.visChart.waitForVisualization();
         await pieChart.expectPieChartLabels(expectedTableData);
         await filterBar.removeFilter('geo.dest');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
 
       it('should still showing pie chart when a subseries have zero data', async function() {
@@ -442,21 +449,21 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Filters');
-        await PageObjects.visualize.selectAggregation('Filters');
+        await PageObjects.visEditor.selectAggregation('Filters');
         log.debug('Set the 1st filter value');
-        await PageObjects.visualize.setFilterAggregationValue('geo.dest:"US"');
+        await PageObjects.visEditor.setFilterAggregationValue('geo.dest:"US"');
         log.debug('Toggle previous editor');
-        await PageObjects.visualize.toggleAggregationEditor(2);
+        await PageObjects.visEditor.toggleAggregationEditor(2);
         log.debug('Add a new series, select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Filters');
-        await PageObjects.visualize.selectAggregation('Filters');
+        await PageObjects.visEditor.selectAggregation('Filters');
         log.debug('Set the 1st filter value of the aggregation id 3');
-        await PageObjects.visualize.setFilterAggregationValue('geo.dest:"UX"', 0, 3);
-        await PageObjects.visualize.clickGo();
-        const legends = await PageObjects.visualize.getLegendEntries();
+        await PageObjects.visEditor.setFilterAggregationValue('geo.dest:"UX"', 0, 3);
+        await PageObjects.visEditor.clickGo();
+        const legends = await PageObjects.visChart.getLegendEntries();
         const expectedLegends = ['geo.dest:"US"', 'geo.dest:"UX"'];
         expect(legends).to.eql(expectedLegends);
       });
@@ -469,15 +476,15 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split chart');
-        await PageObjects.visualize.clickBucket('Split chart');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('machine.os.raw');
-        await PageObjects.visualize.toggleAggregationEditor(2);
+        await PageObjects.visEditor.clickBucket('Split chart');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os.raw');
+        await PageObjects.visEditor.toggleAggregationEditor(2);
         log.debug('Add a new series, select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.src');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split slices');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.src');
+        await PageObjects.visEditor.clickGo();
       });
 
       it('shows correct split chart', async () => {
@@ -522,7 +529,7 @@ export default function({ getService, getPageObjects }) {
           ['ios', '478', 'CN', '478'],
           ['osx', '228', 'CN', '228'],
         ];
-        await PageObjects.visualize.filterLegend('CN');
+        await PageObjects.visChart.filterLegend('CN');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await inspector.open();
         await inspector.setTablePageSize(50);
diff --git a/test/functional/apps/visualize/_point_series_options.js b/test/functional/apps/visualize/_point_series_options.js
index 2d496cb575db79..e7ce5808554b47 100644
--- a/test/functional/apps/visualize/_point_series_options.js
+++ b/test/functional/apps/visualize/_point_series_options.js
@@ -25,11 +25,12 @@ export default function({ getService, getPageObjects }) {
   const kibanaServer = getService('kibanaServer');
   const browser = getService('browser');
   const PageObjects = getPageObjects([
-    'common',
     'visualize',
     'header',
     'pointSeries',
     'timePicker',
+    'visEditor',
+    'visChart',
   ]);
   const pointSeriesVis = PageObjects.pointSeries;
   const inspector = getService('inspector');
@@ -42,18 +43,18 @@ export default function({ getService, getPageObjects }) {
     await PageObjects.visualize.clickNewSearch();
     await PageObjects.timePicker.setDefaultAbsoluteRange();
     log.debug('Bucket = X-axis');
-    await PageObjects.visualize.clickBucket('X-axis');
+    await PageObjects.visEditor.clickBucket('X-axis');
     log.debug('Aggregation = Date Histogram');
-    await PageObjects.visualize.selectAggregation('Date Histogram');
+    await PageObjects.visEditor.selectAggregation('Date Histogram');
     log.debug('Field = @timestamp');
-    await PageObjects.visualize.selectField('@timestamp');
+    await PageObjects.visEditor.selectField('@timestamp');
     // add another metrics
     log.debug('Metric = Value Axis');
-    await PageObjects.visualize.clickBucket('Y-axis', 'metrics');
+    await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
     log.debug('Aggregation = Average');
-    await PageObjects.visualize.selectAggregation('Average', 'metrics');
+    await PageObjects.visEditor.selectAggregation('Average', 'metrics');
     log.debug('Field = memory');
-    await PageObjects.visualize.selectField('machine.ram', 'metrics');
+    await PageObjects.visEditor.selectField('machine.ram', 'metrics');
     // go to options page
     log.debug('Going to axis options');
     await pointSeriesVis.clickAxisOptions();
@@ -61,11 +62,11 @@ export default function({ getService, getPageObjects }) {
     log.debug('adding axis');
     await pointSeriesVis.clickAddAxis();
     // set average count to use second value axis
-    await PageObjects.visualize.toggleAccordion('visEditorSeriesAccordion3');
+    await PageObjects.visEditor.toggleAccordion('visEditorSeriesAccordion3');
     log.debug('Average memory value axis - ValueAxis-2');
     await pointSeriesVis.setSeriesAxis(1, 'ValueAxis-2');
-    await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-    await PageObjects.visualize.clickGo();
+    await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+    await PageObjects.visEditor.clickGo();
   }
 
   describe('point series', function describeIndexTests() {
@@ -129,14 +130,14 @@ export default function({ getService, getPageObjects }) {
         ];
 
         await retry.try(async () => {
-          const data = await PageObjects.visualize.getLineChartData('Count');
+          const data = await PageObjects.visChart.getLineChartData('Count');
           log.debug('count data=' + data);
           log.debug('data.length=' + data.length);
           expect(data).to.eql(expectedChartValues[0]);
         });
 
         await retry.try(async () => {
-          const avgMemoryData = await PageObjects.visualize.getLineChartData(
+          const avgMemoryData = await PageObjects.visChart.getLineChartData(
             'Average machine.ram',
             'ValueAxis-2'
           );
@@ -158,7 +159,7 @@ export default function({ getService, getPageObjects }) {
     describe('multiple chart types', function() {
       it('should change average series type to histogram', async function() {
         await pointSeriesVis.setSeriesType(1, 'histogram');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         const length = await pointSeriesVis.getHistogramSeries();
         expect(length).to.be(1);
       });
@@ -166,12 +167,12 @@ export default function({ getService, getPageObjects }) {
 
     describe('grid lines', function() {
       before(async function() {
-        await pointSeriesVis.clickOptions();
+        await PageObjects.visEditor.clickOptionsTab();
       });
 
       it('should show category grid lines', async function() {
         await pointSeriesVis.toggleGridCategoryLines();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         const gridLines = await pointSeriesVis.getGridLines();
         expect(gridLines.length).to.be(9);
         gridLines.forEach(gridLine => {
@@ -182,7 +183,7 @@ export default function({ getService, getPageObjects }) {
       it('should show value axis grid lines', async function() {
         await pointSeriesVis.setGridValueAxis('ValueAxis-2');
         await pointSeriesVis.toggleGridCategoryLines();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         const gridLines = await pointSeriesVis.getGridLines();
         expect(gridLines.length).to.be(9);
         gridLines.forEach(gridLine => {
@@ -199,36 +200,36 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.navigateToNewVisualization();
         await PageObjects.visualize.clickLineChart();
         await PageObjects.visualize.clickNewSearch();
-        await PageObjects.visualize.selectYAxisAggregation('Average', 'bytes', customLabel, 1);
-        await PageObjects.visualize.clickGo();
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions('ValueAxis-1');
+        await PageObjects.visEditor.selectYAxisAggregation('Average', 'bytes', customLabel, 1);
+        await PageObjects.visEditor.clickGo();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions('ValueAxis-1');
       });
 
       it('should render a custom label when one is set', async function() {
-        const title = await PageObjects.visualize.getYAxisTitle();
+        const title = await PageObjects.visChart.getYAxisTitle();
         expect(title).to.be(customLabel);
       });
 
       it('should render a custom axis title when one is set, overriding the custom label', async function() {
         await pointSeriesVis.setAxisTitle(axisTitle);
-        await PageObjects.visualize.clickGo();
-        const title = await PageObjects.visualize.getYAxisTitle();
+        await PageObjects.visEditor.clickGo();
+        const title = await PageObjects.visChart.getYAxisTitle();
         expect(title).to.be(axisTitle);
       });
 
       it('should preserve saved axis titles after a vis is saved and reopened', async function() {
         await PageObjects.visualize.saveVisualizationExpectSuccess(visName);
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
         await PageObjects.visualize.loadSavedVisualization(visName);
-        await PageObjects.visualize.waitForRenderingCount();
-        await PageObjects.visualize.clickData();
-        await PageObjects.visualize.toggleOpenEditor(1);
-        await PageObjects.visualize.setCustomLabel('test', 1);
-        await PageObjects.visualize.clickGo();
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions('ValueAxis-1');
-        const title = await PageObjects.visualize.getYAxisTitle();
+        await PageObjects.visChart.waitForRenderingCount();
+        await PageObjects.visEditor.clickDataTab();
+        await PageObjects.visEditor.toggleOpenEditor(1);
+        await PageObjects.visEditor.setCustomLabel('test', 1);
+        await PageObjects.visEditor.clickGo();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions('ValueAxis-1');
+        const title = await PageObjects.visChart.getYAxisTitle();
         expect(title).to.be(axisTitle);
       });
     });
@@ -238,7 +239,7 @@ export default function({ getService, getPageObjects }) {
 
       it('should show round labels in default timezone', async function() {
         await initChart();
-        const labels = await PageObjects.visualize.getXAxisLabels();
+        const labels = await PageObjects.visChart.getXAxisLabels();
         expect(labels.join()).to.contain(expectedLabels.join());
       });
 
@@ -248,7 +249,7 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.header.awaitKibanaChrome();
         await initChart();
 
-        const labels = await PageObjects.visualize.getXAxisLabels();
+        const labels = await PageObjects.visChart.getXAxisLabels();
 
         expect(labels.join()).to.contain(expectedLabels.join());
       });
@@ -258,10 +259,10 @@ export default function({ getService, getPageObjects }) {
         const toTime = 'Sep 22, 2015 @ 16:08:34.554';
         // note that we're setting the absolute time range while we're in 'America/Phoenix' tz
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-        await PageObjects.visualize.waitForRenderingCount();
+        await PageObjects.visChart.waitForRenderingCount();
 
         await retry.waitFor('wait for x-axis labels to match expected for Phoenix', async () => {
-          const labels = await PageObjects.visualize.getXAxisLabels();
+          const labels = await PageObjects.visChart.getXAxisLabels();
           log.debug(`Labels: ${labels}`);
           return (
             labels.toString() === ['10:00', '11:00', '12:00', '13:00', '14:00', '15:00'].toString()
@@ -303,11 +304,11 @@ export default function({ getService, getPageObjects }) {
         await browser.refresh();
         // wait some time before trying to check for rendering count
         await PageObjects.header.awaitKibanaChrome();
-        await PageObjects.visualize.waitForRenderingCount();
+        await PageObjects.visChart.waitForRenderingCount();
         log.debug('getXAxisLabels');
 
         await retry.waitFor('wait for x-axis labels to match expected for UTC', async () => {
-          const labels2 = await PageObjects.visualize.getXAxisLabels();
+          const labels2 = await PageObjects.visChart.getXAxisLabels();
           log.debug(`Labels: ${labels2}`);
           return (
             labels2.toString() === ['17:00', '18:00', '19:00', '20:00', '21:00', '22:00'].toString()
diff --git a/test/functional/apps/visualize/_region_map.js b/test/functional/apps/visualize/_region_map.js
index f6c81dab5921f5..10cbd9913c70c2 100644
--- a/test/functional/apps/visualize/_region_map.js
+++ b/test/functional/apps/visualize/_region_map.js
@@ -24,7 +24,7 @@ export default function({ getService, getPageObjects }) {
     const inspector = getService('inspector');
     const log = getService('log');
     const find = getService('find');
-    const PageObjects = getPageObjects(['common', 'visualize', 'timePicker', 'settings']);
+    const PageObjects = getPageObjects(['visualize', 'visEditor', 'timePicker']);
 
     before(async function() {
       log.debug('navigateToApp visualize');
@@ -34,12 +34,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = Shape field');
-      await PageObjects.visualize.clickBucket('Shape field');
+      await PageObjects.visEditor.clickBucket('Shape field');
       log.debug('Aggregation = Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       log.debug('Field = geo.src');
-      await PageObjects.visualize.selectField('geo.src');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('geo.src');
+      await PageObjects.visEditor.clickGo();
     });
 
     describe('vector map', function indexPatternCreation() {
@@ -60,26 +60,26 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should change results after changing layer to world', async function() {
-        await PageObjects.visualize.clickOptions();
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.clickOptionsTab();
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectLayer',
           'World Countries'
         );
 
         //ensure all fields are there
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectJoinField',
           'ISO 3166-1 alpha-2 code'
         );
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectJoinField',
           'ISO 3166-1 alpha-3 code'
         );
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectJoinField',
           'name'
         );
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectJoinField',
           'ISO 3166-1 alpha-2 code'
         );
diff --git a/test/functional/apps/visualize/_tag_cloud.js b/test/functional/apps/visualize/_tag_cloud.js
index 97b8036b305031..4f921cec1fdf10 100644
--- a/test/functional/apps/visualize/_tag_cloud.js
+++ b/test/functional/apps/visualize/_tag_cloud.js
@@ -26,7 +26,16 @@ export default function({ getService, getPageObjects }) {
   const browser = getService('browser');
   const retry = getService('retry');
   const find = getService('find');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'header',
+    'settings',
+    'timePicker',
+    'tagCloud',
+  ]);
 
   describe('tag cloud chart', function() {
     const vizName1 = 'Visualization tagCloud';
@@ -40,15 +49,15 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('select Tags');
-      await PageObjects.visualize.clickBucket('Tags');
+      await PageObjects.visEditor.clickBucket('Tags');
       log.debug('Click aggregation Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       log.debug('Click field machine.ram');
       await retry.try(async function tryingForTime() {
-        await PageObjects.visualize.selectField(termsField);
+        await PageObjects.visEditor.selectField(termsField);
       });
-      await PageObjects.visualize.selectOrderByMetric(2, '_key');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectOrderByMetric(2, '_key');
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should have inspector enabled', async function() {
@@ -56,7 +65,7 @@ export default function({ getService, getPageObjects }) {
     });
 
     it('should show correct tag cloud data', async function() {
-      const data = await PageObjects.visualize.getTextTag();
+      const data = await PageObjects.tagCloud.getTextTag();
       log.debug(data);
       expect(data).to.eql([
         '32,212,254,720',
@@ -69,22 +78,22 @@ export default function({ getService, getPageObjects }) {
 
     it('should collapse the sidebar', async function() {
       const editorSidebar = await find.byCssSelector('.collapsible-sidebar');
-      await PageObjects.visualize.clickEditorSidebarCollapse();
+      await PageObjects.visEditor.clickEditorSidebarCollapse();
       // Give d3 tag cloud some time to rearrange tags
       await PageObjects.common.sleep(1000);
       const afterSize = await editorSidebar.getSize();
       expect(afterSize.width).to.be(0);
-      await PageObjects.visualize.clickEditorSidebarCollapse();
+      await PageObjects.visEditor.clickEditorSidebarCollapse();
     });
 
     it('should still show all tags after sidebar has been collapsed', async function() {
-      await PageObjects.visualize.clickEditorSidebarCollapse();
+      await PageObjects.visEditor.clickEditorSidebarCollapse();
       // Give d3 tag cloud some time to rearrange tags
       await PageObjects.common.sleep(1000);
-      await PageObjects.visualize.clickEditorSidebarCollapse();
+      await PageObjects.visEditor.clickEditorSidebarCollapse();
       // Give d3 tag cloud some time to rearrange tags
       await PageObjects.common.sleep(1000);
-      const data = await PageObjects.visualize.getTextTag();
+      const data = await PageObjects.tagCloud.getTextTag();
       log.debug(data);
       expect(data).to.eql([
         '32,212,254,720',
@@ -100,7 +109,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.common.sleep(1000);
       await browser.setWindowSize(1200, 800);
       await PageObjects.common.sleep(1000);
-      const data = await PageObjects.visualize.getTextTag();
+      const data = await PageObjects.tagCloud.getTextTag();
       expect(data).to.eql([
         '32,212,254,720',
         '21,474,836,480',
@@ -114,11 +123,11 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should show the tags and relative size', function() {
-      return PageObjects.visualize.getTextSizes().then(function(results) {
+      return PageObjects.tagCloud.getTextSizes().then(function(results) {
         log.debug('results here ' + results);
         expect(results).to.eql(['72px', '63px', '25px', '32px', '18px']);
       });
@@ -153,7 +162,7 @@ export default function({ getService, getPageObjects }) {
         });
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
 
       after(async function() {
@@ -168,15 +177,15 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should format tags with field formatter', async function() {
-        const data = await PageObjects.visualize.getTextTag();
+        const data = await PageObjects.tagCloud.getTextTag();
         log.debug(data);
         expect(data).to.eql(['30GB', '20GB', '19GB', '18GB', '17GB']);
       });
 
       it('should apply filter with unformatted value', async function() {
-        await PageObjects.visualize.selectTagCloudTag('30GB');
+        await PageObjects.tagCloud.selectTagCloudTag('30GB');
         await PageObjects.header.waitUntilLoadingHasFinished();
-        const data = await PageObjects.visualize.getTextTag();
+        const data = await PageObjects.tagCloud.getTextTag();
         expect(data).to.eql(['30GB']);
       });
     });
diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
index e2946339b1f087..397eaeb0f30137 100644
--- a/test/functional/apps/visualize/_tile_map.js
+++ b/test/functional/apps/visualize/_tile_map.js
@@ -27,7 +27,14 @@ export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker', 'settings']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'timePicker',
+    'tileMap',
+  ]);
 
   describe('tile map visualize app', function() {
     describe('incomplete config', function describeIndexTests() {
@@ -45,8 +52,8 @@ export default function({ getService, getPageObjects }) {
 
       it('should be able to zoom in twice', async () => {
         //should not throw
-        await PageObjects.visualize.clickMapZoomIn();
-        await PageObjects.visualize.clickMapZoomIn();
+        await PageObjects.tileMap.clickMapZoomIn();
+        await PageObjects.tileMap.clickMapZoomIn();
       });
     });
 
@@ -61,14 +68,14 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Geo Coordinates');
-        await PageObjects.visualize.clickBucket('Geo coordinates');
+        await PageObjects.visEditor.clickBucket('Geo coordinates');
         log.debug('Click aggregation Geohash');
-        await PageObjects.visualize.selectAggregation('Geohash');
+        await PageObjects.visEditor.selectAggregation('Geohash');
         log.debug('Click field geo.coordinates');
         await retry.try(async function tryingForTime() {
-          await PageObjects.visualize.selectField('geo.coordinates');
+          await PageObjects.visEditor.selectField('geo.coordinates');
         });
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
       });
 
       /**
@@ -106,9 +113,9 @@ export default function({ getService, getPageObjects }) {
             ['-', '8', '108', { lat: 18, lon: -157 }],
           ];
           //level 1
-          await PageObjects.visualize.clickMapZoomOut();
+          await PageObjects.tileMap.clickMapZoomOut();
           //level 0
-          await PageObjects.visualize.clickMapZoomOut();
+          await PageObjects.tileMap.clickMapZoomOut();
 
           await inspector.open();
           await inspector.setTablePageSize(50);
@@ -118,8 +125,8 @@ export default function({ getService, getPageObjects }) {
         });
 
         it('should not be able to zoom out beyond 0', async function() {
-          await PageObjects.visualize.zoomAllTheWayOut();
-          const enabled = await PageObjects.visualize.getMapZoomOutEnabled();
+          await PageObjects.tileMap.zoomAllTheWayOut();
+          const enabled = await PageObjects.tileMap.getMapZoomOutEnabled();
           expect(enabled).to.be(false);
         });
 
@@ -148,7 +155,7 @@ export default function({ getService, getPageObjects }) {
             ['-', 'b7', '167', { lat: 64, lon: -163 }],
           ];
 
-          await PageObjects.visualize.clickMapFitDataBounds();
+          await PageObjects.tileMap.clickMapFitDataBounds();
           await inspector.open();
           const data = await inspector.getTableData();
           await inspector.close();
@@ -164,8 +171,8 @@ export default function({ getService, getPageObjects }) {
 
           await filterBar.addFilter('bytes', 'is between', '19980', '19990');
           await filterBar.toggleFilterPinned('bytes');
-          await PageObjects.visualize.zoomAllTheWayOut();
-          await PageObjects.visualize.clickMapFitDataBounds();
+          await PageObjects.tileMap.zoomAllTheWayOut();
+          await PageObjects.tileMap.clickMapFitDataBounds();
 
           await inspector.open();
           const data = await inspector.getTableData();
@@ -178,15 +185,15 @@ export default function({ getService, getPageObjects }) {
         it('Newly saved visualization retains map bounds', async () => {
           const vizName1 = 'Visualization TileMap';
 
-          await PageObjects.visualize.clickMapZoomIn();
-          await PageObjects.visualize.clickMapZoomIn();
+          await PageObjects.tileMap.clickMapZoomIn();
+          await PageObjects.tileMap.clickMapZoomIn();
 
-          const mapBounds = await PageObjects.visualize.getMapBounds();
+          const mapBounds = await PageObjects.tileMap.getMapBounds();
           await inspector.close();
 
           await PageObjects.visualize.saveVisualizationExpectSuccess(vizName1);
 
-          const afterSaveMapBounds = await PageObjects.visualize.getMapBounds();
+          const afterSaveMapBounds = await PageObjects.tileMap.getMapBounds();
 
           await inspector.close();
           // For some reason the values are slightly different, so we can't check that they are equal. But we did
@@ -207,17 +214,17 @@ export default function({ getService, getPageObjects }) {
         });
 
         it('when not checked does not add filters to aggregation', async () => {
-          await PageObjects.visualize.toggleOpenEditor(2);
-          await PageObjects.visualize.setIsFilteredByCollarCheckbox(false);
-          await PageObjects.visualize.clickGo();
+          await PageObjects.visEditor.toggleOpenEditor(2);
+          await PageObjects.visEditor.setIsFilteredByCollarCheckbox(false);
+          await PageObjects.visEditor.clickGo();
           await inspector.open();
           await inspector.expectTableHeaders(['geohash_grid', 'Count', 'Geo Centroid']);
           await inspector.close();
         });
 
         after(async () => {
-          await PageObjects.visualize.setIsFilteredByCollarCheckbox(true);
-          await PageObjects.visualize.clickGo();
+          await PageObjects.visEditor.setIsFilteredByCollarCheckbox(true);
+          await PageObjects.visEditor.clickGo();
         });
       });
     });
@@ -245,18 +252,18 @@ export default function({ getService, getPageObjects }) {
 
         const zoomLevel = 9;
         for (let i = 0; i < zoomLevel; i++) {
-          await PageObjects.visualize.clickMapZoomIn();
+          await PageObjects.tileMap.clickMapZoomIn();
         }
       });
 
       beforeEach(async function() {
-        await PageObjects.visualize.clickMapZoomIn(waitForLoading);
+        await PageObjects.tileMap.clickMapZoomIn(waitForLoading);
       });
 
       afterEach(async function() {
         if (!last) {
           await PageObjects.common.sleep(toastDefaultLife);
-          await PageObjects.visualize.clickMapZoomOut(waitForLoading);
+          await PageObjects.tileMap.clickMapZoomOut(waitForLoading);
         }
       });
 
@@ -270,11 +277,11 @@ export default function({ getService, getPageObjects }) {
 
       it('should suppress zoom warning if suppress warnings button clicked', async () => {
         last = true;
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
         await find.clickByCssSelector('[data-test-subj="suppressZoomWarnings"]');
-        await PageObjects.visualize.clickMapZoomOut(waitForLoading);
+        await PageObjects.tileMap.clickMapZoomOut(waitForLoading);
         await testSubjects.waitForDeleted('suppressZoomWarnings');
-        await PageObjects.visualize.clickMapZoomIn(waitForLoading);
+        await PageObjects.tileMap.clickMapZoomIn(waitForLoading);
 
         await testSubjects.missingOrFail('maxZoomWarning');
       });
diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts
index dc4b9a786eaa46..8dbe3568895684 100644
--- a/test/functional/apps/visualize/_tsvb_chart.ts
+++ b/test/functional/apps/visualize/_tsvb_chart.ts
@@ -25,7 +25,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const log = getService('log');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['visualize', 'visualBuilder', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visualBuilder', 'timePicker', 'visChart']);
 
   describe('visual builder', function describeIndexTests() {
     this.tags('smoke');
@@ -80,7 +80,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should verify gauge label and count display', async () => {
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
         const labelString = await PageObjects.visualBuilder.getGaugeLabel();
         expect(labelString).to.be('Count');
         const gaugeCount = await PageObjects.visualBuilder.getGaugeCount();
@@ -96,7 +96,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should verify topN label and count display', async () => {
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
         const labelString = await PageObjects.visualBuilder.getTopNLabel();
         expect(labelString).to.be('Count');
         const gaugeCount = await PageObjects.visualBuilder.getTopNCount();
diff --git a/test/functional/apps/visualize/_tsvb_table.ts b/test/functional/apps/visualize/_tsvb_table.ts
index a36b6facb30398..5808212559b18d 100644
--- a/test/functional/apps/visualize/_tsvb_table.ts
+++ b/test/functional/apps/visualize/_tsvb_table.ts
@@ -21,7 +21,11 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ getPageObjects }: FtrProviderContext) {
-  const { visualBuilder, visualize } = getPageObjects(['visualBuilder', 'visualize']);
+  const { visualBuilder, visualize, visChart } = getPageObjects([
+    'visualBuilder',
+    'visualize',
+    'visChart',
+  ]);
 
   describe('visual builder', function describeIndexTests() {
     describe('table', () => {
@@ -32,7 +36,7 @@ export default function({ getPageObjects }: FtrProviderContext) {
         await visualBuilder.checkTableTabIsPresent();
         await visualBuilder.selectGroupByField('machine.os.raw');
         await visualBuilder.setColumnLabelValue('OS');
-        await visualize.waitForVisualizationRenderingStabilized();
+        await visChart.waitForVisualizationRenderingStabilized();
       });
 
       it('should display correct values on changing group by field and column name', async () => {
diff --git a/test/functional/apps/visualize/_vega_chart.js b/test/functional/apps/visualize/_vega_chart.js
index 224dec7ef2a71c..df0603c7f95f51 100644
--- a/test/functional/apps/visualize/_vega_chart.js
+++ b/test/functional/apps/visualize/_vega_chart.js
@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 
 export default function({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['common', 'header', 'timePicker', 'visualize']);
+  const PageObjects = getPageObjects(['timePicker', 'visualize', 'visChart', 'vegaChart']);
   const filterBar = getService('filterBar');
   const inspector = getService('inspector');
   const log = getService('log');
@@ -40,7 +40,7 @@ export default function({ getService, getPageObjects }) {
         });
 
         it.skip('should have some initial vega spec text', async function() {
-          const vegaSpec = await PageObjects.visualize.getVegaSpec();
+          const vegaSpec = await PageObjects.vegaChart.getSpec();
           expect(vegaSpec)
             .to.contain('{')
             .and.to.contain('data');
@@ -48,7 +48,7 @@ export default function({ getService, getPageObjects }) {
         });
 
         it('should have view and control containers', async function() {
-          const view = await PageObjects.visualize.getVegaViewContainer();
+          const view = await PageObjects.vegaChart.getViewContainer();
           expect(view).to.be.ok();
           const size = await view.getSize();
           expect(size)
@@ -57,7 +57,7 @@ export default function({ getService, getPageObjects }) {
           expect(size.width).to.be.above(0);
           expect(size.height).to.be.above(0);
 
-          const controls = await PageObjects.visualize.getVegaControlContainer();
+          const controls = await PageObjects.vegaChart.getControlContainer();
           expect(controls).to.be.ok();
         });
       });
@@ -73,9 +73,9 @@ export default function({ getService, getPageObjects }) {
         });
 
         it.skip('should render different data in response to filter change', async function() {
-          await PageObjects.visualize.expectVisToMatchScreenshot('vega_chart');
+          await PageObjects.vegaChart.expectVisToMatchScreenshot('vega_chart');
           await filterBar.addFilter('@tags.raw', 'is', 'error');
-          await PageObjects.visualize.expectVisToMatchScreenshot('vega_chart_filtered');
+          await PageObjects.vegaChart.expectVisToMatchScreenshot('vega_chart_filtered');
         });
       });
     });
diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
index 1153cc12e23ed7..2efa812c7a734c 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -23,8 +23,9 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
   const inspector = getService('inspector');
+  const testSubjects = getService('testSubjects');
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   // FLAKY: https://github.com/elastic/kibana/issues/22322
   describe('vertical bar chart', function() {
@@ -38,13 +39,13 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = X-Axis');
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Aggregation = Date Histogram');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
       log.debug('Field = @timestamp');
-      await PageObjects.visualize.selectField('@timestamp');
+      await PageObjects.visEditor.selectField('@timestamp');
       // leaving Interval set to Auto
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
     };
 
     before(initBarChart);
@@ -53,7 +54,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -92,7 +93,7 @@ export default function({ getService, getPageObjects }) {
       // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
       // try sleeping a bit before getting that data
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData();
+        const data = await PageObjects.visChart.getBarChartData();
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
@@ -203,15 +204,15 @@ export default function({ getService, getPageObjects }) {
       // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
       // try sleeping a bit before getting that data
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData();
+        const data = await PageObjects.visChart.getBarChartData();
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
       });
 
-      await PageObjects.visualize.toggleOpenEditor(2);
-      await PageObjects.visualize.clickDropPartialBuckets();
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.toggleOpenEditor(2);
+      await PageObjects.visEditor.clickDropPartialBuckets();
+      await PageObjects.visEditor.clickGo();
 
       expectedChartValues = [
         218,
@@ -279,7 +280,7 @@ export default function({ getService, getPageObjects }) {
       // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
       // try sleeping a bit before getting that data
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData();
+        const data = await PageObjects.visChart.getBarChartData();
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
@@ -291,13 +292,13 @@ export default function({ getService, getPageObjects }) {
       const axisId = 'ValueAxis-1';
 
       it('should show ticks on selecting log scale', async () => {
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
-        await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.clickYAxisAdvancedOptions(axisId);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -323,9 +324,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -351,10 +352,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'square root');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '0',
           '200',
@@ -370,18 +371,18 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'linear');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         log.debug(labels);
         const expectedLabels = [
           '0',
@@ -398,9 +399,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
@@ -409,11 +410,11 @@ export default function({ getService, getPageObjects }) {
     describe('vertical bar in percent mode', async () => {
       it('should show ticks with percentage values', async function() {
         const axisId = 'ValueAxis-1';
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisMode('percentage');
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisMode('percentage');
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         expect(labels[0]).to.eql('0%');
         expect(labels[labels.length - 1]).to.eql('100%');
       });
@@ -423,36 +424,36 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = ['200', '404', '503'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should allow custom sorting of series', async () => {
-        await PageObjects.visualize.toggleOpenEditor(1, 'false');
-        await PageObjects.visualize.selectCustomSortMetric(3, 'Min', 'bytes');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(1, 'false');
+        await PageObjects.visEditor.selectCustomSortMetric(3, 'Min', 'bytes');
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = ['404', '200', '503'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should correctly filter by legend', async () => {
-        await PageObjects.visualize.filterLegend('200');
-        await PageObjects.visualize.waitForVisualization();
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        await PageObjects.visChart.filterLegend('200');
+        await PageObjects.visChart.waitForVisualization();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         const expectedEntries = ['200'];
         expect(legendEntries).to.eql(expectedEntries);
         await filterBar.removeFilter('response.raw');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
     });
 
@@ -460,18 +461,18 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-
-        await PageObjects.visualize.toggleOpenEditor(3, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('machine.os');
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = [
           '200 - win 8',
@@ -490,18 +491,18 @@ export default function({ getService, getPageObjects }) {
           '404 - win 8',
           '404 - win xp',
         ];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should show correct series when disabling first agg', async function() {
         // this will avoid issues with the play tooltip covering the disable agg button
-        await PageObjects.visualize.scrollSubjectIntoView('metricsAggGroup');
-        await PageObjects.visualize.toggleDisabledAgg(3);
-        await PageObjects.visualize.clickGo();
+        await testSubjects.scrollIntoView('metricsAggGroup');
+        await PageObjects.visEditor.toggleDisabledAgg(3);
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = ['win 8', 'win xp', 'ios', 'osx', 'win 7'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
     });
@@ -510,24 +511,24 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.toggleOpenEditor(1);
-        await PageObjects.visualize.selectAggregation('Derivative', 'metrics');
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.toggleOpenEditor(1);
+        await PageObjects.visEditor.selectAggregation('Derivative', 'metrics');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = ['Derivative of Count'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should show an error if last bucket aggregation is terms', async () => {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
 
-        const errorMessage = await PageObjects.visualize.getBucketErrorMessage();
+        const errorMessage = await PageObjects.visEditor.getBucketErrorMessage();
         expect(errorMessage).to.contain('Last bucket aggregation must be "Date Histogram"');
       });
     });
diff --git a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
index e796f281b06890..2371df6e92476e 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
@@ -23,7 +23,7 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'visEditor', 'visChart']);
 
   // FLAKY: https://github.com/elastic/kibana/issues/22322
   describe.skip('vertical bar chart with index without time filter', function() {
@@ -39,13 +39,13 @@ export default function({ getService, getPageObjects }) {
       );
       await PageObjects.common.sleep(500);
       log.debug('Bucket = X-Axis');
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Aggregation = Date Histogram');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
       log.debug('Field = @timestamp');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setCustomInterval('3h');
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('3h', { type: 'custom' });
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
     };
 
     before(initBarChart);
@@ -54,7 +54,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -93,7 +93,7 @@ export default function({ getService, getPageObjects }) {
       // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
       // try sleeping a bit before getting that data
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData();
+        const data = await PageObjects.visChart.getBarChartData();
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
@@ -134,13 +134,13 @@ export default function({ getService, getPageObjects }) {
       const axisId = 'ValueAxis-1';
 
       it('should show ticks on selecting log scale', async () => {
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
-        await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.clickYAxisAdvancedOptions(axisId);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -166,9 +166,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -194,10 +194,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'square root');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '0',
           '200',
@@ -213,18 +213,18 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'linear');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         log.debug(labels);
         const expectedLabels = [
           '0',
@@ -241,9 +241,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
@@ -253,18 +253,18 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         await PageObjects.common.sleep(1003);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const expectedEntries = ['200', '404', '503'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
     });
@@ -273,20 +273,20 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
-        await PageObjects.visualize.toggleOpenEditor(3, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('machine.os');
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         await PageObjects.common.sleep(1003);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const expectedEntries = [
@@ -306,17 +306,17 @@ export default function({ getService, getPageObjects }) {
           '404 - win 8',
           '404 - win xp',
         ];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should show correct series when disabling first agg', async function() {
-        await PageObjects.visualize.toggleDisabledAgg(3);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleDisabledAgg(3);
+        await PageObjects.visEditor.clickGo();
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const expectedEntries = ['win 8', 'win xp', 'ios', 'osx', 'win 7'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
     });
@@ -325,17 +325,17 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.toggleOpenEditor(1);
-        await PageObjects.visualize.selectAggregation('Derivative', 'metrics');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.toggleOpenEditor(1);
+        await PageObjects.visEditor.selectAggregation('Derivative', 'metrics');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         await PageObjects.common.sleep(1003);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const expectedEntries = ['Derivative of Count'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
     });
diff --git a/test/functional/apps/visualize/_visualize_listing.js b/test/functional/apps/visualize/_visualize_listing.js
index 63a8a8310d2c11..e277c3c7d104d7 100644
--- a/test/functional/apps/visualize/_visualize_listing.js
+++ b/test/functional/apps/visualize/_visualize_listing.js
@@ -19,8 +19,9 @@
 
 import expect from '@kbn/expect';
 
-export default function({ getPageObjects }) {
-  const PageObjects = getPageObjects(['visualize', 'header', 'common']);
+export default function({ getService, getPageObjects }) {
+  const PageObjects = getPageObjects(['visualize', 'visEditor']);
+  const listingTable = getService('listingTable');
 
   // FLAKY: https://github.com/elastic/kibana/issues/40912
   describe.skip('visualize listing page', function describeIndexTests() {
@@ -36,7 +37,7 @@ export default function({ getPageObjects }) {
         // type markdown is used for simplicity
         await PageObjects.visualize.createSimpleMarkdownViz(vizName);
         await PageObjects.visualize.gotoVisualizationLandingPage();
-        const visCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        const visCount = await listingTable.getItemsCount('visualize');
         expect(visCount).to.equal(1);
       });
 
@@ -45,11 +46,11 @@ export default function({ getPageObjects }) {
         await PageObjects.visualize.createSimpleMarkdownViz(vizName + '2');
         await PageObjects.visualize.gotoVisualizationLandingPage();
 
-        let visCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        let visCount = await listingTable.getItemsCount('visualize');
         expect(visCount).to.equal(3);
 
         await PageObjects.visualize.deleteAllVisualizations();
-        visCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        visCount = await listingTable.getItemsCount('visualize');
         expect(visCount).to.equal(0);
       });
     });
@@ -60,45 +61,45 @@ export default function({ getPageObjects }) {
         await PageObjects.visualize.gotoVisualizationLandingPage();
         await PageObjects.visualize.navigateToNewVisualization();
         await PageObjects.visualize.clickMarkdownWidget();
-        await PageObjects.visualize.setMarkdownTxt('HELLO');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.setMarkdownTxt('HELLO');
+        await PageObjects.visEditor.clickGo();
         await PageObjects.visualize.saveVisualization('Hello World');
         await PageObjects.visualize.gotoVisualizationLandingPage();
       });
 
       it('matches on the first word', async function() {
-        await PageObjects.visualize.searchForItemWithName('Hello');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('Hello');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(1);
       });
 
       it('matches the second word', async function() {
-        await PageObjects.visualize.searchForItemWithName('World');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('World');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(1);
       });
 
       it('matches the second word prefix', async function() {
-        await PageObjects.visualize.searchForItemWithName('Wor');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('Wor');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(1);
       });
 
       it('does not match mid word', async function() {
-        await PageObjects.visualize.searchForItemWithName('orld');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('orld');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(0);
       });
 
       it('is case insensitive', async function() {
-        await PageObjects.visualize.searchForItemWithName('hello world');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('hello world');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(1);
       });
 
       it('is using AND operator', async function() {
-        await PageObjects.visualize.searchForItemWithName('hello banana');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('hello banana');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(0);
       });
     });
diff --git a/test/functional/apps/visualize/input_control_vis/chained_controls.js b/test/functional/apps/visualize/input_control_vis/chained_controls.js
index 96d9dae519b51a..b56a37218aba56 100644
--- a/test/functional/apps/visualize/input_control_vis/chained_controls.js
+++ b/test/functional/apps/visualize/input_control_vis/chained_controls.js
@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'visEditor', 'header', 'timePicker']);
   const testSubjects = getService('testSubjects');
   const find = getService('find');
   const comboBox = getService('comboBox');
@@ -65,7 +65,7 @@ export default function({ getService, getPageObjects }) {
     it('should create a seperate filter pill for parent control and child control', async () => {
       await comboBox.set('listControlSelect1', '14.61.182.136');
 
-      await PageObjects.visualize.inputControlSubmit();
+      await PageObjects.visEditor.inputControlSubmit();
 
       const hasParentControlFilter = await filterBar.hasFilter('geo.src', 'BR');
       expect(hasParentControlFilter).to.equal(true);
diff --git a/test/functional/apps/visualize/input_control_vis/dynamic_options.js b/test/functional/apps/visualize/input_control_vis/dynamic_options.js
index 2354855f120792..d78c780a728a77 100644
--- a/test/functional/apps/visualize/input_control_vis/dynamic_options.js
+++ b/test/functional/apps/visualize/input_control_vis/dynamic_options.js
@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 
 export default function({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'visEditor', 'header', 'timePicker']);
   const comboBox = getService('comboBox');
 
   describe('dynamic options', () => {
@@ -55,7 +55,7 @@ export default function({ getService, getPageObjects }) {
 
       it('should not fetch new options when non-string is filtered', async () => {
         await comboBox.set('fieldSelect-0', 'clientip');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
 
         const initialOptions = await comboBox.getOptionsList('listControlSelect0');
         expect(
diff --git a/test/functional/apps/visualize/input_control_vis/input_control_options.js b/test/functional/apps/visualize/input_control_vis/input_control_options.js
index 1c3f63e94ae75b..8e8891ac585b31 100644
--- a/test/functional/apps/visualize/input_control_vis/input_control_options.js
+++ b/test/functional/apps/visualize/input_control_vis/input_control_options.js
@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'visEditor', 'header', 'timePicker']);
   const testSubjects = getService('testSubjects');
   const inspector = getService('inspector');
   const find = getService('find');
@@ -38,11 +38,11 @@ export default function({ getService, getPageObjects }) {
         'Jan 1, 2017 @ 00:00:00.000',
         'Jan 1, 2017 @ 00:00:00.000'
       );
-      await PageObjects.visualize.clickVisEditorTab('controls');
-      await PageObjects.visualize.addInputControl();
+      await PageObjects.visEditor.clickVisEditorTab('controls');
+      await PageObjects.visEditor.addInputControl();
       await comboBox.set('indexPatternSelect-0', 'logstash- ');
       await comboBox.set('fieldSelect-0', FIELD_NAME);
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should not have inspector enabled', async function() {
@@ -89,7 +89,7 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should add filter pill when submit button is clicked', async () => {
-        await PageObjects.visualize.inputControlSubmit();
+        await PageObjects.visEditor.inputControlSubmit();
 
         const hasFilter = await filterBar.hasFilter(FIELD_NAME, 'ios');
         expect(hasFilter).to.equal(true);
@@ -98,7 +98,7 @@ export default function({ getService, getPageObjects }) {
       it('should replace existing filter pill(s) when new item is selected', async () => {
         await comboBox.clear('listControlSelect0');
         await comboBox.set('listControlSelect0', 'osx');
-        await PageObjects.visualize.inputControlSubmit();
+        await PageObjects.visEditor.inputControlSubmit();
         await PageObjects.common.sleep(1000);
 
         const hasOldFilter = await filterBar.hasFilter(FIELD_NAME, 'ios');
@@ -117,11 +117,11 @@ export default function({ getService, getPageObjects }) {
 
       it('should clear form when Clear button is clicked but not remove filter pill', async () => {
         await comboBox.set('listControlSelect0', 'ios');
-        await PageObjects.visualize.inputControlSubmit();
+        await PageObjects.visEditor.inputControlSubmit();
         const hasFilterBeforeClearBtnClicked = await filterBar.hasFilter(FIELD_NAME, 'ios');
         expect(hasFilterBeforeClearBtnClicked).to.equal(true);
 
-        await PageObjects.visualize.inputControlClear();
+        await PageObjects.visEditor.inputControlClear();
         const hasValue = await comboBox.doesComboBoxHaveSelectedOptions('listControlSelect0');
         expect(hasValue).to.equal(false);
 
@@ -130,7 +130,7 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should remove filter pill when cleared form is submitted', async () => {
-        await PageObjects.visualize.inputControlSubmit();
+        await PageObjects.visEditor.inputControlSubmit();
         const hasFilter = await filterBar.hasFilter(FIELD_NAME, 'ios');
         expect(hasFilter).to.equal(false);
       });
@@ -138,17 +138,17 @@ export default function({ getService, getPageObjects }) {
 
     describe('updateFiltersOnChange is true', () => {
       before(async () => {
-        await PageObjects.visualize.clickVisEditorTab('options');
-        await PageObjects.visualize.checkSwitch('inputControlEditorUpdateFiltersOnChangeCheckbox');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickVisEditorTab('options');
+        await PageObjects.visEditor.checkSwitch('inputControlEditorUpdateFiltersOnChangeCheckbox');
+        await PageObjects.visEditor.clickGo();
       });
 
       after(async () => {
-        await PageObjects.visualize.clickVisEditorTab('options');
-        await PageObjects.visualize.uncheckSwitch(
+        await PageObjects.visEditor.clickVisEditorTab('options');
+        await PageObjects.visEditor.uncheckSwitch(
           'inputControlEditorUpdateFiltersOnChangeCheckbox'
         );
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should not display staging control buttons', async () => {
@@ -173,9 +173,9 @@ export default function({ getService, getPageObjects }) {
 
     describe('useTimeFilter', () => {
       it('should use global time filter when getting terms', async () => {
-        await PageObjects.visualize.clickVisEditorTab('options');
-        await PageObjects.visualize.checkCheckbox('inputControlEditorUseTimeFilterCheckbox');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickVisEditorTab('options');
+        await testSubjects.setCheckbox('inputControlEditorUseTimeFilterCheckbox', 'check');
+        await PageObjects.visEditor.clickGo();
 
         // Expect control to be disabled because no terms could be gathered with time filter applied
         const input = await find.byCssSelector('[data-test-subj="inputControl0"] input');
diff --git a/test/functional/apps/visualize/input_control_vis/input_control_range.ts b/test/functional/apps/visualize/input_control_vis/input_control_range.ts
index 2d6550de5dec91..f48ba7b54daf16 100644
--- a/test/functional/apps/visualize/input_control_vis/input_control_range.ts
+++ b/test/functional/apps/visualize/input_control_vis/input_control_range.ts
@@ -25,7 +25,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const find = getService('find');
-  const { visualize } = getPageObjects(['visualize']);
+  const { visualize, visEditor } = getPageObjects(['visualize', 'visEditor']);
 
   describe('input control range', () => {
     before(async () => {
@@ -35,36 +35,22 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('should add filter with scripted field', async () => {
-      await visualize.addInputControl('range');
-      await visualize.setFilterParams({
-        indexPattern: 'kibana_sample_data_flights',
-        field: 'hour_of_day',
-      });
-      await visualize.clickGo();
-      await visualize.setFilterRange({
-        min: '7',
-        max: '10',
-      });
-      await visualize.inputControlSubmit();
+      await visEditor.addInputControl('range');
+      await visEditor.setFilterParams(0, 'kibana_sample_data_flights', 'hour_of_day');
+      await visEditor.clickGo();
+      await visEditor.setFilterRange(0, '7', '10');
+      await visEditor.inputControlSubmit();
       const controlFilters = await find.allByCssSelector('[data-test-subj^="filter"]');
       expect(controlFilters).to.have.length(1);
       expect(await controlFilters[0].getVisibleText()).to.equal('hour_of_day: 7 to 10');
     });
 
     it('should add filter with price field', async () => {
-      await visualize.addInputControl('range');
-      await visualize.setFilterParams({
-        aggNth: 1,
-        indexPattern: 'kibana_sample_data_flights',
-        field: 'AvgTicketPrice',
-      });
-      await visualize.clickGo();
-      await visualize.setFilterRange({
-        aggNth: 1,
-        min: '400',
-        max: '999',
-      });
-      await visualize.inputControlSubmit();
+      await visEditor.addInputControl('range');
+      await visEditor.setFilterParams(1, 'kibana_sample_data_flights', 'AvgTicketPrice');
+      await visEditor.clickGo();
+      await visEditor.setFilterRange(1, '400', '999');
+      await visEditor.inputControlSubmit();
       const controlFilters = await find.allByCssSelector('[data-test-subj^="filter"]');
       expect(controlFilters).to.have.length(2);
       expect(await controlFilters[1].getVisibleText()).to.equal('AvgTicketPrice: $400 to $999');
diff --git a/test/functional/page_objects/index.ts b/test/functional/page_objects/index.ts
index 5a104c8d17bf2c..5526243ea2bbde 100644
--- a/test/functional/page_objects/index.ts
+++ b/test/functional/page_objects/index.ts
@@ -39,7 +39,6 @@ import { NewsfeedPageProvider } from './newsfeed_page';
 import { PointSeriesPageProvider } from './point_series_page';
 // @ts-ignore not TS yet
 import { SettingsPageProvider } from './settings_page';
-// @ts-ignore not TS yet
 import { SharePageProvider } from './share_page';
 // @ts-ignore not TS yet
 import { ShieldPageProvider } from './shield_page';
@@ -48,8 +47,12 @@ import { TimePickerPageProvider } from './time_picker';
 // @ts-ignore not TS yet
 import { TimelionPageProvider } from './timelion_page';
 import { VisualBuilderPageProvider } from './visual_builder_page';
-// @ts-ignore not TS yet
 import { VisualizePageProvider } from './visualize_page';
+import { VisualizeEditorPageProvider } from './visualize_editor_page';
+import { VisualizeChartPageProvider } from './visualize_chart_page';
+import { TileMapPageProvider } from './tile_map_page';
+import { TagCloudPageProvider } from './tag_cloud_page';
+import { VegaChartPageProvider } from './vega_chart_page';
 
 export const pageObjects = {
   common: CommonPageProvider,
@@ -70,4 +73,9 @@ export const pageObjects = {
   timePicker: TimePickerPageProvider,
   visualBuilder: VisualBuilderPageProvider,
   visualize: VisualizePageProvider,
+  visEditor: VisualizeEditorPageProvider,
+  visChart: VisualizeChartPageProvider,
+  tileMap: TileMapPageProvider,
+  tagCloud: TagCloudPageProvider,
+  vegaChart: VegaChartPageProvider,
 };
diff --git a/test/functional/page_objects/point_series_page.js b/test/functional/page_objects/point_series_page.js
index 9172809eb73e58..74bf07b59bc381 100644
--- a/test/functional/page_objects/point_series_page.js
+++ b/test/functional/page_objects/point_series_page.js
@@ -23,10 +23,6 @@ export function PointSeriesPageProvider({ getService }) {
   const find = getService('find');
 
   class PointSeriesVis {
-    async clickOptions() {
-      return await testSubjects.click('visEditorTaboptions');
-    }
-
     async clickAxisOptions() {
       return await testSubjects.click('visEditorTabadvanced');
     }
diff --git a/test/functional/page_objects/share_page.ts b/test/functional/page_objects/share_page.ts
index 906effcb54a26f..fc8db9b78a03f7 100644
--- a/test/functional/page_objects/share_page.ts
+++ b/test/functional/page_objects/share_page.ts
@@ -19,10 +19,9 @@
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
-export function SharePageProvider({ getService, getPageObjects }: FtrProviderContext) {
+export function SharePageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const find = getService('find');
-  const PageObjects = getPageObjects(['visualize', 'common']);
   const log = getService('log');
 
   class SharePage {
@@ -78,7 +77,7 @@ export function SharePageProvider({ getService, getPageObjects }: FtrProviderCon
 
     async checkShortenUrl() {
       const shareForm = await testSubjects.find('shareUrlForm');
-      await PageObjects.visualize.checkCheckbox('useShortUrl');
+      await testSubjects.setCheckbox('useShortUrl', 'check');
       await shareForm.waitForDeletedByCssSelector('.euiLoadingSpinner');
     }
 
diff --git a/test/functional/page_objects/tag_cloud_page.ts b/test/functional/page_objects/tag_cloud_page.ts
new file mode 100644
index 00000000000000..7d87caa39b2fbe
--- /dev/null
+++ b/test/functional/page_objects/tag_cloud_page.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 { FtrProviderContext } from '../ftr_provider_context';
+import { WebElementWrapper } from '../services/lib/web_element_wrapper';
+
+export function TagCloudPageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const find = getService('find');
+  const testSubjects = getService('testSubjects');
+  const { header, visChart } = getPageObjects(['header', 'visChart']);
+
+  class TagCloudPage {
+    public async selectTagCloudTag(tagDisplayText: string) {
+      await testSubjects.click(tagDisplayText);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async getTextTag() {
+      await visChart.waitForVisualization();
+      const elements = await find.allByCssSelector('text');
+      return await Promise.all(elements.map(async element => await element.getVisibleText()));
+    }
+
+    public async getTextSizes() {
+      const tags = await find.allByCssSelector('text');
+      async function returnTagSize(tag: WebElementWrapper) {
+        const style = await tag.getAttribute('style');
+        const fontSize = style.match(/font-size: ([^;]*);/);
+        return fontSize ? fontSize[1] : '';
+      }
+      return await Promise.all(tags.map(returnTagSize));
+    }
+  }
+
+  return new TagCloudPage();
+}
diff --git a/test/functional/page_objects/tile_map_page.ts b/test/functional/page_objects/tile_map_page.ts
new file mode 100644
index 00000000000000..b41578f782af41
--- /dev/null
+++ b/test/functional/page_objects/tile_map_page.ts
@@ -0,0 +1,102 @@
+/*
+ * 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 { FtrProviderContext } from '../ftr_provider_context';
+
+export function TileMapPageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const find = getService('find');
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const log = getService('log');
+  const inspector = getService('inspector');
+  const { header } = getPageObjects(['header']);
+
+  class TileMapPage {
+    public async getZoomSelectors(zoomSelector: string) {
+      return await find.allByCssSelector(zoomSelector);
+    }
+
+    public async clickMapButton(zoomSelector: string, waitForLoading?: boolean) {
+      await retry.try(async () => {
+        const zooms = await this.getZoomSelectors(zoomSelector);
+        await Promise.all(zooms.map(async zoom => await zoom.click()));
+        if (waitForLoading) {
+          await header.waitUntilLoadingHasFinished();
+        }
+      });
+    }
+
+    public async getVisualizationRequest() {
+      log.debug('getVisualizationRequest');
+      await inspector.open();
+      await testSubjects.click('inspectorViewChooser');
+      await testSubjects.click('inspectorViewChooserRequests');
+      await testSubjects.click('inspectorRequestDetailRequest');
+      return await testSubjects.getVisibleText('inspectorRequestBody');
+    }
+
+    public async getMapBounds(): Promise<object> {
+      const request = await this.getVisualizationRequest();
+      const requestObject = JSON.parse(request);
+      return requestObject.aggs.filter_agg.filter.geo_bounding_box['geo.coordinates'];
+    }
+
+    public async clickMapZoomIn(waitForLoading = true) {
+      await this.clickMapButton('a.leaflet-control-zoom-in', waitForLoading);
+    }
+
+    public async clickMapZoomOut(waitForLoading = true) {
+      await this.clickMapButton('a.leaflet-control-zoom-out', waitForLoading);
+    }
+
+    public async getMapZoomEnabled(zoomSelector: string): Promise<boolean> {
+      const zooms = await this.getZoomSelectors(zoomSelector);
+      const classAttributes = await Promise.all(
+        zooms.map(async zoom => await zoom.getAttribute('class'))
+      );
+      return !classAttributes.join('').includes('leaflet-disabled');
+    }
+
+    public async zoomAllTheWayOut(): Promise<void> {
+      // we can tell we're at level 1 because zoom out is disabled
+      return await retry.try(async () => {
+        await this.clickMapZoomOut();
+        const enabled = await this.getMapZoomOutEnabled();
+        // should be able to zoom more as current config has 0 as min level.
+        if (enabled) {
+          throw new Error('Not fully zoomed out yet');
+        }
+      });
+    }
+
+    public async getMapZoomInEnabled() {
+      return await this.getMapZoomEnabled('a.leaflet-control-zoom-in');
+    }
+
+    public async getMapZoomOutEnabled() {
+      return await this.getMapZoomEnabled('a.leaflet-control-zoom-out');
+    }
+
+    public async clickMapFitDataBounds() {
+      return await this.clickMapButton('a.fa-crop');
+    }
+  }
+
+  return new TileMapPage();
+}
diff --git a/test/functional/page_objects/vega_chart_page.ts b/test/functional/page_objects/vega_chart_page.ts
new file mode 100644
index 00000000000000..9931ebebef6ef2
--- /dev/null
+++ b/test/functional/page_objects/vega_chart_page.ts
@@ -0,0 +1,91 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function VegaChartPageProvider({
+  getService,
+  getPageObjects,
+  updateBaselines,
+}: FtrProviderContext & { updateBaselines: boolean }) {
+  const find = getService('find');
+  const testSubjects = getService('testSubjects');
+  const browser = getService('browser');
+  const screenshot = getService('screenshots');
+  const log = getService('log');
+  const { visEditor, visChart } = getPageObjects(['visEditor', 'visChart']);
+
+  class VegaChartPage {
+    public async getSpec() {
+      // Adapted from console_page.js:getVisibleTextFromAceEditor(). Is there a common utilities file?
+      const editor = await testSubjects.find('vega-editor');
+      const lines = await editor.findAllByClassName('ace_line_group');
+      const linesText = await Promise.all(
+        lines.map(async line => {
+          return await line.getVisibleText();
+        })
+      );
+      return linesText.join('\n');
+    }
+
+    public async getViewContainer() {
+      return await find.byCssSelector('div.vgaVis__view');
+    }
+
+    public async getControlContainer() {
+      return await find.byCssSelector('div.vgaVis__controls');
+    }
+
+    /**
+     * Removes chrome and takes a small screenshot of a vis to compare against a baseline.
+     * @param {string} name The name of the baseline image.
+     * @param {object} opts Options object.
+     * @param {number} opts.threshold Threshold for allowed variance when comparing images.
+     */
+    public async expectVisToMatchScreenshot(name: string, opts = { threshold: 0.05 }) {
+      log.debug(`expectVisToMatchScreenshot(${name})`);
+
+      // Collapse sidebar and inject some CSS to hide the nav so we have a focused screenshot
+      await visEditor.clickEditorSidebarCollapse();
+      await visChart.waitForVisualizationRenderingStabilized();
+      await browser.execute(`
+          var el = document.createElement('style');
+          el.id = '__data-test-style';
+          el.innerHTML = '[data-test-subj="headerGlobalNav"] { display: none; } ';
+          el.innerHTML += '[data-test-subj="top-nav"] { display: none; } ';
+          el.innerHTML += '[data-test-subj="experimentalVisInfo"] { display: none; } ';
+          document.body.appendChild(el);
+        `);
+
+      const percentDifference = await screenshot.compareAgainstBaseline(name, updateBaselines);
+
+      // Reset the chart to its original state
+      await browser.execute(`
+          var el = document.getElementById('__data-test-style');
+          document.body.removeChild(el);
+        `);
+      await visEditor.clickEditorSidebarCollapse();
+      await visChart.waitForVisualizationRenderingStabilized();
+      expect(percentDifference).to.be.lessThan(opts.threshold);
+    }
+  }
+
+  return new VegaChartPage();
+}
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index 97d57873503762..2fa59d5fd89d83 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -26,7 +26,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
   const comboBox = getService('comboBox');
-  const PageObjects = getPageObjects(['common', 'header', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'header', 'visualize', 'timePicker', 'visChart']);
 
   type Duration =
     | 'Milliseconds'
@@ -101,7 +101,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     }
 
     public async getMetricValue() {
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       const metricValue = await find.byCssSelector('.tvbVisMetric__value--primary');
       return metricValue.getVisibleText();
     }
@@ -110,7 +110,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       const input = await find.byCssSelector('.tvbMarkdownEditor__editor textarea');
       await this.clearMarkdown();
       await input.type(markdown, { charByChar: true });
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
     }
 
     public async clearMarkdown() {
@@ -304,7 +304,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     }
 
     public async getRhythmChartLegendValue(nth = 0) {
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       const metricValue = (
         await find.allByCssSelector(`.echLegendItem .echLegendItem__displayValue`)
       )[nth];
@@ -348,7 +348,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       const prevAggs = await testSubjects.findAll('aggSelector');
       const elements = await testSubjects.findAll('addMetricAddBtn');
       await elements[nth].click();
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       await retry.waitFor('new agg is added', async () => {
         const currentAggs = await testSubjects.findAll('aggSelector');
         return currentAggs.length > prevAggs.length;
@@ -485,7 +485,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       await this.checkColorPickerPopUpIsPresent();
       await find.setValue('.tvbColorPickerPopUp input', colorHex);
       await this.clickColorPicker();
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
     }
 
     public async checkColorPickerPopUpIsPresent(): Promise<void> {
@@ -494,10 +494,10 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     }
 
     public async changePanelPreview(nth: number = 0): Promise<void> {
-      const prevRenderingCount = await PageObjects.visualize.getVisualizationRenderingCount();
+      const prevRenderingCount = await PageObjects.visChart.getVisualizationRenderingCount();
       const changePreviewBtnArray = await testSubjects.findAll('AddActivatePanelBtn');
       await changePreviewBtnArray[nth].click();
-      await PageObjects.visualize.waitForRenderingCount(prevRenderingCount + 1);
+      await PageObjects.visChart.waitForRenderingCount(prevRenderingCount + 1);
     }
 
     public async checkPreviewIsDisabled(): Promise<void> {
@@ -508,7 +508,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     public async cloneSeries(nth: number = 0): Promise<void> {
       const cloneBtnArray = await testSubjects.findAll('AddCloneBtn');
       await cloneBtnArray[nth].click();
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
     }
 
     /**
@@ -525,10 +525,10 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     }
 
     public async deleteSeries(nth: number = 0): Promise<void> {
-      const prevRenderingCount = await PageObjects.visualize.getVisualizationRenderingCount();
+      const prevRenderingCount = await PageObjects.visChart.getVisualizationRenderingCount();
       const cloneBtnArray = await testSubjects.findAll('AddDeleteBtn');
       await cloneBtnArray[nth].click();
-      await PageObjects.visualize.waitForRenderingCount(prevRenderingCount + 1);
+      await PageObjects.visChart.waitForRenderingCount(prevRenderingCount + 1);
     }
 
     public async getLegendItems(): Promise<WebElementWrapper[]> {
diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts
new file mode 100644
index 00000000000000..138e5758ede7cd
--- /dev/null
+++ b/test/functional/page_objects/visualize_chart_page.ts
@@ -0,0 +1,386 @@
+/*
+ * 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 { FtrProviderContext } from '../ftr_provider_context';
+
+export function VisualizeChartPageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const config = getService('config');
+  const find = getService('find');
+  const log = getService('log');
+  const retry = getService('retry');
+  const table = getService('table');
+  const defaultFindTimeout = config.get('timeouts.find');
+  const { common } = getPageObjects(['common']);
+
+  class VisualizeChart {
+    public async getYAxisTitle() {
+      const title = await find.byCssSelector('.y-axis-div .y-axis-title text');
+      return await title.getVisibleText();
+    }
+
+    public async getXAxisLabels() {
+      const xAxis = await find.byCssSelector('.visAxis--x.visAxis__column--bottom');
+      const $ = await xAxis.parseDomContent();
+      return $('.x > g > text')
+        .toArray()
+        .map(tick =>
+          $(tick)
+            .text()
+            .trim()
+        );
+    }
+
+    public async getYAxisLabels() {
+      const yAxis = await find.byCssSelector('.visAxis__column--y.visAxis__column--left');
+      const $ = await yAxis.parseDomContent();
+      return $('.y > g > text')
+        .toArray()
+        .map(tick =>
+          $(tick)
+            .text()
+            .trim()
+        );
+    }
+
+    /**
+     * Gets the chart data and scales it based on chart height and label.
+     * @param dataLabel data-label value
+     * @param axis  axis value, 'ValueAxis-1' by default
+     *
+     * Returns an array of height values
+     */
+    public async getAreaChartData(dataLabel: string, axis = 'ValueAxis-1') {
+      const yAxisRatio = await this.getChartYAxisRatio(axis);
+
+      const rectangle = await find.byCssSelector('rect.background');
+      const yAxisHeight = Number(await rectangle.getAttribute('height'));
+      log.debug(`height --------- ${yAxisHeight}`);
+
+      const path = await retry.try(
+        async () =>
+          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
+      );
+      const data = await path.getAttribute('d');
+      log.debug(data);
+      // This area chart data starts with a 'M'ove to a x,y location, followed
+      // by a bunch of 'L'ines from that point to the next.  Those points are
+      // the values we're going to use to calculate the data values we're testing.
+      // So git rid of the one 'M' and split the rest on the 'L's.
+      const tempArray = data
+        .replace('M ', '')
+        .replace('M', '')
+        .replace(/ L /g, 'L')
+        .replace(/ /g, ',')
+        .split('L');
+      const chartSections = tempArray.length / 2;
+      const chartData = [];
+      for (let i = 0; i < chartSections; i++) {
+        chartData[i] = Math.round((yAxisHeight - Number(tempArray[i].split(',')[1])) * yAxisRatio);
+        log.debug('chartData[i] =' + chartData[i]);
+      }
+      return chartData;
+    }
+
+    /**
+     * Returns the paths that compose an area chart.
+     * @param dataLabel data-label value
+     */
+    public async getAreaChartPaths(dataLabel: string) {
+      const path = await retry.try(
+        async () =>
+          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
+      );
+      const data = await path.getAttribute('d');
+      log.debug(data);
+      // This area chart data starts with a 'M'ove to a x,y location, followed
+      // by a bunch of 'L'ines from that point to the next.  Those points are
+      // the values we're going to use to calculate the data values we're testing.
+      // So git rid of the one 'M' and split the rest on the 'L's.
+      return data.split('L');
+    }
+
+    /**
+     * Gets the dots and normalizes their height.
+     * @param dataLabel data-label value
+     * @param axis axis value, 'ValueAxis-1' by default
+     */
+    public async getLineChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
+      // 1). get the range/pixel ratio
+      const yAxisRatio = await this.getChartYAxisRatio(axis);
+      // 2). find and save the y-axis pixel size (the chart height)
+      const rectangle = await find.byCssSelector('clipPath rect');
+      const yAxisHeight = Number(await rectangle.getAttribute('height'));
+      // 3). get the visWrapper__chart elements
+      const chartTypes = await retry.try(
+        async () =>
+          await find.allByCssSelector(
+            `.visWrapper__chart circle[data-label="${dataLabel}"][fill-opacity="1"]`,
+            defaultFindTimeout * 2
+          )
+      );
+      // 4). for each chart element, find the green circle, then the cy position
+      const chartData = await Promise.all(
+        chartTypes.map(async chart => {
+          const cy = Number(await chart.getAttribute('cy'));
+          // the point_series_options test has data in the billions range and
+          // getting 11 digits of precision with these calculations is very hard
+          return Math.round(Number(((yAxisHeight - cy) * yAxisRatio).toPrecision(6)));
+        })
+      );
+
+      return chartData;
+    }
+
+    /**
+     * Returns bar chart data in pixels
+     * @param dataLabel data-label value
+     * @param axis axis value, 'ValueAxis-1' by default
+     */
+    public async getBarChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
+      const yAxisRatio = await this.getChartYAxisRatio(axis);
+      const svg = await find.byCssSelector('div.chart');
+      const $ = await svg.parseDomContent();
+      const chartData = $(`g > g.series > rect[data-label="${dataLabel}"]`)
+        .toArray()
+        .map(chart => {
+          const barHeight = Number($(chart).attr('height'));
+          return Math.round(barHeight * yAxisRatio);
+        });
+
+      return chartData;
+    }
+
+    /**
+     * Returns the range/pixel ratio
+     * @param axis axis value, 'ValueAxis-1' by default
+     */
+    private async getChartYAxisRatio(axis = 'ValueAxis-1') {
+      // 1). get the maximum chart Y-Axis marker value and Y position
+      const maxYAxisChartMarker = await retry.try(
+        async () =>
+          await find.byCssSelector(
+            `div.visAxis__splitAxes--y > div > svg > g.${axis} > g:last-of-type.tick`
+          )
+      );
+      const maxYLabel = (await maxYAxisChartMarker.getVisibleText()).replace(/,/g, '');
+      const maxYLabelYPosition = (await maxYAxisChartMarker.getPosition()).y;
+      log.debug(`maxYLabel = ${maxYLabel}, maxYLabelYPosition = ${maxYLabelYPosition}`);
+
+      // 2). get the minimum chart Y-Axis marker value and Y position
+      const minYAxisChartMarker = await find.byCssSelector(
+        'div.visAxis__column--y.visAxis__column--left  > div > div > svg:nth-child(2) > g > g:nth-child(1).tick'
+      );
+      const minYLabel = (await minYAxisChartMarker.getVisibleText()).replace(',', '');
+      const minYLabelYPosition = (await minYAxisChartMarker.getPosition()).y;
+      return (Number(maxYLabel) - Number(minYLabel)) / (minYLabelYPosition - maxYLabelYPosition);
+    }
+
+    public async toggleLegend(show = true) {
+      await retry.try(async () => {
+        const isVisible = find.byCssSelector('.visLegend');
+        if ((show && !isVisible) || (!show && isVisible)) {
+          await testSubjects.click('vislibToggleLegend');
+        }
+      });
+    }
+
+    public async filterLegend(name: string) {
+      await this.toggleLegend();
+      await testSubjects.click(`legend-${name}`);
+      const filters = await testSubjects.find(`legend-${name}-filters`);
+      const [filterIn] = await filters.findAllByCssSelector(`input`);
+      await filterIn.click();
+      await this.waitForVisualizationRenderingStabilized();
+    }
+
+    public async doesLegendColorChoiceExist(color: string) {
+      return await testSubjects.exists(`legendSelectColor-${color}`);
+    }
+
+    public async selectNewLegendColorChoice(color: string) {
+      await testSubjects.click(`legendSelectColor-${color}`);
+    }
+
+    public async doesSelectedLegendColorExist(color: string) {
+      return await testSubjects.exists(`legendSelectedColor-${color}`);
+    }
+
+    public async expectError() {
+      await testSubjects.existOrFail('visLibVisualizeError');
+    }
+
+    public async getVisualizationRenderingCount() {
+      const visualizationLoader = await testSubjects.find('visualizationLoader');
+      const renderingCount = await visualizationLoader.getAttribute('data-rendering-count');
+      return Number(renderingCount);
+    }
+
+    public async waitForRenderingCount(minimumCount = 1) {
+      await retry.waitFor(
+        `rendering count to be greater than or equal to [${minimumCount}]`,
+        async () => {
+          const currentRenderingCount = await this.getVisualizationRenderingCount();
+          log.debug(`-- currentRenderingCount=${currentRenderingCount}`);
+          return currentRenderingCount >= minimumCount;
+        }
+      );
+    }
+
+    public async waitForVisualizationRenderingStabilized() {
+      // assuming rendering is done when data-rendering-count is constant within 1000 ms
+      await retry.waitFor('rendering count to stabilize', async () => {
+        const firstCount = await this.getVisualizationRenderingCount();
+        log.debug(`-- firstCount=${firstCount}`);
+
+        await common.sleep(1000);
+
+        const secondCount = await this.getVisualizationRenderingCount();
+        log.debug(`-- secondCount=${secondCount}`);
+
+        return firstCount === secondCount;
+      });
+    }
+
+    public async waitForVisualization() {
+      await this.waitForVisualizationRenderingStabilized();
+      await find.byCssSelector('.visualization');
+    }
+
+    public async getLegendEntries() {
+      const legendEntries = await find.allByCssSelector(
+        '.visLegend__button',
+        defaultFindTimeout * 2
+      );
+      return await Promise.all(
+        legendEntries.map(async chart => await chart.getAttribute('data-label'))
+      );
+    }
+
+    public async openLegendOptionColors(name: string) {
+      await this.waitForVisualizationRenderingStabilized();
+      await retry.try(async () => {
+        // This click has been flaky in opening the legend, hence the retry.  See
+        // https://github.com/elastic/kibana/issues/17468
+        await testSubjects.click(`legend-${name}`);
+        await this.waitForVisualizationRenderingStabilized();
+        // arbitrary color chosen, any available would do
+        const isOpen = await this.doesLegendColorChoiceExist('#EF843C');
+        if (!isOpen) {
+          throw new Error('legend color selector not open');
+        }
+      });
+    }
+
+    public async filterOnTableCell(column: string, row: string) {
+      await retry.try(async () => {
+        const tableVis = await testSubjects.find('tableVis');
+        const cell = await tableVis.findByCssSelector(
+          `tbody tr:nth-child(${row}) td:nth-child(${column})`
+        );
+        await cell.moveMouseTo();
+        const filterBtn = await testSubjects.findDescendant('filterForCellValue', cell);
+        await filterBtn.click();
+      });
+    }
+
+    public async getMarkdownText() {
+      const markdownContainer = await testSubjects.find('markdownBody');
+      return markdownContainer.getVisibleText();
+    }
+
+    public async getMarkdownBodyDescendentText(selector: string) {
+      const markdownContainer = await testSubjects.find('markdownBody');
+      const element = await find.descendantDisplayedByCssSelector(selector, markdownContainer);
+      return element.getVisibleText();
+    }
+
+    /**
+     * If you are writing new tests, you should rather look into getTableVisContent method instead.
+     */
+    public async getTableVisData() {
+      return await testSubjects.getVisibleText('paginated-table-body');
+    }
+
+    /**
+     * This function is the newer function to retrieve data from within a table visualization.
+     * It uses a better return format, than the old getTableVisData, by properly splitting
+     * cell values into arrays. Please use this function for newer tests.
+     */
+    public async getTableVisContent({ stripEmptyRows = true } = {}) {
+      return await retry.try(async () => {
+        const container = await testSubjects.find('tableVis');
+        const allTables = await testSubjects.findAllDescendant('paginated-table-body', container);
+
+        if (allTables.length === 0) {
+          return [];
+        }
+
+        const allData = await Promise.all(
+          allTables.map(async t => {
+            let data = await table.getDataFromElement(t);
+            if (stripEmptyRows) {
+              data = data.filter(row => row.length > 0 && row.some(cell => cell.trim().length > 0));
+            }
+            return data;
+          })
+        );
+
+        if (allTables.length === 1) {
+          // If there was only one table we return only the data for that table
+          // This prevents an unnecessary array around that single table, which
+          // is the case we have in most tests.
+          return allData[0];
+        }
+
+        return allData;
+      });
+    }
+
+    public async getMetric() {
+      const elements = await find.allByCssSelector(
+        '[data-test-subj="visualizationLoader"] .mtrVis__container'
+      );
+      const values = await Promise.all(
+        elements.map(async element => {
+          const text = await element.getVisibleText();
+          return text;
+        })
+      );
+      return values
+        .filter(item => item.length > 0)
+        .reduce((arr: string[], item) => arr.concat(item.split('\n')), []);
+    }
+
+    public async getGaugeValue() {
+      const elements = await find.allByCssSelector(
+        '[data-test-subj="visualizationLoader"] .chart svg text'
+      );
+      const values = await Promise.all(
+        elements.map(async element => {
+          const text = await element.getVisibleText();
+          return text;
+        })
+      );
+      return values.filter(item => item.length > 0);
+    }
+  }
+
+  return new VisualizeChart();
+}
diff --git a/test/functional/page_objects/visualize_editor_page.ts b/test/functional/page_objects/visualize_editor_page.ts
new file mode 100644
index 00000000000000..7e512975356f3b
--- /dev/null
+++ b/test/functional/page_objects/visualize_editor_page.ts
@@ -0,0 +1,462 @@
+/*
+ * 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 expect from '@kbn/expect/expect.js';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function VisualizeEditorPageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const find = getService('find');
+  const log = getService('log');
+  const retry = getService('retry');
+  const browser = getService('browser');
+  const testSubjects = getService('testSubjects');
+  const comboBox = getService('comboBox');
+  const { common, header, visChart } = getPageObjects(['common', 'header', 'visChart']);
+
+  interface IntervalOptions {
+    type?: 'default' | 'numeric' | 'custom';
+    aggNth?: number;
+    append?: boolean;
+  }
+
+  class VisualizeEditorPage {
+    public async clickDataTab() {
+      await testSubjects.click('visualizeEditDataLink');
+    }
+
+    public async clickOptionsTab() {
+      await testSubjects.click('visEditorTaboptions');
+    }
+
+    public async clickMetricsAndAxes() {
+      await testSubjects.click('visEditorTabadvanced');
+    }
+
+    public async clickVisEditorTab(tabName: string) {
+      await testSubjects.click('visEditorTab' + tabName);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async addInputControl(type?: string) {
+      if (type) {
+        const selectInput = await testSubjects.find('selectControlType');
+        await selectInput.type(type);
+      }
+      await testSubjects.click('inputControlEditorAddBtn');
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async inputControlClear() {
+      await testSubjects.click('inputControlClearBtn');
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async inputControlSubmit() {
+      await testSubjects.clickWhenNotDisabled('inputControlSubmitBtn');
+      await visChart.waitForVisualizationRenderingStabilized();
+    }
+
+    public async clickGo() {
+      const prevRenderingCount = await visChart.getVisualizationRenderingCount();
+      log.debug(`Before Rendering count ${prevRenderingCount}`);
+      await testSubjects.clickWhenNotDisabled('visualizeEditorRenderButton');
+      await visChart.waitForRenderingCount(prevRenderingCount + 1);
+    }
+
+    public async removeDimension(aggNth: number) {
+      await testSubjects.click(`visEditorAggAccordion${aggNth} > removeDimensionBtn`);
+    }
+
+    public async setFilterParams(aggNth: number, indexPattern: string, field: string) {
+      await comboBox.set(`indexPatternSelect-${aggNth}`, indexPattern);
+      await comboBox.set(`fieldSelect-${aggNth}`, field);
+    }
+
+    public async setFilterRange(aggNth: number, min: string, max: string) {
+      const control = await testSubjects.find(`inputControl${aggNth}`);
+      const inputMin = await control.findByCssSelector('[name$="minValue"]');
+      await inputMin.type(min);
+      const inputMax = await control.findByCssSelector('[name$="maxValue"]');
+      await inputMax.type(max);
+    }
+
+    public async clickSplitDirection(direction: string) {
+      const control = await testSubjects.find('visEditorSplitBy');
+      const radioBtn = await control.findByCssSelector(`[title="${direction}"]`);
+      await radioBtn.click();
+    }
+
+    /**
+     * Adds new bucket
+     * @param bucketName bucket name, like 'X-axis', 'Split rows', 'Split series'
+     * @param type aggregation type, like 'buckets', 'metrics'
+     */
+    public async clickBucket(bucketName: string, type = 'buckets') {
+      await testSubjects.click(`visEditorAdd_${type}`);
+      await find.clickByCssSelector(`[data-test-subj="visEditorAdd_${type}_${bucketName}"`);
+    }
+
+    public async clickEnableCustomRanges() {
+      await testSubjects.click('heatmapUseCustomRanges');
+    }
+
+    public async clickAddRange() {
+      await testSubjects.click(`heatmapColorRange__addRangeButton`);
+    }
+
+    public async setCustomRangeByIndex(index: string, from: string, to: string) {
+      await testSubjects.setValue(`heatmapColorRange${index}__from`, from);
+      await testSubjects.setValue(`heatmapColorRange${index}__to`, to);
+    }
+
+    public async changeHeatmapColorNumbers(value = 6) {
+      const input = await testSubjects.find(`heatmapColorsNumber`);
+      await input.clearValueWithKeyboard();
+      await input.type(`${value}`);
+    }
+
+    public async getBucketErrorMessage() {
+      const error = await find.byCssSelector(
+        '[group-name="buckets"] [data-test-subj="defaultEditorAggSelect"] + .euiFormErrorText'
+      );
+      const errorMessage = await error.getAttribute('innerText');
+      log.debug(errorMessage);
+      return errorMessage;
+    }
+
+    public async addNewFilterAggregation() {
+      await testSubjects.click('visEditorAddFilterButton');
+    }
+
+    public async selectField(
+      fieldValue: string,
+      groupName = 'buckets',
+      childAggregationType = false
+    ) {
+      log.debug(`selectField ${fieldValue}`);
+      const selector = `
+          [group-name="${groupName}"]
+          [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
+          [data-test-subj="visAggEditorParams"]
+          ${childAggregationType ? '.visEditorAgg__subAgg' : ''}
+          [data-test-subj="visDefaultEditorField"]
+        `;
+      const fieldEl = await find.byCssSelector(selector);
+      await comboBox.setElement(fieldEl, fieldValue);
+    }
+
+    public async selectOrderByMetric(aggNth: number, metric: string) {
+      const sortSelect = await testSubjects.find(`visEditorOrderBy${aggNth}`);
+      const sortMetric = await sortSelect.findByCssSelector(`option[value="${metric}"]`);
+      await sortMetric.click();
+    }
+
+    public async selectCustomSortMetric(aggNth: number, metric: string, field: string) {
+      await this.selectOrderByMetric(aggNth, 'custom');
+      await this.selectAggregation(metric, 'buckets', true);
+      await this.selectField(field, 'buckets', true);
+    }
+
+    public async selectAggregation(
+      aggValue: string,
+      groupName = 'buckets',
+      childAggregationType = false
+    ) {
+      const comboBoxElement = await find.byCssSelector(`
+          [group-name="${groupName}"]
+          [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
+          ${childAggregationType ? '.visEditorAgg__subAgg' : ''}
+          [data-test-subj="defaultEditorAggSelect"]
+        `);
+
+      await comboBox.setElement(comboBoxElement, aggValue);
+      await common.sleep(500);
+    }
+
+    /**
+     * Set the test for a filter aggregation.
+     * @param {*} filterValue the string value of the filter
+     * @param {*} filterIndex used when multiple filters are configured on the same aggregation
+     * @param {*} aggregationId the ID if the aggregation. On Tests, it start at from 2
+     */
+    public async setFilterAggregationValue(
+      filterValue: string,
+      filterIndex = 0,
+      aggregationId = 2
+    ) {
+      await testSubjects.setValue(
+        `visEditorFilterInput_${aggregationId}_${filterIndex}`,
+        filterValue
+      );
+    }
+
+    public async setValue(newValue: string) {
+      const input = await find.byCssSelector('[data-test-subj="visEditorPercentileRanks"] input');
+      await input.clearValue();
+      await input.type(newValue);
+    }
+
+    public async clickEditorSidebarCollapse() {
+      await testSubjects.click('collapseSideBarButton');
+    }
+
+    public async clickDropPartialBuckets() {
+      await testSubjects.click('dropPartialBucketsCheckbox');
+    }
+
+    public async setMarkdownTxt(markdownTxt: string) {
+      const input = await testSubjects.find('markdownTextarea');
+      await input.clearValue();
+      await input.type(markdownTxt);
+    }
+
+    public async isSwitchChecked(selector: string) {
+      const checkbox = await testSubjects.find(selector);
+      const isChecked = await checkbox.getAttribute('aria-checked');
+      return isChecked === 'true';
+    }
+
+    public async checkSwitch(selector: string) {
+      const isChecked = await this.isSwitchChecked(selector);
+      if (!isChecked) {
+        log.debug(`checking switch ${selector}`);
+        await testSubjects.click(selector);
+      }
+    }
+
+    public async uncheckSwitch(selector: string) {
+      const isChecked = await this.isSwitchChecked(selector);
+      if (isChecked) {
+        log.debug(`unchecking switch ${selector}`);
+        await testSubjects.click(selector);
+      }
+    }
+
+    public async setIsFilteredByCollarCheckbox(value = true) {
+      await retry.try(async () => {
+        const isChecked = await this.isSwitchChecked('isFilteredByCollarCheckbox');
+        if (isChecked !== value) {
+          await testSubjects.click('isFilteredByCollarCheckbox');
+          throw new Error('isFilteredByCollar not set correctly');
+        }
+      });
+    }
+
+    public async setCustomLabel(label: string, index = 1) {
+      const customLabel = await testSubjects.find(`visEditorStringInput${index}customLabel`);
+      customLabel.type(label);
+    }
+
+    public async selectYAxisAggregation(agg: string, field: string, label: string, index = 1) {
+      // index starts on the first "count" metric at 1
+      // Each new metric or aggregation added to a visualization gets the next index.
+      // So to modify a metric or aggregation tests need to keep track of the
+      // order they are added.
+      await this.toggleOpenEditor(index);
+
+      // select our agg
+      const aggSelect = await find.byCssSelector(
+        `#visEditorAggAccordion${index} [data-test-subj="defaultEditorAggSelect"]`
+      );
+      await comboBox.setElement(aggSelect, agg);
+
+      const fieldSelect = await find.byCssSelector(
+        `#visEditorAggAccordion${index} [data-test-subj="visDefaultEditorField"]`
+      );
+      // select our field
+      await comboBox.setElement(fieldSelect, field);
+      // enter custom label
+      await this.setCustomLabel(label, index);
+    }
+
+    public async getField() {
+      return await comboBox.getComboBoxSelectedOptions('visDefaultEditorField');
+    }
+
+    public async sizeUpEditor() {
+      await testSubjects.click('visualizeEditorResizer');
+      await browser.pressKeys(browser.keys.ARROW_RIGHT);
+    }
+
+    public async toggleDisabledAgg(agg: string) {
+      await testSubjects.click(`visEditorAggAccordion${agg} > ~toggleDisableAggregationBtn`);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async toggleAggregationEditor(agg: string) {
+      await find.clickByCssSelector(
+        `[data-test-subj="visEditorAggAccordion${agg}"] .euiAccordion__button`
+      );
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async toggleOtherBucket(agg = 2) {
+      await testSubjects.click(`visEditorAggAccordion${agg} > otherBucketSwitch`);
+    }
+
+    public async toggleMissingBucket(agg = 2) {
+      await testSubjects.click(`visEditorAggAccordion${agg} > missingBucketSwitch`);
+    }
+
+    public async toggleScaleMetrics() {
+      await testSubjects.click('scaleMetricsSwitch');
+    }
+
+    public async toggleAutoMode() {
+      await testSubjects.click('visualizeEditorAutoButton');
+    }
+
+    public async isApplyEnabled() {
+      const applyButton = await testSubjects.find('visualizeEditorRenderButton');
+      return await applyButton.isEnabled();
+    }
+
+    public async toggleAccordion(id: string, toState = 'true') {
+      const toggle = await find.byCssSelector(`button[aria-controls="${id}"]`);
+      const toggleOpen = await toggle.getAttribute('aria-expanded');
+      log.debug(`toggle ${id} expand = ${toggleOpen}`);
+      if (toggleOpen !== toState) {
+        log.debug(`toggle ${id} click()`);
+        await toggle.click();
+      }
+    }
+
+    public async toggleOpenEditor(index: number, toState = 'true') {
+      // index, see selectYAxisAggregation
+      await this.toggleAccordion(`visEditorAggAccordion${index}`, toState);
+    }
+
+    public async toggleAdvancedParams(aggId: string) {
+      const accordion = await testSubjects.find(`advancedParams-${aggId}`);
+      const accordionButton = await find.descendantDisplayedByCssSelector('button', accordion);
+      await accordionButton.click();
+    }
+
+    public async clickReset() {
+      await testSubjects.click('visualizeEditorResetButton');
+      await visChart.waitForVisualization();
+    }
+
+    public async clickYAxisOptions(axisId: string) {
+      await testSubjects.click(`toggleYAxisOptions-${axisId}`);
+    }
+
+    public async clickYAxisAdvancedOptions(axisId: string) {
+      await testSubjects.click(`toggleYAxisAdvancedOptions-${axisId}`);
+    }
+
+    public async changeYAxisFilterLabelsCheckbox(axisId: string, enabled: boolean) {
+      const selector = `yAxisFilterLabelsCheckbox-${axisId}`;
+      await testSubjects.setCheckbox(selector, enabled ? 'check' : 'uncheck');
+    }
+
+    public async setSize(newValue: string, aggId: string) {
+      const dataTestSubj = aggId
+        ? `visEditorAggAccordion${aggId} > sizeParamEditor`
+        : 'sizeParamEditor';
+      await testSubjects.setValue(dataTestSubj, String(newValue));
+    }
+
+    public async selectChartMode(mode: string) {
+      const selector = await find.byCssSelector(`#seriesMode0 > option[value="${mode}"]`);
+      await selector.click();
+    }
+
+    public async selectYAxisScaleType(axisId: string, scaleType: string) {
+      const selectElement = await testSubjects.find(`scaleSelectYAxis-${axisId}`);
+      const selector = await selectElement.findByCssSelector(`option[value="${scaleType}"]`);
+      await selector.click();
+    }
+
+    public async selectYAxisMode(mode: string) {
+      const selector = await find.byCssSelector(`#valueAxisMode0 > option[value="${mode}"]`);
+      await selector.click();
+    }
+
+    public async setAxisExtents(min: string, max: string, axisId = 'ValueAxis-1') {
+      await this.toggleAccordion(`yAxisAccordion${axisId}`);
+      await this.toggleAccordion(`yAxisOptionsAccordion${axisId}`);
+
+      await testSubjects.click('yAxisSetYExtents');
+      await testSubjects.setValue('yAxisYExtentsMax', max);
+      await testSubjects.setValue('yAxisYExtentsMin', min);
+    }
+
+    public async selectAggregateWith(fieldValue: string) {
+      await testSubjects.selectValue('visDefaultEditorAggregateWith', fieldValue);
+    }
+
+    public async setInterval(newValue: string, options: IntervalOptions = {}) {
+      const { type = 'default', aggNth = 2, append = false } = options;
+      log.debug(`visEditor.setInterval(${newValue}, {${type}, ${aggNth}, ${append}})`);
+      if (type === 'default') {
+        await comboBox.set('visEditorInterval', newValue);
+      } else if (type === 'custom') {
+        await comboBox.setCustom('visEditorInterval', newValue);
+      } else {
+        if (append) {
+          await testSubjects.append(`visEditorInterval${aggNth}`, String(newValue));
+        } else {
+          await testSubjects.setValue(`visEditorInterval${aggNth}`, String(newValue));
+        }
+      }
+    }
+
+    public async getInterval() {
+      return await comboBox.getComboBoxSelectedOptions('visEditorInterval');
+    }
+
+    public async getNumericInterval(agg = 2) {
+      return await testSubjects.getAttribute(`visEditorInterval${agg}`, 'value');
+    }
+
+    public async clickMetricEditor() {
+      await find.clickByCssSelector('[group-name="metrics"] .euiAccordion__button');
+    }
+
+    public async clickMetricByIndex(index: number) {
+      const metrics = await find.allByCssSelector(
+        '[data-test-subj="visualizationLoader"] .mtrVis .mtrVis__container'
+      );
+      expect(metrics.length).greaterThan(index);
+      await metrics[index].click();
+    }
+
+    public async setSelectByOptionText(selectId: string, optionText: string) {
+      const selectField = await find.byCssSelector(`#${selectId}`);
+      const options = await find.allByCssSelector(`#${selectId} > option`);
+      const $ = await selectField.parseDomContent();
+      const optionsText = $('option')
+        .toArray()
+        .map(option => $(option).text());
+      const optionIndex = optionsText.indexOf(optionText);
+
+      if (optionIndex === -1) {
+        throw new Error(
+          `Unable to find option '${optionText}' in select ${selectId}. Available options: ${optionsText.join(
+            ','
+          )}`
+        );
+      }
+      await options[optionIndex].click();
+    }
+  }
+
+  return new VisualizeEditorPage();
+}
diff --git a/test/functional/page_objects/visualize_page.js b/test/functional/page_objects/visualize_page.js
deleted file mode 100644
index c1ea8be9be98b9..00000000000000
--- a/test/functional/page_objects/visualize_page.js
+++ /dev/null
@@ -1,1402 +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 { VisualizeConstants } from '../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
-import Bluebird from 'bluebird';
-import expect from '@kbn/expect';
-
-export function VisualizePageProvider({ getService, getPageObjects, updateBaselines }) {
-  const browser = getService('browser');
-  const config = getService('config');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const find = getService('find');
-  const log = getService('log');
-  const inspector = getService('inspector');
-  const screenshot = getService('screenshots');
-  const table = getService('table');
-  const globalNav = getService('globalNav');
-  const PageObjects = getPageObjects(['common', 'header']);
-  const defaultFindTimeout = config.get('timeouts.find');
-  const comboBox = getService('comboBox');
-
-  class VisualizePage {
-    get index() {
-      return {
-        LOGSTASH_TIME_BASED: 'logstash-*',
-        LOGSTASH_NON_TIME_BASED: 'logstash*',
-      };
-    }
-
-    async gotoVisualizationLandingPage() {
-      log.debug('gotoVisualizationLandingPage');
-      await PageObjects.common.navigateToApp('visualize');
-    }
-
-    async checkListingSelectAllCheckbox() {
-      const element = await testSubjects.find('checkboxSelectAll');
-      const isSelected = await element.isSelected();
-      if (!isSelected) {
-        log.debug(`checking checkbox "checkboxSelectAll"`);
-        await testSubjects.click('checkboxSelectAll');
-      }
-    }
-
-    async navigateToNewVisualization() {
-      log.debug('navigateToApp visualize');
-      await PageObjects.common.navigateToApp('visualize');
-      await this.clickNewVisualization();
-      await this.waitForVisualizationSelectPage();
-    }
-
-    async clickNewVisualization() {
-      // newItemButton button is only visible when there are items in the listing table is displayed.
-      let exists = await testSubjects.exists('newItemButton');
-      if (exists) {
-        return await testSubjects.click('newItemButton');
-      }
-
-      exists = await testSubjects.exists('createVisualizationPromptButton');
-      // no viz exist, click createVisualizationPromptButton to create new dashboard
-      return await this.createVisualizationPromptButton();
-    }
-
-    /*
-    This method should use retry loop to delete visualizations from multiple pages until we find the createVisualizationPromptButton.
-    Perhaps it *could* set the page size larger than the default 10, but it might still need to loop anyway.
-    */
-    async deleteAllVisualizations() {
-      await retry.try(async () => {
-        await this.checkListingSelectAllCheckbox();
-        await this.clickDeleteSelected();
-        await PageObjects.common.clickConfirmOnModal();
-        await testSubjects.find('createVisualizationPromptButton');
-      });
-    }
-
-    async createSimpleMarkdownViz(vizName) {
-      await this.gotoVisualizationLandingPage();
-      await this.navigateToNewVisualization();
-      await this.clickMarkdownWidget();
-      await this.setMarkdownTxt(vizName);
-      await this.clickGo();
-      await this.saveVisualization(vizName);
-    }
-
-    async createVisualizationPromptButton() {
-      await testSubjects.click('createVisualizationPromptButton');
-    }
-
-    async getSearchFilter() {
-      const searchFilter = await find.allByCssSelector('.euiFieldSearch');
-      return searchFilter[0];
-    }
-
-    async clearFilter() {
-      const searchFilter = await this.getSearchFilter();
-      await searchFilter.clearValue();
-      await searchFilter.click();
-    }
-
-    async searchForItemWithName(name) {
-      log.debug(`searchForItemWithName: ${name}`);
-
-      await retry.try(async () => {
-        const searchFilter = await this.getSearchFilter();
-        await searchFilter.clearValue();
-        await searchFilter.click();
-        // Note: this replacement of - to space is to preserve original logic but I'm not sure why or if it's needed.
-        await searchFilter.type(name.replace('-', ' '));
-        await PageObjects.common.pressEnterKey();
-      });
-
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickDeleteSelected() {
-      await testSubjects.click('deleteSelectedItems');
-    }
-
-    async getCreatePromptExists() {
-      log.debug('getCreatePromptExists');
-      return await testSubjects.exists('createVisualizationPromptButton');
-    }
-
-    async getCountOfItemsInListingTable() {
-      const elements = await find.allByCssSelector('[data-test-subj^="visListingTitleLink"]');
-      return elements.length;
-    }
-
-    async waitForVisualizationSelectPage() {
-      await retry.try(async () => {
-        const visualizeSelectTypePage = await testSubjects.find('visNewDialogTypes');
-        if (!(await visualizeSelectTypePage.isDisplayed())) {
-          throw new Error('wait for visualization select page');
-        }
-      });
-    }
-
-    async clickVisType(type) {
-      await testSubjects.click(`visType-${type}`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickAreaChart() {
-      await this.clickVisType('area');
-    }
-
-    async clickDataTable() {
-      await this.clickVisType('table');
-    }
-
-    async clickLineChart() {
-      await this.clickVisType('line');
-    }
-
-    async clickRegionMap() {
-      await this.clickVisType('region_map');
-    }
-
-    async clickMarkdownWidget() {
-      await this.clickVisType('markdown');
-    }
-
-    // clickBucket(bucketName) 'X-axis', 'Split area', 'Split chart'
-    async clickBucket(bucketName, type = 'buckets') {
-      await testSubjects.click(`visEditorAdd_${type}`);
-      await find.clickByCssSelector(`[data-test-subj="visEditorAdd_${type}_${bucketName}"`);
-    }
-
-    async clickMetric() {
-      await this.clickVisType('metric');
-    }
-
-    async clickGauge() {
-      await this.clickVisType('gauge');
-    }
-
-    async clickPieChart() {
-      await this.clickVisType('pie');
-    }
-
-    async clickTileMap() {
-      await this.clickVisType('tile_map');
-    }
-
-    async clickTagCloud() {
-      await this.clickVisType('tagcloud');
-    }
-
-    async clickVega() {
-      await this.clickVisType('vega');
-    }
-
-    async clickVisualBuilder() {
-      await this.clickVisType('metrics');
-    }
-
-    async clickEditorSidebarCollapse() {
-      await testSubjects.click('collapseSideBarButton');
-    }
-
-    async selectTagCloudTag(tagDisplayText) {
-      await testSubjects.click(tagDisplayText);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async getTextTag() {
-      await this.waitForVisualization();
-      const elements = await find.allByCssSelector('text');
-      return await Promise.all(elements.map(async element => await element.getVisibleText()));
-    }
-
-    async getTextSizes() {
-      const tags = await find.allByCssSelector('text');
-      async function returnTagSize(tag) {
-        const style = await tag.getAttribute('style');
-        return style.match(/font-size: ([^;]*);/)[1];
-      }
-      return await Promise.all(tags.map(returnTagSize));
-    }
-
-    async clickVerticalBarChart() {
-      await this.clickVisType('histogram');
-    }
-
-    async clickHeatmapChart() {
-      await this.clickVisType('heatmap');
-    }
-
-    async clickInputControlVis() {
-      await this.clickVisType('input_control_vis');
-    }
-
-    async getChartTypes() {
-      const chartTypeField = await testSubjects.find('visNewDialogTypes');
-      const chartTypes = await chartTypeField.findAllByTagName('button');
-      async function getChartType(chart) {
-        const label = await testSubjects.findDescendant('visTypeTitle', chart);
-        return await label.getVisibleText();
-      }
-      const getChartTypesPromises = chartTypes.map(getChartType);
-      return await Promise.all(getChartTypesPromises);
-    }
-
-    async selectVisSourceIfRequired() {
-      log.debug('selectVisSourceIfRequired');
-      const selectPage = await testSubjects.findAll('visualizeSelectSearch');
-      if (selectPage.length) {
-        log.debug('a search is required for this visualization');
-        await this.clickNewSearch();
-      }
-    }
-
-    async isBetaInfoShown() {
-      return await testSubjects.exists('betaVisInfo');
-    }
-
-    async getBetaTypeLinks() {
-      return await find.allByCssSelector('[data-vis-stage="beta"]');
-    }
-
-    async getExperimentalTypeLinks() {
-      return await find.allByCssSelector('[data-vis-stage="experimental"]');
-    }
-
-    async isExperimentalInfoShown() {
-      return await testSubjects.exists('experimentalVisInfo');
-    }
-
-    async getExperimentalInfo() {
-      return await testSubjects.find('experimentalVisInfo');
-    }
-
-    async clickAbsoluteButton() {
-      await find.clickByCssSelector(
-        'ul.nav.nav-pills.nav-stacked.kbn-timepicker-modes:contains("absolute")',
-        defaultFindTimeout * 2
-      );
-    }
-
-    async clickDropPartialBuckets() {
-      return await testSubjects.click('dropPartialBucketsCheckbox');
-    }
-
-    async setMarkdownTxt(markdownTxt) {
-      const input = await testSubjects.find('markdownTextarea');
-      await input.clearValue();
-      await input.type(markdownTxt);
-    }
-
-    async getMarkdownText() {
-      const markdownContainer = await testSubjects.find('markdownBody');
-      return markdownContainer.getVisibleText();
-    }
-
-    async getMarkdownBodyDescendentText(selector) {
-      const markdownContainer = await testSubjects.find('markdownBody');
-      const element = await find.descendantDisplayedByCssSelector(selector, markdownContainer);
-      return element.getVisibleText();
-    }
-
-    async getVegaSpec() {
-      // Adapted from console_page.js:getVisibleTextFromAceEditor(). Is there a common utilities file?
-      const editor = await testSubjects.find('vega-editor');
-      const lines = await editor.findAllByClassName('ace_line_group');
-      const linesText = await Bluebird.map(lines, l => l.getVisibleText());
-      return linesText.join('\n');
-    }
-
-    async getVegaViewContainer() {
-      return await find.byCssSelector('div.vgaVis__view');
-    }
-
-    async getVegaControlContainer() {
-      return await find.byCssSelector('div.vgaVis__controls');
-    }
-
-    async addInputControl(type) {
-      if (type) {
-        const selectInput = await testSubjects.find('selectControlType');
-        await selectInput.type(type);
-      }
-      await testSubjects.click('inputControlEditorAddBtn');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async inputControlSubmit() {
-      await testSubjects.clickWhenNotDisabled('inputControlSubmitBtn');
-      await this.waitForVisualizationRenderingStabilized();
-    }
-
-    async inputControlClear() {
-      await testSubjects.click('inputControlClearBtn');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async isChecked(selector) {
-      const checkbox = await testSubjects.find(selector);
-      return await checkbox.isSelected();
-    }
-
-    async checkCheckbox(selector) {
-      const isChecked = await this.isChecked(selector);
-      if (!isChecked) {
-        log.debug(`checking checkbox ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
-
-    async uncheckCheckbox(selector) {
-      const isChecked = await this.isChecked(selector);
-      if (isChecked) {
-        log.debug(`unchecking checkbox ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
-
-    async isSwitchChecked(selector) {
-      const checkbox = await testSubjects.find(selector);
-      const isChecked = await checkbox.getAttribute('aria-checked');
-      return isChecked === 'true';
-    }
-
-    async checkSwitch(selector) {
-      const isChecked = await this.isSwitchChecked(selector);
-      if (!isChecked) {
-        log.debug(`checking switch ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
-
-    async uncheckSwitch(selector) {
-      const isChecked = await this.isSwitchChecked(selector);
-      if (isChecked) {
-        log.debug(`unchecking switch ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
-
-    async setSelectByOptionText(selectId, optionText) {
-      const selectField = await find.byCssSelector(`#${selectId}`);
-      const options = await find.allByCssSelector(`#${selectId} > option`);
-      const $ = await selectField.parseDomContent();
-      const optionsText = $('option')
-        .toArray()
-        .map(option => $(option).text());
-      const optionIndex = optionsText.indexOf(optionText);
-
-      if (optionIndex === -1) {
-        throw new Error(
-          `Unable to find option '${optionText}' in select ${selectId}. Available options: ${optionsText.join(
-            ','
-          )}`
-        );
-      }
-      await options[optionIndex].click();
-    }
-
-    async getSideEditorExists() {
-      return await find.existsByCssSelector('.collapsible-sidebar');
-    }
-
-    async setInspectorTablePageSize(size) {
-      const panel = await testSubjects.find('inspectorPanel');
-      await find.clickByButtonText('Rows per page: 20', panel);
-      // The buttons for setting table page size are in a popover element. This popover
-      // element appears as if it's part of the inspectorPanel but it's really attached
-      // to the body element by a portal.
-      const tableSizesPopover = await find.byCssSelector('.euiPanel');
-      await find.clickByButtonText(`${size} rows`, tableSizesPopover);
-    }
-
-    async getMetric() {
-      const elements = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .mtrVis__container'
-      );
-      const values = await Promise.all(
-        elements.map(async element => {
-          const text = await element.getVisibleText();
-          return text;
-        })
-      );
-      return values
-        .filter(item => item.length > 0)
-        .reduce((arr, item) => arr.concat(item.split('\n')), []);
-    }
-
-    async getGaugeValue() {
-      const elements = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .chart svg text'
-      );
-      const values = await Promise.all(
-        elements.map(async element => {
-          const text = await element.getVisibleText();
-          return text;
-        })
-      );
-      return values.filter(item => item.length > 0);
-    }
-
-    async clickMetricEditor() {
-      await find.clickByCssSelector('[group-name="metrics"] .euiAccordion__button');
-    }
-
-    async clickMetricByIndex(index) {
-      log.debug(`clickMetricByIndex(${index})`);
-      const metrics = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .mtrVis .mtrVis__container'
-      );
-      expect(metrics.length).greaterThan(index);
-      await metrics[index].click();
-    }
-
-    async clickNewSearch(indexPattern = this.index.LOGSTASH_TIME_BASED) {
-      await testSubjects.click(`savedObjectTitle${indexPattern.split(' ').join('-')}`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickSavedSearch(savedSearchName) {
-      await testSubjects.click(`savedObjectTitle${savedSearchName.split(' ').join('-')}`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickUnlinkSavedSearch() {
-      await testSubjects.doubleClick('unlinkSavedSearch');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async setValue(newValue) {
-      const input = await find.byCssSelector('[data-test-subj="visEditorPercentileRanks"] input');
-      await input.clearValue();
-      await input.type(newValue);
-    }
-
-    async selectSearch(searchName) {
-      await find.clickByLinkText(searchName);
-    }
-
-    async getErrorMessage() {
-      const element = await find.byCssSelector('.item>h4');
-      return await element.getVisibleText();
-    }
-
-    async selectAggregation(myString, groupName = 'buckets', childAggregationType = null) {
-      const comboBoxElement = await find.byCssSelector(`
-        [group-name="${groupName}"]
-        [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
-        ${childAggregationType ? '.visEditorAgg__subAgg' : ''}
-        [data-test-subj="defaultEditorAggSelect"]
-      `);
-
-      await comboBox.setElement(comboBoxElement, myString);
-      await PageObjects.common.sleep(500);
-    }
-
-    async applyFilters() {
-      return await testSubjects.click('filterBarApplyFilters');
-    }
-    /**
-     * Set the test for a filter aggregation.
-     * @param {*} filterValue the string value of the filter
-     * @param {*} filterIndex used when multiple filters are configured on the same aggregation
-     * @param {*} aggregationId the ID if the aggregation. On Tests, it start at from 2
-     */
-    async setFilterAggregationValue(filterValue, filterIndex = 0, aggregationId = 2) {
-      await testSubjects.setValue(
-        `visEditorFilterInput_${aggregationId}_${filterIndex}`,
-        filterValue
-      );
-    }
-
-    async addNewFilterAggregation() {
-      return await testSubjects.click('visEditorAddFilterButton');
-    }
-
-    async toggleOpenEditor(index, toState = 'true') {
-      // index, see selectYAxisAggregation
-      await this.toggleAccordion(`visEditorAggAccordion${index}`, toState);
-    }
-
-    async toggleAccordion(id, toState = 'true') {
-      const toggle = await find.byCssSelector(`button[aria-controls="${id}"]`);
-      const toggleOpen = await toggle.getAttribute('aria-expanded');
-      log.debug(`toggle ${id} expand = ${toggleOpen}`);
-      if (toggleOpen !== toState) {
-        log.debug(`toggle ${id} click()`);
-        await toggle.click();
-      }
-    }
-
-    async toggleAdvancedParams(aggId) {
-      const accordion = await testSubjects.find(`advancedParams-${aggId}`);
-      const accordionButton = await find.descendantDisplayedByCssSelector('button', accordion);
-      await accordionButton.click();
-    }
-
-    async selectYAxisAggregation(agg, field, label, index = 1) {
-      // index starts on the first "count" metric at 1
-      // Each new metric or aggregation added to a visualization gets the next index.
-      // So to modify a metric or aggregation tests need to keep track of the
-      // order they are added.
-      await this.toggleOpenEditor(index);
-
-      // select our agg
-      const aggSelect = await find.byCssSelector(
-        `#visEditorAggAccordion${index} [data-test-subj="defaultEditorAggSelect"]`
-      );
-      await comboBox.setElement(aggSelect, agg);
-
-      const fieldSelect = await find.byCssSelector(
-        `#visEditorAggAccordion${index} [data-test-subj="visDefaultEditorField"]`
-      );
-      // select our field
-      await comboBox.setElement(fieldSelect, field);
-      // enter custom label
-      await this.setCustomLabel(label, index);
-    }
-
-    async setCustomLabel(label, index = 1) {
-      const customLabel = await testSubjects.find(`visEditorStringInput${index}customLabel`);
-      customLabel.type(label);
-    }
-
-    async setAxisExtents(min, max, axisId = 'ValueAxis-1') {
-      await this.toggleAccordion(`yAxisAccordion${axisId}`);
-      await this.toggleAccordion(`yAxisOptionsAccordion${axisId}`);
-
-      await testSubjects.click('yAxisSetYExtents');
-      await testSubjects.setValue('yAxisYExtentsMax', max);
-      await testSubjects.setValue('yAxisYExtentsMin', min);
-    }
-
-    async getField() {
-      return await comboBox.getComboBoxSelectedOptions('visDefaultEditorField');
-    }
-
-    async selectField(fieldValue, groupName = 'buckets', childAggregationType = null) {
-      log.debug(`selectField ${fieldValue}`);
-      const selector = `
-        [group-name="${groupName}"]
-        [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
-        [data-test-subj="visAggEditorParams"]
-        ${childAggregationType ? '.visEditorAgg__subAgg' : ''}
-        [data-test-subj="visDefaultEditorField"]
-      `;
-      const fieldEl = await find.byCssSelector(selector);
-      await comboBox.setElement(fieldEl, fieldValue);
-    }
-
-    async selectAggregateWith(fieldValue) {
-      await testSubjects.selectValue('visDefaultEditorAggregateWith', fieldValue);
-    }
-
-    async getInterval() {
-      return await comboBox.getComboBoxSelectedOptions('visEditorInterval');
-    }
-
-    async setInterval(newValue) {
-      log.debug(`Visualize.setInterval(${newValue})`);
-      return await comboBox.set('visEditorInterval', newValue);
-    }
-
-    async setCustomInterval(newValue) {
-      log.debug(`Visualize.setCustomInterval(${newValue})`);
-      return await comboBox.setCustom('visEditorInterval', newValue);
-    }
-
-    async getNumericInterval(agg = 2) {
-      return await testSubjects.getAttribute(`visEditorInterval${agg}`, 'value');
-    }
-
-    async setNumericInterval(newValue, { append } = {}, agg = 2) {
-      if (append) {
-        await testSubjects.append(`visEditorInterval${agg}`, String(newValue));
-      } else {
-        await testSubjects.setValue(`visEditorInterval${agg}`, String(newValue));
-      }
-    }
-
-    async setSize(newValue, aggId) {
-      const dataTestSubj = aggId
-        ? `visEditorAggAccordion${aggId} > sizeParamEditor`
-        : 'sizeParamEditor';
-      await testSubjects.setValue(dataTestSubj, String(newValue));
-    }
-
-    async toggleDisabledAgg(agg) {
-      await testSubjects.click(`visEditorAggAccordion${agg} > ~toggleDisableAggregationBtn`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async toggleAggregationEditor(agg) {
-      await find.clickByCssSelector(
-        `[data-test-subj="visEditorAggAccordion${agg}"] .euiAccordion__button`
-      );
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async toggleOtherBucket(agg = 2) {
-      return await testSubjects.click(`visEditorAggAccordion${agg} > otherBucketSwitch`);
-    }
-
-    async toggleMissingBucket(agg = 2) {
-      return await testSubjects.click(`visEditorAggAccordion${agg} > missingBucketSwitch`);
-    }
-
-    async toggleScaleMetrics() {
-      return await testSubjects.click('scaleMetricsSwitch');
-    }
-
-    async isApplyEnabled() {
-      const applyButton = await testSubjects.find('visualizeEditorRenderButton');
-      return await applyButton.isEnabled();
-    }
-
-    async clickGo() {
-      const prevRenderingCount = await this.getVisualizationRenderingCount();
-      log.debug(`Before Rendering count ${prevRenderingCount}`);
-      await testSubjects.clickWhenNotDisabled('visualizeEditorRenderButton');
-      await this.waitForRenderingCount(prevRenderingCount + 1);
-    }
-
-    async clickReset() {
-      await testSubjects.click('visualizeEditorResetButton');
-      await this.waitForVisualization();
-    }
-
-    async toggleAutoMode() {
-      await testSubjects.click('visualizeEditorAutoButton');
-    }
-
-    async sizeUpEditor() {
-      await testSubjects.click('visualizeEditorResizer');
-      await browser.pressKeys(browser.keys.ARROW_RIGHT);
-    }
-
-    async clickOptions() {
-      await find.clickByPartialLinkText('Options');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async changeHeatmapColorNumbers(value = 6) {
-      const input = await testSubjects.find(`heatmapColorsNumber`);
-      await input.clearValueWithKeyboard();
-      await input.type(`${value}`);
-    }
-
-    async clickMetricsAndAxes() {
-      await testSubjects.click('visEditorTabadvanced');
-    }
-
-    async clickOptionsTab() {
-      await testSubjects.click('visEditorTaboptions');
-    }
-
-    async clickEnableCustomRanges() {
-      await testSubjects.click('heatmapUseCustomRanges');
-    }
-
-    async clickAddRange() {
-      await testSubjects.click(`heatmapColorRange__addRangeButton`);
-    }
-
-    async setCustomRangeByIndex(index, from, to) {
-      await testSubjects.setValue(`heatmapColorRange${index}__from`, from);
-      await testSubjects.setValue(`heatmapColorRange${index}__to`, to);
-    }
-
-    async clickYAxisOptions(axisId) {
-      await testSubjects.click(`toggleYAxisOptions-${axisId}`);
-    }
-
-    async clickYAxisAdvancedOptions(axisId) {
-      await testSubjects.click(`toggleYAxisAdvancedOptions-${axisId}`);
-    }
-
-    async changeYAxisFilterLabelsCheckbox(axisId, enabled) {
-      const selector = `yAxisFilterLabelsCheckbox-${axisId}`;
-      enabled ? await this.checkCheckbox(selector) : await this.uncheckCheckbox(selector);
-    }
-
-    async selectChartMode(mode) {
-      const selector = await find.byCssSelector(`#seriesMode0 > option[value="${mode}"]`);
-      await selector.click();
-    }
-
-    async selectYAxisScaleType(axisId, scaleType) {
-      const selectElement = await testSubjects.find(`scaleSelectYAxis-${axisId}`);
-      const selector = await selectElement.findByCssSelector(`option[value="${scaleType}"]`);
-      await selector.click();
-    }
-
-    async selectYAxisMode(mode) {
-      const selector = await find.byCssSelector(`#valueAxisMode0 > option[value="${mode}"]`);
-      await selector.click();
-    }
-
-    async clickData() {
-      await testSubjects.click('visualizeEditDataLink');
-    }
-
-    async clickVisEditorTab(tabName) {
-      await testSubjects.click('visEditorTab' + tabName);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async selectWMS() {
-      await find.clickByCssSelector('input[name="wms.enabled"]');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async ensureSavePanelOpen() {
-      log.debug('ensureSavePanelOpen');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      const isOpen = await testSubjects.exists('savedObjectSaveModal', { timeout: 5000 });
-      if (!isOpen) {
-        await testSubjects.click('visualizeSaveButton');
-      }
-    }
-
-    async saveVisualization(vizName, { saveAsNew = false } = {}) {
-      await this.ensureSavePanelOpen();
-      await testSubjects.setValue('savedObjectTitle', vizName);
-      if (saveAsNew) {
-        log.debug('Check save as new visualization');
-        await testSubjects.click('saveAsNewCheckbox');
-      }
-      log.debug('Click Save Visualization button');
-
-      await testSubjects.click('confirmSaveSavedObjectButton');
-
-      // Confirm that the Visualization has actually been saved
-      await testSubjects.existOrFail('saveVisualizationSuccess');
-      const message = await PageObjects.common.closeToast();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await PageObjects.common.waitForSaveModalToClose();
-
-      return message;
-    }
-
-    async saveVisualizationExpectSuccess(vizName, { saveAsNew = false } = {}) {
-      const saveMessage = await this.saveVisualization(vizName, { saveAsNew });
-      if (!saveMessage) {
-        throw new Error(
-          `Expected saveVisualization to respond with the saveMessage from the toast, got ${saveMessage}`
-        );
-      }
-    }
-
-    async saveVisualizationExpectSuccessAndBreadcrumb(vizName, { saveAsNew = false } = {}) {
-      await this.saveVisualizationExpectSuccess(vizName, { saveAsNew });
-      await retry.waitFor(
-        'last breadcrumb to have new vis name',
-        async () => (await globalNav.getLastBreadcrumb()) === vizName
-      );
-    }
-
-    async clickLoadSavedVisButton() {
-      // TODO: Use a test subject selector once we rewrite breadcrumbs to accept each breadcrumb
-      // element as a child instead of building the breadcrumbs dynamically.
-      await find.clickByCssSelector('[href="#/visualize"]');
-    }
-
-    async filterVisByName(vizName) {
-      const input = await find.byCssSelector('input[name="filter"]');
-      await input.click();
-      // can't uses dashes in saved visualizations when filtering
-      // or extended character sets
-      // https://github.com/elastic/kibana/issues/6300
-      await input.type(vizName.replace('-', ' '));
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickVisualizationByName(vizName) {
-      log.debug('clickVisualizationByLinkText(' + vizName + ')');
-      return find.clickByPartialLinkText(vizName);
-    }
-
-    async loadSavedVisualization(vizName, { navigateToVisualize = true } = {}) {
-      if (navigateToVisualize) {
-        await this.clickLoadSavedVisButton();
-      }
-      await this.openSavedVisualization(vizName);
-    }
-
-    async openSavedVisualization(vizName) {
-      await this.clickVisualizationByName(vizName);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async getXAxisLabels() {
-      const xAxis = await find.byCssSelector('.visAxis--x.visAxis__column--bottom');
-      const $ = await xAxis.parseDomContent();
-      return $('.x > g > text')
-        .toArray()
-        .map(tick =>
-          $(tick)
-            .text()
-            .trim()
-        );
-    }
-
-    async getYAxisLabels() {
-      const yAxis = await find.byCssSelector('.visAxis__column--y.visAxis__column--left');
-      const $ = await yAxis.parseDomContent();
-      return $('.y > g > text')
-        .toArray()
-        .map(tick =>
-          $(tick)
-            .text()
-            .trim()
-        );
-    }
-
-    /**
-     * Removes chrome and takes a small screenshot of a vis to compare against a baseline.
-     * @param {string} name The name of the baseline image.
-     * @param {object} opts Options object.
-     * @param {number} opts.threshold Threshold for allowed variance when comparing images.
-     */
-    async expectVisToMatchScreenshot(name, opts = { threshold: 0.05 }) {
-      log.debug(`expectVisToMatchScreenshot(${name})`);
-
-      // Collapse sidebar and inject some CSS to hide the nav so we have a focused screenshot
-      await this.clickEditorSidebarCollapse();
-      await this.waitForVisualizationRenderingStabilized();
-      await browser.execute(`
-        var el = document.createElement('style');
-        el.id = '__data-test-style';
-        el.innerHTML = '[data-test-subj="headerGlobalNav"] { display: none; } ';
-        el.innerHTML += '[data-test-subj="top-nav"] { display: none; } ';
-        el.innerHTML += '[data-test-subj="experimentalVisInfo"] { display: none; } ';
-        document.body.appendChild(el);
-      `);
-
-      const percentDifference = await screenshot.compareAgainstBaseline(name, updateBaselines);
-
-      // Reset the chart to its original state
-      await browser.execute(`
-        var el = document.getElementById('__data-test-style');
-        document.body.removeChild(el);
-      `);
-      await this.clickEditorSidebarCollapse();
-      await this.waitForVisualizationRenderingStabilized();
-      expect(percentDifference).to.be.lessThan(opts.threshold);
-    }
-
-    /*
-     ** This method gets the chart data and scales it based on chart height and label.
-     ** Returns an array of height values
-     */
-    async getAreaChartData(dataLabel, axis = 'ValueAxis-1') {
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
-
-      const rectangle = await find.byCssSelector('rect.background');
-      const yAxisHeight = await rectangle.getAttribute('height');
-      log.debug(`height --------- ${yAxisHeight}`);
-
-      const path = await retry.try(
-        async () =>
-          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
-      );
-      const data = await path.getAttribute('d');
-      log.debug(data);
-      // This area chart data starts with a 'M'ove to a x,y location, followed
-      // by a bunch of 'L'ines from that point to the next.  Those points are
-      // the values we're going to use to calculate the data values we're testing.
-      // So git rid of the one 'M' and split the rest on the 'L's.
-      const tempArray = data
-        .replace('M ', '')
-        .replace('M', '')
-        .replace(/ L /g, 'L')
-        .replace(/ /g, ',')
-        .split('L');
-      const chartSections = tempArray.length / 2;
-      // log.debug('chartSections = ' + chartSections + ' height = ' + yAxisHeight + ' yAxisLabel = ' + yAxisLabel);
-      const chartData = [];
-      for (let i = 0; i < chartSections; i++) {
-        chartData[i] = Math.round((yAxisHeight - tempArray[i].split(',')[1]) * yAxisRatio);
-        log.debug('chartData[i] =' + chartData[i]);
-      }
-      return chartData;
-    }
-
-    /*
-     ** This method returns the paths that compose an area chart.
-     */
-    async getAreaChartPaths(dataLabel) {
-      const path = await retry.try(
-        async () =>
-          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
-      );
-      const data = await path.getAttribute('d');
-      log.debug(data);
-      // This area chart data starts with a 'M'ove to a x,y location, followed
-      // by a bunch of 'L'ines from that point to the next.  Those points are
-      // the values we're going to use to calculate the data values we're testing.
-      // So git rid of the one 'M' and split the rest on the 'L's.
-      return data.split('L');
-    }
-
-    // The current test shows dots, not a line.  This function gets the dots and normalizes their height.
-    async getLineChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
-      // 1). get the range/pixel ratio
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
-      // 2). find and save the y-axis pixel size (the chart height)
-      const rectangle = await find.byCssSelector('clipPath rect');
-      const yAxisHeight = await rectangle.getAttribute('height');
-      // 3). get the visWrapper__chart elements
-      const chartTypes = await retry.try(
-        async () =>
-          await find.allByCssSelector(
-            `.visWrapper__chart circle[data-label="${dataLabel}"][fill-opacity="1"]`,
-            defaultFindTimeout * 2
-          )
-      );
-      // 4). for each chart element, find the green circle, then the cy position
-      const chartData = await Promise.all(
-        chartTypes.map(async chart => {
-          const cy = await chart.getAttribute('cy');
-          // the point_series_options test has data in the billions range and
-          // getting 11 digits of precision with these calculations is very hard
-          return Math.round(((yAxisHeight - cy) * yAxisRatio).toPrecision(6));
-        })
-      );
-
-      return chartData;
-    }
-
-    // this is ALMOST identical to DiscoverPage.getBarChartData
-    async getBarChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
-      // 1). get the range/pixel ratio
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
-      // 3). get the visWrapper__chart elements
-      const svg = await find.byCssSelector('div.chart');
-      const $ = await svg.parseDomContent();
-      const chartData = $(`g > g.series > rect[data-label="${dataLabel}"]`)
-        .toArray()
-        .map(chart => {
-          const barHeight = $(chart).attr('height');
-          return Math.round(barHeight * yAxisRatio);
-        });
-
-      return chartData;
-    }
-
-    // Returns value per pixel
-    async getChartYAxisRatio(axis = 'ValueAxis-1') {
-      // 1). get the maximum chart Y-Axis marker value and Y position
-      const maxYAxisChartMarker = await retry.try(
-        async () =>
-          await find.byCssSelector(
-            `div.visAxis__splitAxes--y > div > svg > g.${axis} > g:last-of-type.tick`
-          )
-      );
-      const maxYLabel = (await maxYAxisChartMarker.getVisibleText()).replace(/,/g, '');
-      const maxYLabelYPosition = (await maxYAxisChartMarker.getPosition()).y;
-      log.debug(`maxYLabel = ${maxYLabel}, maxYLabelYPosition = ${maxYLabelYPosition}`);
-
-      // 2). get the minimum chart Y-Axis marker value and Y position
-      const minYAxisChartMarker = await find.byCssSelector(
-        'div.visAxis__column--y.visAxis__column--left  > div > div > svg:nth-child(2) > g > g:nth-child(1).tick'
-      );
-      const minYLabel = (await minYAxisChartMarker.getVisibleText()).replace(',', '');
-      const minYLabelYPosition = (await minYAxisChartMarker.getPosition()).y;
-      return (maxYLabel - minYLabel) / (minYLabelYPosition - maxYLabelYPosition);
-    }
-
-    async getHeatmapData() {
-      const chartTypes = await retry.try(
-        async () => await find.allByCssSelector('svg > g > g.series rect', defaultFindTimeout * 2)
-      );
-      log.debug('rects=' + chartTypes);
-      async function getChartType(chart) {
-        return await chart.getAttribute('data-label');
-      }
-      const getChartTypesPromises = chartTypes.map(getChartType);
-      return await Promise.all(getChartTypesPromises);
-    }
-
-    async expectError() {
-      return await testSubjects.existOrFail('visLibVisualizeError');
-    }
-
-    async getChartAreaWidth() {
-      const rect = await retry.try(async () => find.byCssSelector('clipPath rect'));
-      return await rect.getAttribute('width');
-    }
-
-    async getChartAreaHeight() {
-      const rect = await retry.try(async () => find.byCssSelector('clipPath rect'));
-      return await rect.getAttribute('height');
-    }
-
-    /**
-     * If you are writing new tests, you should rather look into getTableVisContent method instead.
-     */
-    async getTableVisData() {
-      return await testSubjects.getVisibleText('paginated-table-body');
-    }
-
-    /**
-     * This function is the newer function to retrieve data from within a table visualization.
-     * It uses a better return format, than the old getTableVisData, by properly splitting
-     * cell values into arrays. Please use this function for newer tests.
-     */
-    async getTableVisContent({ stripEmptyRows = true } = {}) {
-      return await retry.try(async () => {
-        const container = await testSubjects.find('tableVis');
-        const allTables = await testSubjects.findAllDescendant('paginated-table-body', container);
-
-        if (allTables.length === 0) {
-          return [];
-        }
-
-        const allData = await Promise.all(
-          allTables.map(async t => {
-            let data = await table.getDataFromElement(t);
-            if (stripEmptyRows) {
-              data = data.filter(row => row.length > 0 && row.some(cell => cell.trim().length > 0));
-            }
-            return data;
-          })
-        );
-
-        if (allTables.length === 1) {
-          // If there was only one table we return only the data for that table
-          // This prevents an unnecessary array around that single table, which
-          // is the case we have in most tests.
-          return allData[0];
-        }
-
-        return allData;
-      });
-    }
-
-    async toggleIsFilteredByCollarCheckbox() {
-      await testSubjects.click('isFilteredByCollarCheckbox');
-    }
-
-    async setIsFilteredByCollarCheckbox(value = true) {
-      await retry.try(async () => {
-        const isChecked = await this.isSwitchChecked('isFilteredByCollarCheckbox');
-        if (isChecked !== value) {
-          await testSubjects.click('isFilteredByCollarCheckbox');
-          throw new Error('isFilteredByCollar not set correctly');
-        }
-      });
-    }
-
-    async getMarkdownData() {
-      const markdown = await retry.try(async () => find.byCssSelector('visualize'));
-      return await markdown.getVisibleText();
-    }
-
-    async getVisualizationRenderingCount() {
-      const visualizationLoader = await testSubjects.find('visualizationLoader');
-      const renderingCount = await visualizationLoader.getAttribute('data-rendering-count');
-      return Number(renderingCount);
-    }
-
-    async waitForRenderingCount(minimumCount = 1) {
-      await retry.waitFor(
-        `rendering count to be greater than or equal to [${minimumCount}]`,
-        async () => {
-          const currentRenderingCount = await this.getVisualizationRenderingCount();
-          log.debug(`-- currentRenderingCount=${currentRenderingCount}`);
-          return currentRenderingCount >= minimumCount;
-        }
-      );
-    }
-
-    async waitForVisualizationRenderingStabilized() {
-      //assuming rendering is done when data-rendering-count is constant within 1000 ms
-      await retry.waitFor('rendering count to stabilize', async () => {
-        const firstCount = await this.getVisualizationRenderingCount();
-        log.debug(`-- firstCount=${firstCount}`);
-
-        await PageObjects.common.sleep(1000);
-
-        const secondCount = await this.getVisualizationRenderingCount();
-        log.debug(`-- secondCount=${secondCount}`);
-
-        return firstCount === secondCount;
-      });
-    }
-
-    async waitForVisualization() {
-      await this.waitForVisualizationRenderingStabilized();
-      return await find.byCssSelector('.visualization');
-    }
-
-    async waitForVisualizationSavedToastGone() {
-      return await testSubjects.waitForDeleted('saveVisualizationSuccess');
-    }
-
-    async getZoomSelectors(zoomSelector) {
-      return await find.allByCssSelector(zoomSelector);
-    }
-
-    async clickMapButton(zoomSelector, waitForLoading) {
-      await retry.try(async () => {
-        const zooms = await this.getZoomSelectors(zoomSelector);
-        await Promise.all(zooms.map(async zoom => await zoom.click()));
-        if (waitForLoading) {
-          await PageObjects.header.waitUntilLoadingHasFinished();
-        }
-      });
-    }
-
-    async getVisualizationRequest() {
-      log.debug('getVisualizationRequest');
-      await inspector.open();
-      await testSubjects.click('inspectorViewChooser');
-      await testSubjects.click('inspectorViewChooserRequests');
-      await testSubjects.click('inspectorRequestDetailRequest');
-      return await testSubjects.getVisibleText('inspectorRequestBody');
-    }
-
-    async getVisualizationResponse() {
-      log.debug('getVisualizationResponse');
-      await inspector.open();
-      await testSubjects.click('inspectorViewChooser');
-      await testSubjects.click('inspectorViewChooserRequests');
-      await testSubjects.click('inspectorRequestDetailResponse');
-      return await testSubjects.getVisibleText('inspectorResponseBody');
-    }
-
-    async getMapBounds() {
-      const request = await this.getVisualizationRequest();
-      const requestObject = JSON.parse(request);
-      return requestObject.aggs.filter_agg.filter.geo_bounding_box['geo.coordinates'];
-    }
-
-    async clickMapZoomIn(waitForLoading = true) {
-      await this.clickMapButton('a.leaflet-control-zoom-in', waitForLoading);
-    }
-
-    async clickMapZoomOut(waitForLoading = true) {
-      await this.clickMapButton('a.leaflet-control-zoom-out', waitForLoading);
-    }
-
-    async getMapZoomEnabled(zoomSelector) {
-      const zooms = await this.getZoomSelectors(zoomSelector);
-      const classAttributes = await Promise.all(
-        zooms.map(async zoom => await zoom.getAttribute('class'))
-      );
-      return !classAttributes.join('').includes('leaflet-disabled');
-    }
-
-    async zoomAllTheWayOut() {
-      // we can tell we're at level 1 because zoom out is disabled
-      return await retry.try(async () => {
-        await this.clickMapZoomOut();
-        const enabled = await this.getMapZoomOutEnabled();
-        //should be able to zoom more as current config has 0 as min level.
-        if (enabled) {
-          throw new Error('Not fully zoomed out yet');
-        }
-      });
-    }
-
-    async getMapZoomInEnabled() {
-      return await this.getMapZoomEnabled('a.leaflet-control-zoom-in');
-    }
-
-    async getMapZoomOutEnabled() {
-      return await this.getMapZoomEnabled('a.leaflet-control-zoom-out');
-    }
-
-    async clickMapFitDataBounds() {
-      return await this.clickMapButton('a.fa-crop');
-    }
-
-    async clickLandingPageBreadcrumbLink() {
-      log.debug('clickLandingPageBreadcrumbLink');
-      await find.clickByCssSelector(`a[href="#${VisualizeConstants.LANDING_PAGE_PATH}"]`);
-    }
-
-    /**
-     * Returns true if already on the landing page (that page doesn't have a link to itself).
-     * @returns {Promise<boolean>}
-     */
-    async onLandingPage() {
-      log.debug(`VisualizePage.onLandingPage`);
-      const exists = await testSubjects.exists('visualizeLandingPage');
-      return exists;
-    }
-
-    async gotoLandingPage() {
-      log.debug('VisualizePage.gotoLandingPage');
-      const onPage = await this.onLandingPage();
-      if (!onPage) {
-        await retry.try(async () => {
-          await this.clickLandingPageBreadcrumbLink();
-          const onLandingPage = await this.onLandingPage();
-          if (!onLandingPage) throw new Error('Not on the landing page.');
-        });
-      }
-    }
-
-    async getLegendEntries() {
-      const legendEntries = await find.allByCssSelector(
-        '.visLegend__button',
-        defaultFindTimeout * 2
-      );
-      return await Promise.all(
-        legendEntries.map(async chart => await chart.getAttribute('data-label'))
-      );
-    }
-
-    async openLegendOptionColors(name) {
-      await this.waitForVisualizationRenderingStabilized();
-      await retry.try(async () => {
-        // This click has been flaky in opening the legend, hence the retry.  See
-        // https://github.com/elastic/kibana/issues/17468
-        await testSubjects.click(`legend-${name}`);
-        await this.waitForVisualizationRenderingStabilized();
-        // arbitrary color chosen, any available would do
-        const isOpen = await this.doesLegendColorChoiceExist('#EF843C');
-        if (!isOpen) {
-          throw new Error('legend color selector not open');
-        }
-      });
-    }
-
-    async filterOnTableCell(column, row) {
-      await retry.try(async () => {
-        const table = await testSubjects.find('tableVis');
-        const cell = await table.findByCssSelector(
-          `tbody tr:nth-child(${row}) td:nth-child(${column})`
-        );
-        await cell.moveMouseTo();
-        const filterBtn = await testSubjects.findDescendant('filterForCellValue', cell);
-        await filterBtn.click();
-      });
-    }
-
-    async toggleLegend(show = true) {
-      await retry.try(async () => {
-        const isVisible = find.byCssSelector('.visLegend');
-        if ((show && !isVisible) || (!show && isVisible)) {
-          await testSubjects.click('vislibToggleLegend');
-        }
-      });
-    }
-
-    async filterLegend(name) {
-      await this.toggleLegend();
-      await testSubjects.click(`legend-${name}`);
-      const filters = await testSubjects.find(`legend-${name}-filters`);
-      const [filterIn] = await filters.findAllByCssSelector(`input`);
-      await filterIn.click();
-      await this.waitForVisualizationRenderingStabilized();
-    }
-
-    async doesLegendColorChoiceExist(color) {
-      return await testSubjects.exists(`legendSelectColor-${color}`);
-    }
-
-    async selectNewLegendColorChoice(color) {
-      await testSubjects.click(`legendSelectColor-${color}`);
-    }
-
-    async doesSelectedLegendColorExist(color) {
-      return await testSubjects.exists(`legendSelectedColor-${color}`);
-    }
-
-    async getYAxisTitle() {
-      const title = await find.byCssSelector('.y-axis-div .y-axis-title text');
-      return await title.getVisibleText();
-    }
-
-    async selectBucketType(type) {
-      const bucketType = await find.byCssSelector(`[data-test-subj="${type}"]`);
-      return await bucketType.click();
-    }
-
-    async getBucketErrorMessage() {
-      const error = await find.byCssSelector(
-        '[group-name="buckets"] [data-test-subj="defaultEditorAggSelect"] + .euiFormErrorText'
-      );
-      const errorMessage = await error.getAttribute('innerText');
-      log.debug(errorMessage);
-      return errorMessage;
-    }
-
-    async selectOrderByMetric(agg, metric) {
-      const sortSelect = await testSubjects.find(`visEditorOrderBy${agg}`);
-      const sortMetric = await sortSelect.findByCssSelector(`option[value="${metric}"]`);
-      await sortMetric.click();
-    }
-
-    async selectCustomSortMetric(agg, metric, field) {
-      await this.selectOrderByMetric(agg, 'custom');
-      await this.selectAggregation(metric, 'buckets', true);
-      await this.selectField(field, 'buckets', true);
-    }
-
-    async clickSplitDirection(direction) {
-      const control = await testSubjects.find('visEditorSplitBy');
-      const radioBtn = await control.findByCssSelector(`[title="${direction}"]`);
-      await radioBtn.click();
-    }
-
-    async countNestedTables() {
-      const vis = await testSubjects.find('tableVis');
-      const result = [];
-
-      for (let i = 1; true; i++) {
-        const selector = new Array(i).fill('.kbnAggTable__group').join(' ');
-        const tables = await vis.findAllByCssSelector(selector);
-        if (tables.length === 0) {
-          break;
-        }
-        result.push(tables.length);
-      }
-
-      return result;
-    }
-
-    async removeDimension(agg) {
-      await testSubjects.click(`visEditorAggAccordion${agg} > removeDimensionBtn`);
-    }
-
-    async setFilterParams({ aggNth = 0, indexPattern, field }) {
-      await comboBox.set(`indexPatternSelect-${aggNth}`, indexPattern);
-      await comboBox.set(`fieldSelect-${aggNth}`, field);
-    }
-
-    async setFilterRange({ aggNth = 0, min, max }) {
-      const control = await testSubjects.find(`inputControl${aggNth}`);
-      const inputMin = await control.findByCssSelector('[name$="minValue"]');
-      await inputMin.type(min);
-      const inputMax = await control.findByCssSelector('[name$="maxValue"]');
-      await inputMax.type(max);
-    }
-
-    async scrollSubjectIntoView(subject) {
-      const element = await testSubjects.find(subject);
-      await element.scrollIntoViewIfNecessary();
-    }
-  }
-
-  return new VisualizePage();
-}
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
new file mode 100644
index 00000000000000..1562cf9745f2de
--- /dev/null
+++ b/test/functional/page_objects/visualize_page.ts
@@ -0,0 +1,328 @@
+/*
+ * 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 { FtrProviderContext } from '../ftr_provider_context';
+import { VisualizeConstants } from '../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
+
+export function VisualizePageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const find = getService('find');
+  const log = getService('log');
+  const globalNav = getService('globalNav');
+  const listingTable = getService('listingTable');
+  const { common, header, visEditor } = getPageObjects(['common', 'header', 'visEditor']);
+
+  /**
+   * This page object contains the visualization type selection, the landing page,
+   * and the open/save dialog functions
+   */
+  class VisualizePage {
+    index = {
+      LOGSTASH_TIME_BASED: 'logstash-*',
+      LOGSTASH_NON_TIME_BASED: 'logstash*',
+    };
+
+    public async gotoVisualizationLandingPage() {
+      await common.navigateToApp('visualize');
+    }
+
+    public async clickNewVisualization() {
+      // newItemButton button is only visible when there are items in the listing table is displayed.
+      let exists = await testSubjects.exists('newItemButton');
+      if (exists) {
+        return await testSubjects.click('newItemButton');
+      }
+
+      exists = await testSubjects.exists('createVisualizationPromptButton');
+      // no viz exist, click createVisualizationPromptButton to create new dashboard
+      return await this.createVisualizationPromptButton();
+    }
+
+    public async createVisualizationPromptButton() {
+      await testSubjects.click('createVisualizationPromptButton');
+    }
+
+    public async getChartTypes() {
+      const chartTypeField = await testSubjects.find('visNewDialogTypes');
+      const $ = await chartTypeField.parseDomContent();
+      return $('button')
+        .toArray()
+        .map(chart =>
+          $(chart)
+            .findTestSubject('visTypeTitle')
+            .text()
+            .trim()
+        );
+    }
+
+    public async waitForVisualizationSelectPage() {
+      await retry.try(async () => {
+        const visualizeSelectTypePage = await testSubjects.find('visNewDialogTypes');
+        if (!(await visualizeSelectTypePage.isDisplayed())) {
+          throw new Error('wait for visualization select page');
+        }
+      });
+    }
+
+    public async navigateToNewVisualization() {
+      await common.navigateToApp('visualize');
+      await this.clickNewVisualization();
+      await this.waitForVisualizationSelectPage();
+    }
+
+    public async clickVisType(type: string) {
+      await testSubjects.click(`visType-${type}`);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async clickAreaChart() {
+      await this.clickVisType('area');
+    }
+
+    public async clickDataTable() {
+      await this.clickVisType('table');
+    }
+
+    public async clickLineChart() {
+      await this.clickVisType('line');
+    }
+
+    public async clickRegionMap() {
+      await this.clickVisType('region_map');
+    }
+
+    public async clickMarkdownWidget() {
+      await this.clickVisType('markdown');
+    }
+
+    public async clickMetric() {
+      await this.clickVisType('metric');
+    }
+
+    public async clickGauge() {
+      await this.clickVisType('gauge');
+    }
+
+    public async clickPieChart() {
+      await this.clickVisType('pie');
+    }
+
+    public async clickTileMap() {
+      await this.clickVisType('tile_map');
+    }
+
+    public async clickTagCloud() {
+      await this.clickVisType('tagcloud');
+    }
+
+    public async clickVega() {
+      await this.clickVisType('vega');
+    }
+
+    public async clickVisualBuilder() {
+      await this.clickVisType('metrics');
+    }
+
+    public async clickVerticalBarChart() {
+      await this.clickVisType('histogram');
+    }
+
+    public async clickHeatmapChart() {
+      await this.clickVisType('heatmap');
+    }
+
+    public async clickInputControlVis() {
+      await this.clickVisType('input_control_vis');
+    }
+
+    public async createSimpleMarkdownViz(vizName: string) {
+      await this.gotoVisualizationLandingPage();
+      await this.navigateToNewVisualization();
+      await this.clickMarkdownWidget();
+      await visEditor.setMarkdownTxt(vizName);
+      await visEditor.clickGo();
+      await this.saveVisualization(vizName);
+    }
+
+    public async clickNewSearch(indexPattern = this.index.LOGSTASH_TIME_BASED) {
+      await testSubjects.click(`savedObjectTitle${indexPattern.split(' ').join('-')}`);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async selectVisSourceIfRequired() {
+      log.debug('selectVisSourceIfRequired');
+      const selectPage = await testSubjects.findAll('visualizeSelectSearch');
+      if (selectPage.length) {
+        log.debug('a search is required for this visualization');
+        await this.clickNewSearch();
+      }
+    }
+
+    /**
+     * Deletes all existing visualizations
+     */
+    public async deleteAllVisualizations() {
+      await retry.try(async () => {
+        await listingTable.checkListingSelectAllCheckbox();
+        await listingTable.clickDeleteSelected();
+        await common.clickConfirmOnModal();
+        await testSubjects.find('createVisualizationPromptButton');
+      });
+    }
+
+    public async isBetaInfoShown() {
+      return await testSubjects.exists('betaVisInfo');
+    }
+
+    public async getBetaTypeLinks() {
+      return await find.allByCssSelector('[data-vis-stage="beta"]');
+    }
+
+    public async getExperimentalTypeLinks() {
+      return await find.allByCssSelector('[data-vis-stage="experimental"]');
+    }
+
+    public async isExperimentalInfoShown() {
+      return await testSubjects.exists('experimentalVisInfo');
+    }
+
+    public async getExperimentalInfo() {
+      return await testSubjects.find('experimentalVisInfo');
+    }
+
+    public async getSideEditorExists() {
+      return await find.existsByCssSelector('.collapsible-sidebar');
+    }
+
+    public async clickSavedSearch(savedSearchName: string) {
+      await testSubjects.click(`savedObjectTitle${savedSearchName.split(' ').join('-')}`);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async clickUnlinkSavedSearch() {
+      await testSubjects.doubleClick('unlinkSavedSearch');
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async ensureSavePanelOpen() {
+      log.debug('ensureSavePanelOpen');
+      await header.waitUntilLoadingHasFinished();
+      const isOpen = await testSubjects.exists('savedObjectSaveModal', { timeout: 5000 });
+      if (!isOpen) {
+        await testSubjects.click('visualizeSaveButton');
+      }
+    }
+
+    public async clickLoadSavedVisButton() {
+      // TODO: Use a test subject selector once we rewrite breadcrumbs to accept each breadcrumb
+      // element as a child instead of building the breadcrumbs dynamically.
+      await find.clickByCssSelector('[href="#/visualize"]');
+    }
+
+    public async clickVisualizationByName(vizName: string) {
+      log.debug('clickVisualizationByLinkText(' + vizName + ')');
+      await find.clickByPartialLinkText(vizName);
+    }
+
+    public async loadSavedVisualization(vizName: string, { navigateToVisualize = true } = {}) {
+      if (navigateToVisualize) {
+        await this.clickLoadSavedVisButton();
+      }
+      await this.openSavedVisualization(vizName);
+    }
+
+    public async openSavedVisualization(vizName: string) {
+      await this.clickVisualizationByName(vizName);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async waitForVisualizationSavedToastGone() {
+      await testSubjects.waitForDeleted('saveVisualizationSuccess');
+    }
+
+    public async clickLandingPageBreadcrumbLink() {
+      log.debug('clickLandingPageBreadcrumbLink');
+      await find.clickByCssSelector(`a[href="#${VisualizeConstants.LANDING_PAGE_PATH}"]`);
+    }
+
+    /**
+     * Returns true if already on the landing page (that page doesn't have a link to itself).
+     * @returns {Promise<boolean>}
+     */
+    public async onLandingPage() {
+      log.debug(`VisualizePage.onLandingPage`);
+      return await testSubjects.exists('visualizeLandingPage');
+    }
+
+    public async gotoLandingPage() {
+      log.debug('VisualizePage.gotoLandingPage');
+      const onPage = await this.onLandingPage();
+      if (!onPage) {
+        await retry.try(async () => {
+          await this.clickLandingPageBreadcrumbLink();
+          const onLandingPage = await this.onLandingPage();
+          if (!onLandingPage) throw new Error('Not on the landing page.');
+        });
+      }
+    }
+
+    public async saveVisualization(vizName: string, { saveAsNew = false } = {}) {
+      await this.ensureSavePanelOpen();
+      await testSubjects.setValue('savedObjectTitle', vizName);
+      if (saveAsNew) {
+        log.debug('Check save as new visualization');
+        await testSubjects.click('saveAsNewCheckbox');
+      }
+      log.debug('Click Save Visualization button');
+
+      await testSubjects.click('confirmSaveSavedObjectButton');
+
+      // Confirm that the Visualization has actually been saved
+      await testSubjects.existOrFail('saveVisualizationSuccess');
+      const message = await common.closeToast();
+      await header.waitUntilLoadingHasFinished();
+      await common.waitForSaveModalToClose();
+
+      return message;
+    }
+
+    public async saveVisualizationExpectSuccess(vizName: string, { saveAsNew = false } = {}) {
+      const saveMessage = await this.saveVisualization(vizName, { saveAsNew });
+      if (!saveMessage) {
+        throw new Error(
+          `Expected saveVisualization to respond with the saveMessage from the toast, got ${saveMessage}`
+        );
+      }
+    }
+
+    public async saveVisualizationExpectSuccessAndBreadcrumb(
+      vizName: string,
+      { saveAsNew = false } = {}
+    ) {
+      await this.saveVisualizationExpectSuccess(vizName, { saveAsNew });
+      await retry.waitFor(
+        'last breadcrumb to have new vis name',
+        async () => (await globalNav.getLastBreadcrumb()) === vizName
+      );
+    }
+  }
+
+  return new VisualizePage();
+}
diff --git a/test/functional/services/dashboard/visualizations.js b/test/functional/services/dashboard/visualizations.js
index c4e7fe6ad3bd9f..5e722ccce89701 100644
--- a/test/functional/services/dashboard/visualizations.js
+++ b/test/functional/services/dashboard/visualizations.js
@@ -24,7 +24,7 @@ export function DashboardVisualizationProvider({ getService, getPageObjects }) {
   const queryBar = getService('queryBar');
   const testSubjects = getService('testSubjects');
   const dashboardAddPanel = getService('dashboardAddPanel');
-  const PageObjects = getPageObjects(['dashboard', 'visualize', 'header', 'discover']);
+  const PageObjects = getPageObjects(['dashboard', 'visualize', 'visEditor', 'header', 'discover']);
 
   return new (class DashboardVisualizations {
     async createAndAddTSVBVisualization(name) {
@@ -107,8 +107,8 @@ export function DashboardVisualizationProvider({ getService, getPageObjects }) {
       }
       await this.ensureNewVisualizationDialogIsShowing();
       await PageObjects.visualize.clickMarkdownWidget();
-      await PageObjects.visualize.setMarkdownTxt(markdown);
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setMarkdownTxt(markdown);
+      await PageObjects.visEditor.clickGo();
       await PageObjects.visualize.saveVisualizationExpectSuccess(name);
     }
   })();
diff --git a/test/functional/services/index.ts b/test/functional/services/index.ts
index ea47ccf1d2704c..a10bb013b3af48 100644
--- a/test/functional/services/index.ts
+++ b/test/functional/services/index.ts
@@ -49,7 +49,7 @@ import { TestSubjectsProvider } from './test_subjects';
 import { ToastsProvider } from './toasts';
 // @ts-ignore not TS yet
 import { PieChartProvider } from './visualizations';
-import { VisualizeListingTableProvider } from './visualize_listing_table';
+import { ListingTableProvider } from './listing_table';
 import { SavedQueryManagementComponentProvider } from './saved_query_management_component';
 
 export const services = {
@@ -66,7 +66,7 @@ export const services = {
   dashboardVisualizations: DashboardVisualizationProvider,
   dashboardExpect: DashboardExpectProvider,
   failureDebugging: FailureDebuggingProvider,
-  visualizeListingTable: VisualizeListingTableProvider,
+  listingTable: ListingTableProvider,
   dashboardAddPanel: DashboardAddPanelProvider,
   dashboardReplacePanel: DashboardReplacePanelProvider,
   dashboardPanelActions: DashboardPanelActionsProvider,
diff --git a/test/functional/services/visualize_listing_table.ts b/test/functional/services/listing_table.ts
similarity index 50%
rename from test/functional/services/visualize_listing_table.ts
rename to test/functional/services/listing_table.ts
index 8c4640ada1c059..ec886cf694f2e4 100644
--- a/test/functional/services/visualize_listing_table.ts
+++ b/test/functional/services/listing_table.ts
@@ -19,13 +19,25 @@
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
-export function VisualizeListingTableProvider({ getService, getPageObjects }: FtrProviderContext) {
+export function ListingTableProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const find = getService('find');
   const log = getService('log');
-  const { header } = getPageObjects(['header']);
+  const retry = getService('retry');
+  const { common, header } = getPageObjects(['common', 'header']);
+
+  class ListingTable {
+    public async getSearchFilter() {
+      const searchFilter = await find.allByCssSelector('.euiFieldSearch');
+      return searchFilter[0];
+    }
+
+    public async clearFilter() {
+      const searchFilter = await this.getSearchFilter();
+      await searchFilter.clearValue();
+      await searchFilter.click();
+    }
 
-  class VisualizeListingTable {
     public async getAllVisualizationNamesOnCurrentPage(): Promise<string[]> {
       const visualizationNames = [];
       const links = await find.allByCssSelector('.kuiLink');
@@ -36,8 +48,44 @@ export function VisualizeListingTableProvider({ getService, getPageObjects }: Ft
       return visualizationNames;
     }
 
+    public async getItemsCount(appName: 'visualize' | 'dashboard'): Promise<number> {
+      const prefixMap = { visualize: 'vis', dashboard: 'dashboard' };
+      const elements = await find.allByCssSelector(
+        `[data-test-subj^="${prefixMap[appName]}ListingTitleLink"]`
+      );
+      return elements.length;
+    }
+
+    public async searchForItemWithName(name: string) {
+      log.debug(`searchForItemWithName: ${name}`);
+
+      await retry.try(async () => {
+        const searchFilter = await this.getSearchFilter();
+        await searchFilter.clearValue();
+        await searchFilter.click();
+        // Note: this replacement of - to space is to preserve original logic but I'm not sure why or if it's needed.
+        await searchFilter.type(name.replace('-', ' '));
+        await common.pressEnterKey();
+      });
+
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async clickDeleteSelected() {
+      await testSubjects.click('deleteSelectedItems');
+    }
+
+    public async checkListingSelectAllCheckbox() {
+      const element = await testSubjects.find('checkboxSelectAll');
+      const isSelected = await element.isSelected();
+      if (!isSelected) {
+        log.debug(`checking checkbox "checkboxSelectAll"`);
+        await testSubjects.click('checkboxSelectAll');
+      }
+    }
+
     public async getAllVisualizationNames(): Promise<string[]> {
-      log.debug('VisualizeListingTable.getAllVisualizationNames');
+      log.debug('ListingTable.getAllVisualizationNames');
       let morePages = true;
       let visualizationNames: string[] = [];
       while (morePages) {
@@ -54,5 +102,5 @@ export function VisualizeListingTableProvider({ getService, getPageObjects }: Ft
     }
   }
 
-  return new VisualizeListingTable();
+  return new ListingTable();
 }
diff --git a/test/functional/services/screenshots.ts b/test/functional/services/screenshots.ts
index 9e673fe919a74c..4c5728174cf992 100644
--- a/test/functional/services/screenshots.ts
+++ b/test/functional/services/screenshots.ts
@@ -51,7 +51,7 @@ export async function ScreenshotsProvider({ getService }: FtrProviderContext) {
      * @param updateBaselines {boolean} optional, pass true to update the baseline snapshot.
      * @return {Promise.<number>} Percentage difference between the baseline and the current snapshot.
      */
-    async compareAgainstBaseline(name: string, updateBaselines: boolean, el: WebElementWrapper) {
+    async compareAgainstBaseline(name: string, updateBaselines: boolean, el?: WebElementWrapper) {
       log.debug('compareAgainstBaseline');
       const sessionPath = resolve(SESSION_DIRECTORY, `${name}.png`);
       await this._take(sessionPath, el);
diff --git a/test/functional/services/test_subjects.ts b/test/functional/services/test_subjects.ts
index a3f64e6f96cc84..8ef008d5dee50e 100644
--- a/test/functional/services/test_subjects.ts
+++ b/test/functional/services/test_subjects.ts
@@ -295,6 +295,25 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
     public getCssSelector(selector: string): string {
       return testSubjSelector(selector);
     }
+
+    public async scrollIntoView(selector: string) {
+      const element = await this.find(selector);
+      await element.scrollIntoViewIfNecessary();
+    }
+
+    public async isChecked(selector: string) {
+      const checkbox = await this.find(selector);
+      return await checkbox.isSelected();
+    }
+
+    public async setCheckbox(selector: string, state: 'check' | 'uncheck') {
+      const isChecked = await this.isChecked(selector);
+      const states = { check: true, uncheck: false };
+      if (isChecked !== states[state]) {
+        log.debug(`updating checkbox ${selector}`);
+        await this.click(selector);
+      }
+    }
   }
 
   return new TestSubjects();
diff --git a/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js b/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js
index 30b9dbe0fe80ae..ef6f0a626bd159 100644
--- a/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js
+++ b/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js
@@ -22,7 +22,7 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const testSubjects = getService('testSubjects');
   const renderable = getService('renderable');
-  const PageObjects = getPageObjects(['common', 'visualize']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'visEditor']);
 
   async function getCounterValue() {
     return await testSubjects.getVisibleText('counter');
@@ -42,9 +42,9 @@ export default function({ getService, getPageObjects }) {
       const editor = await testSubjects.find('counterEditor');
       await editor.clearValue();
       await editor.type('10');
-      const isApplyEnabled = await PageObjects.visualize.isApplyEnabled();
+      const isApplyEnabled = await PageObjects.visEditor.isApplyEnabled();
       expect(isApplyEnabled).to.be(true);
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
       const counter = await getCounterValue();
       expect(counter).to.be('10');
     });
@@ -57,7 +57,7 @@ export default function({ getService, getPageObjects }) {
       const editorValue = await getEditorValue();
       expect(editorValue).to.be('11');
       // If changing a param from within the vis it should immediately apply and not bring editor in an unchanged state
-      const isApplyEnabled = await PageObjects.visualize.isApplyEnabled();
+      const isApplyEnabled = await PageObjects.visEditor.isApplyEnabled();
       expect(isApplyEnabled).to.be(false);
     });
   });
diff --git a/x-pack/legacy/plugins/alerting/server/lib/alert_instance.test.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/alert_instance.test.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/alert_instance.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.ts
similarity index 97%
rename from x-pack/legacy/plugins/alerting/server/lib/alert_instance.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.ts
index 1e2cc26f364ad2..a56e2077cdfd83 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/alert_instance.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.ts
@@ -5,7 +5,7 @@
  */
 
 import { State, Context } from '../types';
-import { parseDuration } from './parse_duration';
+import { parseDuration } from '../lib';
 
 interface Meta {
   lastScheduledActions?: {
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_alert_instance_factory.test.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/create_alert_instance_factory.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/create_alert_instance_factory.test.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/create_alert_instance_factory.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_alert_instance_factory.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/create_alert_instance_factory.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/create_alert_instance_factory.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/create_alert_instance_factory.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/index.ts
similarity index 65%
rename from x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/index.ts
index 08d8d9a5d40694..40ee0874e805cd 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_instance/index.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { getTelemetryMonitorPageLogger } from './log_monitor';
-export { getTelemetryOverviewPageLogger } from './log_overview';
+export { AlertInstance } from './alert_instance';
+export { createAlertInstanceFactory } from './create_alert_instance_factory';
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 57e1b965960e84..8e96ad8dae31cc 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
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { TaskRunnerFactory } from './lib';
+import { TaskRunnerFactory } from './task_runner';
 import { AlertTypeRegistry } from './alert_type_registry';
 import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 
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 b7512864c2a981..2003e810a05b53 100644
--- a/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
@@ -6,8 +6,8 @@
 
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
-import { TaskRunnerFactory } from './lib';
-import { RunContext } from '../../task_manager/server';
+import { TaskRunnerFactory } from './task_runner';
+import { RunContext } from '../../task_manager';
 import { TaskManagerSetupContract } from './shim';
 import { AlertType } from './types';
 
diff --git a/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts
similarity index 81%
rename from x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.test.ts
rename to x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts
index 838c567fb28787..519001d07e089c 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts
@@ -6,13 +6,13 @@
 
 import { Request } from 'hapi';
 import { AlertsClientFactory, ConstructorOpts } from './alerts_client_factory';
-import { alertTypeRegistryMock } from '../alert_type_registry.mock';
-import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
-import { KibanaRequest } from '../../../../../../src/core/server';
-import { loggingServiceMock } from '../../../../../../src/core/server/mocks';
-import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
+import { alertTypeRegistryMock } from './alert_type_registry.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
+import { KibanaRequest } from '../../../../../src/core/server';
+import { loggingServiceMock } from '../../../../../src/core/server/mocks';
+import { encryptedSavedObjectsMock } from '../../../../plugins/encrypted_saved_objects/server/mocks';
 
-jest.mock('../alerts_client');
+jest.mock('./alerts_client');
 
 const savedObjectsClient = jest.fn();
 const securityPluginSetup = {
@@ -55,7 +55,7 @@ test('creates an alerts client with proper constructor arguments', async () => {
   const factory = new AlertsClientFactory(alertsClientFactoryParams);
   factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
 
-  expect(jest.requireMock('../alerts_client').AlertsClient).toHaveBeenCalledWith({
+  expect(jest.requireMock('./alerts_client').AlertsClient).toHaveBeenCalledWith({
     savedObjectsClient,
     logger: alertsClientFactoryParams.logger,
     taskManager: alertsClientFactoryParams.taskManager,
@@ -72,7 +72,7 @@ test('creates an alerts client with proper constructor arguments', async () => {
 test('getUserName() returns null when security is disabled', async () => {
   const factory = new AlertsClientFactory(alertsClientFactoryParams);
   factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
 
   const userNameResult = await constructorCall.getUserName();
   expect(userNameResult).toEqual(null);
@@ -84,7 +84,7 @@ test('getUserName() returns a name when security is enabled', async () => {
     securityPluginSetup: securityPluginSetup as any,
   });
   factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
 
   securityPluginSetup.authc.getCurrentUser.mockResolvedValueOnce({ username: 'bob' });
   const userNameResult = await constructorCall.getUserName();
@@ -94,7 +94,7 @@ test('getUserName() returns a name when security is enabled', async () => {
 test('createAPIKey() returns { apiKeysEnabled: false } when security is disabled', async () => {
   const factory = new AlertsClientFactory(alertsClientFactoryParams);
   factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
 
   const createAPIKeyResult = await constructorCall.createAPIKey();
   expect(createAPIKeyResult).toEqual({ apiKeysEnabled: false });
@@ -103,7 +103,7 @@ test('createAPIKey() returns { apiKeysEnabled: false } when security is disabled
 test('createAPIKey() returns { apiKeysEnabled: false } when security is enabled but ES security is disabled', async () => {
   const factory = new AlertsClientFactory(alertsClientFactoryParams);
   factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
 
   securityPluginSetup.authc.createAPIKey.mockResolvedValueOnce(null);
   const createAPIKeyResult = await constructorCall.createAPIKey();
@@ -116,7 +116,7 @@ test('createAPIKey() returns an API key when security is enabled', async () => {
     securityPluginSetup: securityPluginSetup as any,
   });
   factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
 
   securityPluginSetup.authc.createAPIKey.mockResolvedValueOnce({ api_key: '123', id: 'abc' });
   const createAPIKeyResult = await constructorCall.createAPIKey();
@@ -132,7 +132,7 @@ test('createAPIKey() throws when security plugin createAPIKey throws an error',
     securityPluginSetup: securityPluginSetup as any,
   });
   factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
 
   securityPluginSetup.authc.createAPIKey.mockRejectedValueOnce(new Error('TLS disabled'));
   await expect(constructorCall.createAPIKey()).rejects.toThrowErrorMatchingInlineSnapshot(
diff --git a/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.ts b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts
similarity index 92%
rename from x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.ts
rename to x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts
index 026d6c92b0d75d..94a396fbaa8063 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts
@@ -6,12 +6,12 @@
 
 import Hapi from 'hapi';
 import uuid from 'uuid';
-import { AlertsClient } from '../alerts_client';
-import { AlertTypeRegistry, SpaceIdToNamespaceFunction } from '../types';
-import { SecurityPluginStartContract, TaskManagerStartContract } from '../shim';
-import { KibanaRequest, Logger } from '../../../../../../src/core/server';
-import { InvalidateAPIKeyParams } from '../../../../../plugins/security/server';
-import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
+import { AlertsClient } from './alerts_client';
+import { AlertTypeRegistry, SpaceIdToNamespaceFunction } from './types';
+import { SecurityPluginStartContract, TaskManagerStartContract } from './shim';
+import { KibanaRequest, Logger } from '../../../../../src/core/server';
+import { InvalidateAPIKeyParams } from '../../../../plugins/security/server';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../plugins/encrypted_saved_objects/server';
 
 export interface ConstructorOpts {
   logger: Logger;
diff --git a/x-pack/legacy/plugins/alerting/server/lib/index.ts b/x-pack/legacy/plugins/alerting/server/lib/index.ts
index ca4ddf9e11ad28..c41ea4a5998ff4 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/index.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/index.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { AlertInstance } from './alert_instance';
-export { validateAlertTypeParams } from './validate_alert_type_params';
 export { parseDuration, getDurationSchema } from './parse_duration';
-export { AlertsClientFactory } from './alerts_client_factory';
-export { TaskRunnerFactory } from './task_runner_factory';
+export { LicenseState } from './license_state';
+export { validateAlertTypeParams } from './validate_alert_type_params';
diff --git a/x-pack/legacy/plugins/alerting/server/lib/result_type.ts b/x-pack/legacy/plugins/alerting/server/lib/result_type.ts
new file mode 100644
index 00000000000000..644ae51292249d
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/lib/result_type.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface Ok<T> {
+  tag: 'ok';
+  value: T;
+}
+
+export interface Err<E> {
+  tag: 'err';
+  error: E;
+}
+export type Result<T, E> = Ok<T> | Err<E>;
+
+export function asOk<T>(value: T): Ok<T> {
+  return {
+    tag: 'ok',
+    value,
+  };
+}
+
+export function asErr<T>(error: T): Err<T> {
+  return {
+    tag: 'err',
+    error,
+  };
+}
+
+export function isOk<T, E>(result: Result<T, E>): result is Ok<T> {
+  return result.tag === 'ok';
+}
+
+export function isErr<T, E>(result: Result<T, E>): result is Err<E> {
+  return !isOk(result);
+}
+
+export async function promiseResult<T, E>(future: Promise<T>): Promise<Result<T, E>> {
+  try {
+    return asOk(await future);
+  } catch (e) {
+    return asErr(e);
+  }
+}
+
+export function map<T, E, Resolution>(
+  result: Result<T, E>,
+  onOk: (value: T) => Resolution,
+  onErr: (error: E) => Resolution
+): Resolution {
+  return isOk(result) ? onOk(result.value) : onErr(result.error);
+}
diff --git a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
deleted file mode 100644
index fd13452e045353..00000000000000
--- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
+++ /dev/null
@@ -1,345 +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 sinon from 'sinon';
-import { schema } from '@kbn/config-schema';
-import { AlertExecutorOptions } from '../types';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
-import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
-import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
-import {
-  savedObjectsClientMock,
-  loggingServiceMock,
-} from '../../../../../../src/core/server/mocks';
-
-const alertType = {
-  id: 'test',
-  name: 'My test alert',
-  actionGroups: ['default'],
-  executor: jest.fn(),
-};
-let fakeTimer: sinon.SinonFakeTimers;
-let taskRunnerFactory: TaskRunnerFactory;
-let mockedTaskInstance: ConcreteTaskInstance;
-
-beforeAll(() => {
-  fakeTimer = sinon.useFakeTimers();
-  mockedTaskInstance = {
-    id: '',
-    attempts: 0,
-    status: TaskStatus.Running,
-    version: '123',
-    runAt: new Date(),
-    scheduledAt: new Date(),
-    startedAt: new Date(),
-    retryAt: new Date(Date.now() + 5 * 60 * 1000),
-    state: {
-      startedAt: new Date(Date.now() - 5 * 60 * 1000),
-    },
-    taskType: 'alerting:test',
-    params: {
-      alertId: '1',
-    },
-    ownerId: null,
-  };
-  taskRunnerFactory = new TaskRunnerFactory();
-  taskRunnerFactory.initialize(taskRunnerFactoryInitializerParams);
-});
-
-afterAll(() => fakeTimer.restore());
-
-const savedObjectsClient = savedObjectsClientMock.create();
-const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
-const services = {
-  log: jest.fn(),
-  callCluster: jest.fn(),
-  savedObjectsClient,
-};
-
-const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> = {
-  getServices: jest.fn().mockReturnValue(services),
-  executeAction: jest.fn(),
-  encryptedSavedObjectsPlugin,
-  logger: loggingServiceMock.create().get(),
-  spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
-  getBasePath: jest.fn().mockReturnValue(undefined),
-};
-
-const mockedAlertTypeSavedObject = {
-  id: '1',
-  type: 'alert',
-  attributes: {
-    enabled: true,
-    alertTypeId: '123',
-    schedule: { interval: '10s' },
-    mutedInstanceIds: [],
-    params: {
-      bar: true,
-    },
-    actions: [
-      {
-        group: 'default',
-        actionRef: 'action_0',
-        params: {
-          foo: true,
-        },
-      },
-    ],
-  },
-  references: [
-    {
-      name: 'action_0',
-      type: 'action',
-      id: '1',
-    },
-  ],
-};
-
-beforeEach(() => {
-  jest.resetAllMocks();
-  taskRunnerFactoryInitializerParams.getServices.mockReturnValue(services);
-});
-
-test(`throws an error if factory isn't initialized`, () => {
-  const factory = new TaskRunnerFactory();
-  expect(() =>
-    factory.create(alertType, { taskInstance: mockedTaskInstance })
-  ).toThrowErrorMatchingInlineSnapshot(`"TaskRunnerFactory not initialized"`);
-});
-
-test(`throws an error if factory is already initialized`, () => {
-  const factory = new TaskRunnerFactory();
-  factory.initialize(taskRunnerFactoryInitializerParams);
-  expect(() =>
-    factory.initialize(taskRunnerFactoryInitializerParams)
-  ).toThrowErrorMatchingInlineSnapshot(`"TaskRunnerFactory already initialized"`);
-});
-
-test('successfully executes the task', async () => {
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  const runnerResult = await taskRunner.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(alertType.executor).toHaveBeenCalledTimes(1);
-  const call = 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();
-  expect(call.services.callCluster).toBeTruthy();
-  expect(call.services).toBeTruthy();
-});
-
-test('executeAction is called per alert instance that is scheduled', async () => {
-  alertType.executor.mockImplementation(({ services: executorServices }: AlertExecutorOptions) => {
-    executorServices.alertInstanceFactory('1').scheduleActions('default');
-  });
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  await taskRunner.run();
-  expect(taskRunnerFactoryInitializerParams.executeAction).toHaveBeenCalledTimes(1);
-  expect(taskRunnerFactoryInitializerParams.executeAction.mock.calls[0]).toMatchInlineSnapshot(`
-                Array [
-                  Object {
-                    "apiKey": "MTIzOmFiYw==",
-                    "id": "1",
-                    "params": Object {
-                      "foo": true,
-                    },
-                    "spaceId": undefined,
-                  },
-                ]
-        `);
-});
-
-test('persists alertInstances passed in from state, only if they are scheduled for execution', async () => {
-  alertType.executor.mockImplementation(({ services: executorServices }: AlertExecutorOptions) => {
-    executorServices.alertInstanceFactory('1').scheduleActions('default');
-  });
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: {
-      ...mockedTaskInstance,
-      state: {
-        ...mockedTaskInstance.state,
-        alertInstances: {
-          '1': { meta: {}, state: { bar: false } },
-          '2': { meta: {}, state: { bar: false } },
-        },
-      },
-    },
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  const runnerResult = await taskRunner.run();
-  expect(runnerResult.state.alertInstances).toMatchInlineSnapshot(`
-    Object {
-      "1": Object {
-        "meta": Object {
-          "lastScheduledActions": Object {
-            "date": 1970-01-01T00:00:00.000Z,
-            "group": "default",
-          },
-        },
-        "state": Object {
-          "bar": false,
-        },
-      },
-    }
-  `);
-});
-
-test('validates params before executing the alert type', async () => {
-  const taskRunner = taskRunnerFactory.create(
-    {
-      ...alertType,
-      validate: {
-        params: schema.object({
-          param1: schema.string(),
-        }),
-      },
-    },
-    { taskInstance: mockedTaskInstance }
-  );
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  await expect(taskRunner.run()).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"params invalid: [param1]: expected value of type [string] but got [undefined]"`
-  );
-});
-
-test('throws error if reference not found', async () => {
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce({
-    ...mockedAlertTypeSavedObject,
-    references: [],
-  });
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  await expect(taskRunner.run()).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"Action reference \\"action_0\\" not found in alert id: 1"`
-  );
-});
-
-test('uses API key when provided', async () => {
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-
-  await taskRunner.run();
-  expect(taskRunnerFactoryInitializerParams.getServices).toHaveBeenCalledWith({
-    getBasePath: expect.anything(),
-    headers: {
-      // base64 encoded "123:abc"
-      authorization: 'ApiKey MTIzOmFiYw==',
-    },
-    path: '/',
-    route: { settings: {} },
-    url: {
-      href: '/',
-    },
-    raw: {
-      req: {
-        url: '/',
-      },
-    },
-  });
-});
-
-test(`doesn't use API key when not provided`, async () => {
-  const factory = new TaskRunnerFactory();
-  factory.initialize(taskRunnerFactoryInitializerParams);
-  const taskRunner = factory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {},
-    references: [],
-  });
-
-  await taskRunner.run();
-
-  expect(taskRunnerFactoryInitializerParams.getServices).toHaveBeenCalledWith({
-    getBasePath: expect.anything(),
-    headers: {},
-    path: '/',
-    route: { settings: {} },
-    url: {
-      href: '/',
-    },
-    raw: {
-      req: {
-        url: '/',
-      },
-    },
-  });
-});
diff --git a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
deleted file mode 100644
index 5614188795ded7..00000000000000
--- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
+++ /dev/null
@@ -1,190 +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 { Logger } from '../../../../../../src/core/server';
-import { RunContext } from '../../../task_manager/server';
-import { createExecutionHandler } from './create_execution_handler';
-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 { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
-import { PluginStartContract as ActionsPluginStartContract } from '../../../actions';
-import {
-  AlertType,
-  AlertServices,
-  GetBasePathFunction,
-  GetServicesFunction,
-  RawAlert,
-  SpaceIdToNamespaceFunction,
-  IntervalSchedule,
-} from '../types';
-
-export interface TaskRunnerContext {
-  logger: Logger;
-  getServices: GetServicesFunction;
-  executeAction: ActionsPluginStartContract['execute'];
-  encryptedSavedObjectsPlugin: EncryptedSavedObjectsStartContract;
-  spaceIdToNamespace: SpaceIdToNamespaceFunction;
-  getBasePath: GetBasePathFunction;
-}
-
-export class TaskRunnerFactory {
-  private isInitialized = false;
-  private taskRunnerContext?: TaskRunnerContext;
-
-  public initialize(taskRunnerContext: TaskRunnerContext) {
-    if (this.isInitialized) {
-      throw new Error('TaskRunnerFactory already initialized');
-    }
-    this.isInitialized = true;
-    this.taskRunnerContext = taskRunnerContext;
-  }
-
-  public create(alertType: AlertType, { taskInstance }: RunContext) {
-    if (!this.isInitialized) {
-      throw new Error('TaskRunnerFactory not initialized');
-    }
-
-    const {
-      logger,
-      getServices,
-      executeAction,
-      encryptedSavedObjectsPlugin,
-      spaceIdToNamespace,
-      getBasePath,
-    } = this.taskRunnerContext!;
-
-    return {
-      async run() {
-        const { alertId, spaceId } = taskInstance.params;
-        const requestHeaders: Record<string, string> = {};
-        const namespace = spaceIdToNamespace(spaceId);
-        // Only fetch encrypted attributes here, we'll create a saved objects client
-        // scoped with the API key to fetch the remaining data.
-        const {
-          attributes: { apiKey },
-        } = await encryptedSavedObjectsPlugin.getDecryptedAsInternalUser<RawAlert>(
-          'alert',
-          alertId,
-          { namespace }
-        );
-
-        if (apiKey) {
-          requestHeaders.authorization = `ApiKey ${apiKey}`;
-        }
-
-        const fakeRequest = {
-          headers: requestHeaders,
-          getBasePath: () => getBasePath(spaceId),
-          path: '/',
-          route: { settings: {} },
-          url: {
-            href: '/',
-          },
-          raw: {
-            req: {
-              url: '/',
-            },
-          },
-        };
-
-        const services = getServices(fakeRequest);
-        // Ensure API key is still valid and user has access
-        const {
-          attributes: { params, actions, schedule, throttle, muteAll, mutedInstanceIds },
-          references,
-        } = await services.savedObjectsClient.get<RawAlert>('alert', alertId);
-
-        // Validate
-        const validatedAlertTypeParams = validateAlertTypeParams(alertType, params);
-
-        // Inject ids into actions
-        const actionsWithIds = actions.map(action => {
-          const actionReference = references.find(obj => obj.name === action.actionRef);
-          if (!actionReference) {
-            throw new Error(
-              `Action reference "${action.actionRef}" not found in alert id: ${alertId}`
-            );
-          }
-          return {
-            ...action,
-            id: actionReference.id,
-          };
-        });
-
-        const executionHandler = createExecutionHandler({
-          alertId,
-          logger,
-          executeAction,
-          apiKey,
-          actions: actionsWithIds,
-          spaceId,
-          alertType,
-        });
-        const alertInstances: Record<string, AlertInstance> = {};
-        const alertInstancesData = taskInstance.state.alertInstances || {};
-        for (const id of Object.keys(alertInstancesData)) {
-          alertInstances[id] = new AlertInstance(alertInstancesData[id]);
-        }
-        const alertInstanceFactory = createAlertInstanceFactory(alertInstances);
-
-        const alertTypeServices: AlertServices = {
-          ...services,
-          alertInstanceFactory,
-        };
-
-        const alertTypeState = await alertType.executor({
-          alertId,
-          services: alertTypeServices,
-          params: validatedAlertTypeParams,
-          state: taskInstance.state.alertTypeState || {},
-          startedAt: taskInstance.startedAt!,
-          previousStartedAt: taskInstance.state.previousStartedAt,
-        });
-
-        await Promise.all(
-          Object.keys(alertInstances).map(alertInstanceId => {
-            const alertInstance = alertInstances[alertInstanceId];
-            if (alertInstance.hasScheduledActions()) {
-              if (
-                alertInstance.isThrottled(throttle) ||
-                muteAll ||
-                mutedInstanceIds.includes(alertInstanceId)
-              ) {
-                return;
-              }
-              const { actionGroup, context, state } = alertInstance.getScheduledActionOptions()!;
-              alertInstance.updateLastScheduledActions(actionGroup);
-              alertInstance.unscheduleActions();
-              return executionHandler({ actionGroup, context, state, alertInstanceId });
-            } else {
-              // Cleanup alert instances that are no longer scheduling actions to avoid over populating the alertInstances object
-              delete alertInstances[alertInstanceId];
-            }
-          })
-        );
-
-        const nextRunAt = getNextRunAt(
-          new Date(taskInstance.startedAt!),
-          // we do not currently have a good way of returning the type
-          // from SavedObjectsClient, and as we currenrtly require a schedule
-          // and we only support `interval`, we can cast this safely
-          schedule as IntervalSchedule
-        );
-
-        return {
-          state: {
-            alertTypeState,
-            alertInstances,
-            previousStartedAt: taskInstance.startedAt!,
-          },
-          runAt: nextRunAt,
-        };
-      },
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/alerting/server/plugin.ts b/x-pack/legacy/plugins/alerting/server/plugin.ts
index 24d4467dbd8073..ede95f76bf8113 100644
--- a/x-pack/legacy/plugins/alerting/server/plugin.ts
+++ b/x-pack/legacy/plugins/alerting/server/plugin.ts
@@ -9,7 +9,8 @@ import { first } from 'rxjs/operators';
 import { Services } from './types';
 import { AlertsClient } from './alerts_client';
 import { AlertTypeRegistry } from './alert_type_registry';
-import { AlertsClientFactory, TaskRunnerFactory } from './lib';
+import { TaskRunnerFactory } from './task_runner';
+import { AlertsClientFactory } from './alerts_client_factory';
 import { LicenseState } from './lib/license_state';
 import { IClusterClient, KibanaRequest, Logger } from '../../../../../src/core/server';
 import {
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.test.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.ts b/x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.test.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.ts b/x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.ts
similarity index 92%
rename from x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.ts
index f9867b53729080..cea4584e1f713b 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.ts
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { parseDuration } from './parse_duration';
+import { parseDuration } from '../lib';
 import { IntervalSchedule } from '../types';
 
 export function getNextRunAt(currentRunAt: Date, schedule: IntervalSchedule) {
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/index.ts b/x-pack/legacy/plugins/alerting/server/task_runner/index.ts
new file mode 100644
index 00000000000000..f5401fbd9cd746
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { TaskRunnerFactory } from './task_runner_factory';
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts
new file mode 100644
index 00000000000000..10627c655eca86
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -0,0 +1,400 @@
+/*
+ * 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 sinon from 'sinon';
+import { schema } from '@kbn/config-schema';
+import { AlertExecutorOptions } from '../types';
+import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { TaskRunnerContext } from './task_runner_factory';
+import { TaskRunner } from './task_runner';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
+import {
+  savedObjectsClientMock,
+  loggingServiceMock,
+} from '../../../../../../src/core/server/mocks';
+
+const alertType = {
+  id: 'test',
+  name: 'My test alert',
+  actionGroups: ['default'],
+  executor: jest.fn(),
+};
+let fakeTimer: sinon.SinonFakeTimers;
+
+describe('Task Runner', () => {
+  let mockedTaskInstance: ConcreteTaskInstance;
+
+  beforeAll(() => {
+    fakeTimer = sinon.useFakeTimers();
+    mockedTaskInstance = {
+      id: '',
+      attempts: 0,
+      status: TaskStatus.Running,
+      version: '123',
+      runAt: new Date(),
+      scheduledAt: new Date(),
+      startedAt: new Date(),
+      retryAt: new Date(Date.now() + 5 * 60 * 1000),
+      state: {
+        startedAt: new Date(Date.now() - 5 * 60 * 1000),
+      },
+      taskType: 'alerting:test',
+      params: {
+        alertId: '1',
+      },
+      ownerId: null,
+    };
+  });
+
+  afterAll(() => fakeTimer.restore());
+
+  const savedObjectsClient = savedObjectsClientMock.create();
+  const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
+  const services = {
+    log: jest.fn(),
+    callCluster: jest.fn(),
+    savedObjectsClient,
+  };
+
+  const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> = {
+    getServices: jest.fn().mockReturnValue(services),
+    executeAction: jest.fn(),
+    encryptedSavedObjectsPlugin,
+    logger: loggingServiceMock.create().get(),
+    spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+    getBasePath: jest.fn().mockReturnValue(undefined),
+  };
+
+  const mockedAlertTypeSavedObject = {
+    id: '1',
+    type: 'alert',
+    attributes: {
+      enabled: true,
+      alertTypeId: '123',
+      schedule: { interval: '10s' },
+      mutedInstanceIds: [],
+      params: {
+        bar: true,
+      },
+      actions: [
+        {
+          group: 'default',
+          actionRef: 'action_0',
+          params: {
+            foo: true,
+          },
+        },
+      ],
+    },
+    references: [
+      {
+        name: 'action_0',
+        type: 'action',
+        id: '1',
+      },
+    ],
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    taskRunnerFactoryInitializerParams.getServices.mockReturnValue(services);
+  });
+
+  test('successfully executes the task', async () => {
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    const runnerResult = await taskRunner.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(alertType.executor).toHaveBeenCalledTimes(1);
+    const call = 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();
+    expect(call.services.callCluster).toBeTruthy();
+    expect(call.services).toBeTruthy();
+  });
+
+  test('executeAction is called per alert instance that is scheduled', async () => {
+    alertType.executor.mockImplementation(
+      ({ services: executorServices }: AlertExecutorOptions) => {
+        executorServices.alertInstanceFactory('1').scheduleActions('default');
+      }
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    await taskRunner.run();
+    expect(taskRunnerFactoryInitializerParams.executeAction).toHaveBeenCalledTimes(1);
+    expect(taskRunnerFactoryInitializerParams.executeAction.mock.calls[0]).toMatchInlineSnapshot(`
+                  Array [
+                    Object {
+                      "apiKey": "MTIzOmFiYw==",
+                      "id": "1",
+                      "params": Object {
+                        "foo": true,
+                      },
+                      "spaceId": undefined,
+                    },
+                  ]
+          `);
+  });
+
+  test('persists alertInstances passed in from state, only if they are scheduled for execution', async () => {
+    alertType.executor.mockImplementation(
+      ({ services: executorServices }: AlertExecutorOptions) => {
+        executorServices.alertInstanceFactory('1').scheduleActions('default');
+      }
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      {
+        ...mockedTaskInstance,
+        state: {
+          ...mockedTaskInstance.state,
+          alertInstances: {
+            '1': { meta: {}, state: { bar: false } },
+            '2': { meta: {}, state: { bar: false } },
+          },
+        },
+      },
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    const runnerResult = await taskRunner.run();
+    expect(runnerResult.state.alertInstances).toMatchInlineSnapshot(`
+      Object {
+        "1": Object {
+          "meta": Object {
+            "lastScheduledActions": Object {
+              "date": 1970-01-01T00:00:00.000Z,
+              "group": "default",
+            },
+          },
+          "state": Object {
+            "bar": false,
+          },
+        },
+      }
+    `);
+  });
+
+  test('validates params before executing the alert type', async () => {
+    const taskRunner = new TaskRunner(
+      {
+        ...alertType,
+        validate: {
+          params: schema.object({
+            param1: schema.string(),
+          }),
+        },
+      },
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    expect(await taskRunner.run()).toMatchInlineSnapshot(`
+      Object {
+        "runAt": 1970-01-01T00:00:10.000Z,
+        "state": Object {
+          "previousStartedAt": 1970-01-01T00:00:00.000Z,
+          "startedAt": 1969-12-31T23:55:00.000Z,
+        },
+      }
+    `);
+    expect(taskRunnerFactoryInitializerParams.logger.error).toHaveBeenCalledWith(
+      `Executing Alert \"1\" has resulted in Error: params invalid: [param1]: expected value of type [string] but got [undefined]`
+    );
+  });
+
+  test('throws error if reference not found', async () => {
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce({
+      ...mockedAlertTypeSavedObject,
+      references: [],
+    });
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    expect(await taskRunner.run()).toMatchInlineSnapshot(`
+      Object {
+        "runAt": 1970-01-01T00:00:10.000Z,
+        "state": Object {
+          "previousStartedAt": 1970-01-01T00:00:00.000Z,
+          "startedAt": 1969-12-31T23:55:00.000Z,
+        },
+      }
+    `);
+    expect(taskRunnerFactoryInitializerParams.logger.error).toHaveBeenCalledWith(
+      `Executing Alert \"1\" has resulted in Error: Action reference \"action_0\" not found in alert id: 1`
+    );
+  });
+
+  test('uses API key when provided', async () => {
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+
+    await taskRunner.run();
+    expect(taskRunnerFactoryInitializerParams.getServices).toHaveBeenCalledWith({
+      getBasePath: expect.anything(),
+      headers: {
+        // base64 encoded "123:abc"
+        authorization: 'ApiKey MTIzOmFiYw==',
+      },
+      path: '/',
+      route: { settings: {} },
+      url: {
+        href: '/',
+      },
+      raw: {
+        req: {
+          url: '/',
+        },
+      },
+    });
+  });
+
+  test(`doesn't use API key when not provided`, async () => {
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {},
+      references: [],
+    });
+
+    await taskRunner.run();
+
+    expect(taskRunnerFactoryInitializerParams.getServices).toHaveBeenCalledWith({
+      getBasePath: expect.anything(),
+      headers: {},
+      path: '/',
+      route: { settings: {} },
+      url: {
+        href: '/',
+      },
+      raw: {
+        req: {
+          url: '/',
+        },
+      },
+    });
+  });
+
+  test('recovers gracefully when the AlertType executor throws an exception', async () => {
+    alertType.executor.mockImplementation(
+      ({ services: executorServices }: AlertExecutorOptions) => {
+        throw new Error('OMG');
+      }
+    );
+
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+
+    const runnerResult = await taskRunner.run();
+
+    expect(runnerResult).toMatchInlineSnapshot(`
+      Object {
+        "runAt": 1970-01-01T00:00:10.000Z,
+        "state": Object {
+          "previousStartedAt": 1970-01-01T00:00:00.000Z,
+          "startedAt": 1969-12-31T23:55:00.000Z,
+        },
+      }
+    `);
+  });
+});
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
new file mode 100644
index 00000000000000..2347e9e608ed9f
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
@@ -0,0 +1,241 @@
+/*
+ * 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 { pick, mapValues, omit } from 'lodash';
+import { Logger } from '../../../../../../src/core/server';
+import { SavedObject } from '../../../../../../src/core/server';
+import { TaskRunnerContext } from './task_runner_factory';
+import { ConcreteTaskInstance } from '../../../task_manager';
+import { createExecutionHandler } from './create_execution_handler';
+import { AlertInstance, createAlertInstanceFactory } from '../alert_instance';
+import { getNextRunAt } from './get_next_run_at';
+import { validateAlertTypeParams } from '../lib';
+import { AlertType, RawAlert, IntervalSchedule, Services, State } from '../types';
+import { promiseResult, map } from '../lib/result_type';
+
+type AlertInstances = Record<string, AlertInstance>;
+
+export class TaskRunner {
+  private context: TaskRunnerContext;
+  private logger: Logger;
+  private taskInstance: ConcreteTaskInstance;
+  private alertType: AlertType;
+
+  constructor(
+    alertType: AlertType,
+    taskInstance: ConcreteTaskInstance,
+    context: TaskRunnerContext
+  ) {
+    this.context = context;
+    this.logger = context.logger;
+    this.alertType = alertType;
+    this.taskInstance = taskInstance;
+  }
+
+  async getApiKeyForAlertPermissions(alertId: string, spaceId: string) {
+    const namespace = this.context.spaceIdToNamespace(spaceId);
+    // Only fetch encrypted attributes here, we'll create a saved objects client
+    // scoped with the API key to fetch the remaining data.
+    const {
+      attributes: { apiKey },
+    } = await this.context.encryptedSavedObjectsPlugin.getDecryptedAsInternalUser<RawAlert>(
+      'alert',
+      alertId,
+      { namespace }
+    );
+
+    return apiKey;
+  }
+
+  async getServicesWithSpaceLevelPermissions(spaceId: string, apiKey: string | null) {
+    const requestHeaders: Record<string, string> = {};
+
+    if (apiKey) {
+      requestHeaders.authorization = `ApiKey ${apiKey}`;
+    }
+
+    const fakeRequest = {
+      headers: requestHeaders,
+      getBasePath: () => this.context.getBasePath(spaceId),
+      path: '/',
+      route: { settings: {} },
+      url: {
+        href: '/',
+      },
+      raw: {
+        req: {
+          url: '/',
+        },
+      },
+    };
+
+    return this.context.getServices(fakeRequest);
+  }
+
+  getExecutionHandler(
+    alertId: string,
+    spaceId: string,
+    apiKey: string | null,
+    actions: RawAlert['actions'],
+    references: SavedObject['references']
+  ) {
+    // Inject ids into actions
+    const actionsWithIds = actions.map(action => {
+      const actionReference = references.find(obj => obj.name === action.actionRef);
+      if (!actionReference) {
+        throw new Error(`Action reference "${action.actionRef}" not found in alert id: ${alertId}`);
+      }
+      return {
+        ...action,
+        id: actionReference.id,
+      };
+    });
+
+    return createExecutionHandler({
+      alertId,
+      logger: this.logger,
+      executeAction: this.context.executeAction,
+      apiKey,
+      actions: actionsWithIds,
+      spaceId,
+      alertType: this.alertType,
+    });
+  }
+
+  async executeAlertInstance(
+    alertInstanceId: string,
+    alertInstance: AlertInstance,
+    executionHandler: ReturnType<typeof createExecutionHandler>
+  ) {
+    const { actionGroup, context, state } = alertInstance.getScheduledActionOptions()!;
+    alertInstance.updateLastScheduledActions(actionGroup);
+    alertInstance.unscheduleActions();
+    return executionHandler({ actionGroup, context, state, alertInstanceId });
+  }
+
+  async executeAlertInstances(
+    services: Services,
+    { params, throttle, muteAll, mutedInstanceIds }: SavedObject['attributes'],
+    executionHandler: ReturnType<typeof createExecutionHandler>
+  ): Promise<State> {
+    const {
+      params: { alertId },
+      state: { alertInstances: alertRawInstances = {}, alertTypeState = {}, previousStartedAt },
+    } = this.taskInstance;
+
+    const alertInstances = mapValues<AlertInstances>(
+      alertRawInstances,
+      alert => new AlertInstance(alert)
+    );
+
+    const updatedAlertTypeState = await this.alertType.executor({
+      alertId,
+      services: {
+        ...services,
+        alertInstanceFactory: createAlertInstanceFactory(alertInstances),
+      },
+      params,
+      state: alertTypeState,
+      startedAt: this.taskInstance.startedAt!,
+      previousStartedAt,
+    });
+
+    // Cleanup alert instances that are no longer scheduling actions to avoid over populating the alertInstances object
+    const instancesWithScheduledActions = pick<AlertInstances, AlertInstances>(
+      alertInstances,
+      alertInstance => alertInstance.hasScheduledActions()
+    );
+
+    if (!muteAll) {
+      const enabledAlertInstances = omit<AlertInstances, AlertInstances>(
+        instancesWithScheduledActions,
+        ...mutedInstanceIds
+      );
+
+      await Promise.all(
+        Object.entries(enabledAlertInstances)
+          .filter(
+            ([, alertInstance]: [string, AlertInstance]) => !alertInstance.isThrottled(throttle)
+          )
+          .map(([id, alertInstance]: [string, AlertInstance]) =>
+            this.executeAlertInstance(id, alertInstance, executionHandler)
+          )
+      );
+    }
+
+    return {
+      alertTypeState: updatedAlertTypeState,
+      alertInstances: instancesWithScheduledActions,
+    };
+  }
+
+  async validateAndRunAlert(
+    services: Services,
+    apiKey: string | null,
+    attributes: SavedObject['attributes'],
+    references: SavedObject['references']
+  ) {
+    const {
+      params: { alertId, spaceId },
+    } = this.taskInstance;
+
+    // Validate
+    const params = validateAlertTypeParams(this.alertType, attributes.params);
+    const executionHandler = this.getExecutionHandler(
+      alertId,
+      spaceId,
+      apiKey,
+      attributes.actions,
+      references
+    );
+    return this.executeAlertInstances(services, { ...attributes, params }, executionHandler);
+  }
+
+  async run() {
+    const {
+      params: { alertId, spaceId },
+      startedAt: previousStartedAt,
+      state: originalState,
+    } = this.taskInstance;
+
+    const apiKey = await this.getApiKeyForAlertPermissions(alertId, spaceId);
+    const services = await this.getServicesWithSpaceLevelPermissions(spaceId, apiKey);
+
+    // Ensure API key is still valid and user has access
+    const { attributes, references } = await services.savedObjectsClient.get<RawAlert>(
+      'alert',
+      alertId
+    );
+
+    return {
+      state: map<State, Error, State>(
+        await promiseResult<State, Error>(
+          this.validateAndRunAlert(services, apiKey, attributes, references)
+        ),
+        (stateUpdates: State) => {
+          return {
+            ...stateUpdates,
+            previousStartedAt,
+          };
+        },
+        (err: Error) => {
+          this.logger.error(`Executing Alert "${alertId}" has resulted in Error: ${err.message}`);
+          return {
+            ...originalState,
+            previousStartedAt,
+          };
+        }
+      ),
+      runAt: getNextRunAt(
+        new Date(this.taskInstance.startedAt!),
+        // we do not currently have a good way of returning the type
+        // from SavedObjectsClient, and as we currenrtly require a schedule
+        // and we only support `interval`, we can cast this safely
+        attributes.schedule as IntervalSchedule
+      ),
+    };
+  }
+}
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts
new file mode 100644
index 00000000000000..2ea1256352bec9
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -0,0 +1,87 @@
+/*
+ * 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 sinon from 'sinon';
+import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
+import {
+  savedObjectsClientMock,
+  loggingServiceMock,
+} from '../../../../../../src/core/server/mocks';
+
+const alertType = {
+  id: 'test',
+  name: 'My test alert',
+  actionGroups: ['default'],
+  executor: jest.fn(),
+};
+let fakeTimer: sinon.SinonFakeTimers;
+
+describe('Task Runner Factory', () => {
+  let mockedTaskInstance: ConcreteTaskInstance;
+
+  beforeAll(() => {
+    fakeTimer = sinon.useFakeTimers();
+    mockedTaskInstance = {
+      id: '',
+      attempts: 0,
+      status: TaskStatus.Running,
+      version: '123',
+      runAt: new Date(),
+      scheduledAt: new Date(),
+      startedAt: new Date(),
+      retryAt: new Date(Date.now() + 5 * 60 * 1000),
+      state: {
+        startedAt: new Date(Date.now() - 5 * 60 * 1000),
+      },
+      taskType: 'alerting:test',
+      params: {
+        alertId: '1',
+      },
+      ownerId: null,
+    };
+  });
+
+  afterAll(() => fakeTimer.restore());
+
+  const savedObjectsClient = savedObjectsClientMock.create();
+  const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
+  const services = {
+    log: jest.fn(),
+    callCluster: jest.fn(),
+    savedObjectsClient,
+  };
+
+  const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> = {
+    getServices: jest.fn().mockReturnValue(services),
+    executeAction: jest.fn(),
+    encryptedSavedObjectsPlugin,
+    logger: loggingServiceMock.create().get(),
+    spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+    getBasePath: jest.fn().mockReturnValue(undefined),
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    taskRunnerFactoryInitializerParams.getServices.mockReturnValue(services);
+  });
+
+  test(`throws an error if factory isn't initialized`, () => {
+    const factory = new TaskRunnerFactory();
+    expect(() =>
+      factory.create(alertType, { taskInstance: mockedTaskInstance })
+    ).toThrowErrorMatchingInlineSnapshot(`"TaskRunnerFactory not initialized"`);
+  });
+
+  test(`throws an error if factory is already initialized`, () => {
+    const factory = new TaskRunnerFactory();
+    factory.initialize(taskRunnerFactoryInitializerParams);
+    expect(() =>
+      factory.initialize(taskRunnerFactoryInitializerParams)
+    ).toThrowErrorMatchingInlineSnapshot(`"TaskRunnerFactory already initialized"`);
+  });
+});
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts
new file mode 100644
index 00000000000000..7186e1e729bda4
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { Logger } from '../../../../../../src/core/server';
+import { RunContext } from '../../../task_manager';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
+import { PluginStartContract as ActionsPluginStartContract } from '../../../actions';
+import {
+  AlertType,
+  GetBasePathFunction,
+  GetServicesFunction,
+  SpaceIdToNamespaceFunction,
+} from '../types';
+import { TaskRunner } from './task_runner';
+
+export interface TaskRunnerContext {
+  logger: Logger;
+  getServices: GetServicesFunction;
+  executeAction: ActionsPluginStartContract['execute'];
+  encryptedSavedObjectsPlugin: EncryptedSavedObjectsStartContract;
+  spaceIdToNamespace: SpaceIdToNamespaceFunction;
+  getBasePath: GetBasePathFunction;
+}
+
+export class TaskRunnerFactory {
+  private isInitialized = false;
+  private taskRunnerContext?: TaskRunnerContext;
+
+  public initialize(taskRunnerContext: TaskRunnerContext) {
+    if (this.isInitialized) {
+      throw new Error('TaskRunnerFactory already initialized');
+    }
+    this.isInitialized = true;
+    this.taskRunnerContext = taskRunnerContext;
+  }
+
+  public create(alertType: AlertType, { taskInstance }: RunContext) {
+    if (!this.isInitialized) {
+      throw new Error('TaskRunnerFactory not initialized');
+    }
+
+    return new TaskRunner(alertType, taskInstance, this.taskRunnerContext!);
+  }
+}
diff --git a/x-pack/legacy/plugins/alerting/server/lib/transform_action_params.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/transform_action_params.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/transform_action_params.test.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/transform_action_params.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/transform_action_params.ts b/x-pack/legacy/plugins/alerting/server/task_runner/transform_action_params.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/transform_action_params.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/transform_action_params.ts
diff --git a/x-pack/legacy/plugins/alerting/server/types.ts b/x-pack/legacy/plugins/alerting/server/types.ts
index 62dcf07abb7bdd..9b03f9b02aa0af 100644
--- a/x-pack/legacy/plugins/alerting/server/types.ts
+++ b/x-pack/legacy/plugins/alerting/server/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AlertInstance } from './lib';
+import { AlertInstance } from './alert_instance';
 import { AlertTypeRegistry as OrigAlertTypeRegistry } from './alert_type_registry';
 import { PluginSetupContract, PluginStartContract } from './plugin';
 import { SavedObjectAttributes, SavedObjectsClientContract } from '../../../../../src/core/server';
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx
new file mode 100644
index 00000000000000..ff2cb69d011fa4
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiText, EuiTextColor } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+
+interface Props {
+  count: number;
+}
+
+export const ErrorCount = ({ count }: Props) => (
+  <EuiText size="xs">
+    <h4>
+      <EuiTextColor
+        color="danger"
+        onClick={(e: React.MouseEvent) => {
+          e.stopPropagation();
+        }}
+      >
+        {i18n.translate('xpack.apm.transactionDetails.errorCount', {
+          defaultMessage:
+            '{errorCount, number} {errorCount, plural, one {Error} other {Errors}}',
+          values: { errorCount: count }
+        })}
+      </EuiTextColor>
+    </h4>
+  </EuiText>
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge.tsx
deleted file mode 100644
index 4c3ec3ca9f3080..00000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiBadge } from '@elastic/eui';
-import euiThemeLight from '@elastic/eui/dist/eui_theme_light.json';
-import React from 'react';
-
-type Props = React.ComponentProps<typeof EuiBadge>;
-
-export const ErrorCountBadge = ({ children, ...rest }: Props) => (
-  <EuiBadge color={euiThemeLight.euiColorDanger} {...rest}>
-    {children}
-  </EuiBadge>
-);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx
index 39e52be34a415a..322ec7c422571a 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx
@@ -25,8 +25,9 @@ export const MaybeViewTraceLink = ({
     }
   );
 
+  const { rootTransaction } = waterfall;
   // the traceroot cannot be found, so we cannot link to it
-  if (!waterfall.traceRoot) {
+  if (!rootTransaction) {
     return (
       <EuiFlexItem grow={false}>
         <EuiToolTip
@@ -45,8 +46,7 @@ export const MaybeViewTraceLink = ({
     );
   }
 
-  const isRoot =
-    transaction.transaction.id === waterfall.traceRoot.transaction.id;
+  const isRoot = transaction.transaction.id === rootTransaction.transaction.id;
 
   // the user is already viewing the full trace, so don't link to it
   if (isRoot) {
@@ -69,15 +69,14 @@ export const MaybeViewTraceLink = ({
 
     // the user is viewing a zoomed in version of the trace. Link to the full trace
   } else {
-    const traceRoot = waterfall.traceRoot;
     return (
       <EuiFlexItem grow={false}>
         <TransactionDetailLink
-          serviceName={traceRoot.service.name}
-          transactionId={traceRoot.transaction.id}
-          traceId={traceRoot.trace.id}
-          transactionName={traceRoot.transaction.name}
-          transactionType={traceRoot.transaction.type}
+          serviceName={rootTransaction.service.name}
+          transactionId={rootTransaction.transaction.id}
+          traceId={rootTransaction.trace.id}
+          transactionName={rootTransaction.transaction.name}
+          transactionType={rootTransaction.transaction.type}
         >
           <EuiButton iconType="apmTrace">{viewFullTraceButtonLabel}</EuiButton>
         </TransactionDetailLink>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
index e5be12509e3c91..f8318b9ae97e6d 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
@@ -77,7 +77,6 @@ export function TransactionTabs({
 
       {currentTab.key === timelineTab.key ? (
         <WaterfallContainer
-          transaction={transaction}
           location={location}
           urlParams={urlParams}
           waterfall={waterfall}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.test.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_agent_marks.test.ts
similarity index 66%
rename from x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.test.ts
rename to x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_agent_marks.test.ts
index 9c805bb1cf3854..784c5fbebf3c25 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_agent_marks.test.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Transaction } from '../../../../../../typings/es_schemas/ui/Transaction';
-import { getAgentMarks } from './get_agent_marks';
+import { Transaction } from '../../../../../../../../typings/es_schemas/ui/Transaction';
+import { getAgentMarks } from '../get_agent_marks';
 
 describe('getAgentMarks', () => {
   it('should sort the marks by time', () => {
@@ -21,9 +21,24 @@ describe('getAgentMarks', () => {
       }
     } as any;
     expect(getAgentMarks(transaction)).toEqual([
-      { name: 'timeToFirstByte', us: 10000 },
-      { name: 'domInteractive', us: 117000 },
-      { name: 'domComplete', us: 118000 }
+      {
+        id: 'timeToFirstByte',
+        offset: 10000,
+        type: 'agentMark',
+        verticalLine: true
+      },
+      {
+        id: 'domInteractive',
+        offset: 117000,
+        type: 'agentMark',
+        verticalLine: true
+      },
+      {
+        id: 'domComplete',
+        offset: 118000,
+        type: 'agentMark',
+        verticalLine: true
+      }
     ]);
   });
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_error_marks.test.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_error_marks.test.ts
new file mode 100644
index 00000000000000..8fd8edd7f8a728
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_error_marks.test.ts
@@ -0,0 +1,97 @@
+/*
+ * 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 { IWaterfallItem } from '../../Waterfall/waterfall_helpers/waterfall_helpers';
+import { getErrorMarks } from '../get_error_marks';
+
+describe('getErrorMarks', () => {
+  describe('returns empty array', () => {
+    it('when items are missing', () => {
+      expect(getErrorMarks([], {})).toEqual([]);
+    });
+    it('when any error is available', () => {
+      const items = [
+        { docType: 'span' },
+        { docType: 'transaction' }
+      ] as IWaterfallItem[];
+      expect(getErrorMarks(items, {})).toEqual([]);
+    });
+  });
+
+  it('returns error marks', () => {
+    const items = [
+      {
+        docType: 'error',
+        offset: 10,
+        skew: 5,
+        doc: { error: { id: 1 }, service: { name: 'opbeans-java' } }
+      } as unknown,
+      { docType: 'transaction' },
+      {
+        docType: 'error',
+        offset: 50,
+        skew: 0,
+        doc: { error: { id: 2 }, service: { name: 'opbeans-node' } }
+      } as unknown
+    ] as IWaterfallItem[];
+    expect(
+      getErrorMarks(items, { 'opbeans-java': 'red', 'opbeans-node': 'blue' })
+    ).toEqual([
+      {
+        type: 'errorMark',
+        offset: 15,
+        verticalLine: false,
+        id: 1,
+        error: { error: { id: 1 }, service: { name: 'opbeans-java' } },
+        serviceColor: 'red'
+      },
+      {
+        type: 'errorMark',
+        offset: 50,
+        verticalLine: false,
+        id: 2,
+        error: { error: { id: 2 }, service: { name: 'opbeans-node' } },
+        serviceColor: 'blue'
+      }
+    ]);
+  });
+
+  it('returns error marks without service color', () => {
+    const items = [
+      {
+        docType: 'error',
+        offset: 10,
+        skew: 5,
+        doc: { error: { id: 1 }, service: { name: 'opbeans-java' } }
+      } as unknown,
+      { docType: 'transaction' },
+      {
+        docType: 'error',
+        offset: 50,
+        skew: 0,
+        doc: { error: { id: 2 }, service: { name: 'opbeans-node' } }
+      } as unknown
+    ] as IWaterfallItem[];
+    expect(getErrorMarks(items, {})).toEqual([
+      {
+        type: 'errorMark',
+        offset: 15,
+        verticalLine: false,
+        id: 1,
+        error: { error: { id: 1 }, service: { name: 'opbeans-java' } },
+        serviceColor: undefined
+      },
+      {
+        type: 'errorMark',
+        offset: 50,
+        verticalLine: false,
+        id: 2,
+        error: { error: { id: 2 }, service: { name: 'opbeans-node' } },
+        serviceColor: undefined
+      }
+    ]);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts
new file mode 100644
index 00000000000000..7798d716cb2194
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { sortBy } from 'lodash';
+import { Transaction } from '../../../../../../../typings/es_schemas/ui/Transaction';
+import { Mark } from '.';
+
+// Extends Mark without adding new properties to it.
+export interface AgentMark extends Mark {
+  type: 'agentMark';
+}
+
+export function getAgentMarks(transaction?: Transaction): AgentMark[] {
+  const agent = transaction?.transaction.marks?.agent;
+  if (!agent) {
+    return [];
+  }
+
+  return sortBy(
+    Object.entries(agent).map(([name, ms]) => ({
+      type: 'agentMark',
+      id: name,
+      offset: ms * 1000,
+      verticalLine: true
+    })),
+    'offset'
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts
new file mode 100644
index 00000000000000..f1f0163a49d105
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { isEmpty } from 'lodash';
+import { ErrorRaw } from '../../../../../../../typings/es_schemas/raw/ErrorRaw';
+import {
+  IWaterfallItem,
+  IWaterfallError,
+  IServiceColors
+} from '../Waterfall/waterfall_helpers/waterfall_helpers';
+import { Mark } from '.';
+
+export interface ErrorMark extends Mark {
+  type: 'errorMark';
+  error: ErrorRaw;
+  serviceColor?: string;
+}
+
+export const getErrorMarks = (
+  items: IWaterfallItem[],
+  serviceColors: IServiceColors
+): ErrorMark[] => {
+  if (isEmpty(items)) {
+    return [];
+  }
+
+  return (items.filter(
+    item => item.docType === 'error'
+  ) as IWaterfallError[]).map(error => ({
+    type: 'errorMark',
+    offset: error.offset + error.skew,
+    verticalLine: false,
+    id: error.doc.error.id,
+    error: error.doc,
+    serviceColor: serviceColors[error.doc.service.name]
+  }));
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts
new file mode 100644
index 00000000000000..52f811f5c3969d
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface Mark {
+  type: string;
+  offset: number;
+  verticalLine: boolean;
+  id: string;
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx
index e4cb4ff62b36c6..4e6a0eaf455852 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { px, unit } from '../../../../../style/variables';
 // @ts-ignore
-import Legend from '../../../../shared/charts/Legend';
+import { Legend } from '../../../../shared/charts/Legend';
 import { IServiceColors } from './Waterfall/waterfall_helpers/waterfall_helpers';
 
 const Legends = styled.div`
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx
index cc1f9dd529bce3..4863d6519de070 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx
@@ -101,7 +101,7 @@ export function SpanFlyout({
   const dbContext = span.span.db;
   const httpContext = span.span.http;
   const spanTypes = getSpanTypes(span);
-  const spanHttpStatusCode = httpContext?.response.status_code;
+  const spanHttpStatusCode = httpContext?.response?.status_code;
   const spanHttpUrl = httpContext?.url?.original;
   const spanHttpMethod = httpContext?.method;
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx
index 2020b8252035b7..df95577c81eff7 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx
@@ -27,8 +27,8 @@ import { DroppedSpansWarning } from './DroppedSpansWarning';
 interface Props {
   onClose: () => void;
   transaction?: Transaction;
-  errorCount: number;
-  traceRootDuration?: number;
+  errorCount?: number;
+  rootTransactionDuration?: number;
 }
 
 function TransactionPropertiesTable({
@@ -49,8 +49,8 @@ function TransactionPropertiesTable({
 export function TransactionFlyout({
   transaction: transactionDoc,
   onClose,
-  errorCount,
-  traceRootDuration
+  errorCount = 0,
+  rootTransactionDuration
 }: Props) {
   if (!transactionDoc) {
     return null;
@@ -84,7 +84,7 @@ export function TransactionFlyout({
           <EuiSpacer size="m" />
           <TransactionSummary
             transaction={transactionDoc}
-            totalDuration={traceRootDuration}
+            totalDuration={rootTransactionDuration}
             errorCount={errorCount}
           />
           <EuiHorizontalRule margin="m" />
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
new file mode 100644
index 00000000000000..426088f0bb36a9
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { Location } from 'history';
+import React from 'react';
+import { SpanFlyout } from './SpanFlyout';
+import { TransactionFlyout } from './TransactionFlyout';
+import { IWaterfall } from './waterfall_helpers/waterfall_helpers';
+
+interface Props {
+  waterfallItemId?: string;
+  waterfall: IWaterfall;
+  location: Location;
+  toggleFlyout: ({ location }: { location: Location }) => void;
+}
+export const WaterfallFlyout: React.FC<Props> = ({
+  waterfallItemId,
+  waterfall,
+  location,
+  toggleFlyout
+}) => {
+  const currentItem = waterfall.items.find(item => item.id === waterfallItemId);
+
+  if (!currentItem) {
+    return null;
+  }
+
+  switch (currentItem.docType) {
+    case 'span':
+      const parentTransaction =
+        currentItem.parent?.docType === 'transaction'
+          ? currentItem.parent?.doc
+          : undefined;
+
+      return (
+        <SpanFlyout
+          totalDuration={waterfall.duration}
+          span={currentItem.doc}
+          parentTransaction={parentTransaction}
+          onClose={() => toggleFlyout({ location })}
+        />
+      );
+    case 'transaction':
+      return (
+        <TransactionFlyout
+          transaction={currentItem.doc}
+          onClose={() => toggleFlyout({ location })}
+          rootTransactionDuration={
+            waterfall.rootTransaction?.transaction.duration.us
+          }
+          errorCount={waterfall.errorsPerTransaction[currentItem.id]}
+        />
+      );
+    default:
+      return null;
+  }
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
index 8d4fab4aa8dd91..8a82547d717db2 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
@@ -13,12 +13,12 @@ import { i18n } from '@kbn/i18n';
 import { isRumAgentName } from '../../../../../../../common/agent_name';
 import { px, unit, units } from '../../../../../../style/variables';
 import { asDuration } from '../../../../../../utils/formatters';
-import { ErrorCountBadge } from '../../ErrorCountBadge';
+import { ErrorCount } from '../../ErrorCount';
 import { IWaterfallItem } from './waterfall_helpers/waterfall_helpers';
 import { ErrorOverviewLink } from '../../../../../shared/Links/apm/ErrorOverviewLink';
 import { TRACE_ID } from '../../../../../../../common/elasticsearch_fieldnames';
 
-type ItemType = 'transaction' | 'span';
+type ItemType = 'transaction' | 'span' | 'error';
 
 interface IContainerStyleProps {
   type: ItemType;
@@ -89,24 +89,29 @@ interface IWaterfallItemProps {
 }
 
 function PrefixIcon({ item }: { item: IWaterfallItem }) {
-  if (item.docType === 'span') {
-    // icon for database spans
-    const isDbType = item.span.span.type.startsWith('db');
-    if (isDbType) {
-      return <EuiIcon type="database" />;
+  switch (item.docType) {
+    case 'span': {
+      // icon for database spans
+      const isDbType = item.doc.span.type.startsWith('db');
+      if (isDbType) {
+        return <EuiIcon type="database" />;
+      }
+
+      // omit icon for other spans
+      return null;
     }
-
-    // omit icon for other spans
-    return null;
-  }
-
-  // icon for RUM agent transactions
-  if (isRumAgentName(item.transaction.agent.name)) {
-    return <EuiIcon type="globe" />;
+    case 'transaction': {
+      // icon for RUM agent transactions
+      if (isRumAgentName(item.doc.agent.name)) {
+        return <EuiIcon type="globe" />;
+      }
+
+      // icon for other transactions
+      return <EuiIcon type="merge" />;
+    }
+    default:
+      return null;
   }
-
-  // icon for other transactions
-  return <EuiIcon type="merge" />;
 }
 
 interface SpanActionToolTipProps {
@@ -117,11 +122,9 @@ const SpanActionToolTip: React.FC<SpanActionToolTipProps> = ({
   item,
   children
 }) => {
-  if (item && item.docType === 'span') {
+  if (item?.docType === 'span') {
     return (
-      <EuiToolTip
-        content={`${item.span.span.subtype}.${item.span.span.action}`}
-      >
+      <EuiToolTip content={`${item.doc.span.subtype}.${item.doc.span.action}`}>
         <>{children}</>
       </EuiToolTip>
     );
@@ -140,9 +143,8 @@ function Duration({ item }: { item: IWaterfallItem }) {
 function HttpStatusCode({ item }: { item: IWaterfallItem }) {
   // http status code for transactions of type 'request'
   const httpStatusCode =
-    item.docType === 'transaction' &&
-    item.transaction.transaction.type === 'request'
-      ? item.transaction.transaction.result
+    item.docType === 'transaction' && item.doc.transaction.type === 'request'
+      ? item.doc.transaction.result
       : undefined;
 
   if (!httpStatusCode) {
@@ -153,14 +155,18 @@ function HttpStatusCode({ item }: { item: IWaterfallItem }) {
 }
 
 function NameLabel({ item }: { item: IWaterfallItem }) {
-  if (item.docType === 'span') {
-    return <EuiText size="s">{item.name}</EuiText>;
+  switch (item.docType) {
+    case 'span':
+      return <EuiText size="s">{item.doc.span.name}</EuiText>;
+    case 'transaction':
+      return (
+        <EuiTitle size="xxs">
+          <h5>{item.doc.transaction.name}</h5>
+        </EuiTitle>
+      );
+    default:
+      return null;
   }
-  return (
-    <EuiTitle size="xxs">
-      <h5>{item.name}</h5>
-    </EuiTitle>
-  );
 }
 
 export function WaterfallItem({
@@ -210,24 +216,17 @@ export function WaterfallItem({
         <NameLabel item={item} />
         {errorCount > 0 && item.docType === 'transaction' ? (
           <ErrorOverviewLink
-            serviceName={item.transaction.service.name}
+            serviceName={item.doc.service.name}
             query={{
               kuery: encodeURIComponent(
-                `${TRACE_ID} : "${item.transaction.trace.id}" and transaction.id : "${item.transaction.transaction.id}"`
+                `${TRACE_ID} : "${item.doc.trace.id}" and transaction.id : "${item.doc.transaction.id}"`
               )
             }}
             color="danger"
             style={{ textDecoration: 'none' }}
           >
             <EuiToolTip content={tooltipContent}>
-              <ErrorCountBadge
-                onClick={event => {
-                  event.stopPropagation();
-                }}
-                onClickAriaLabel={tooltipContent}
-              >
-                {errorCount}
-              </ErrorCountBadge>
+              <ErrorCount count={errorCount} />
             </EuiToolTip>
           </ErrorOverviewLink>
         ) : null}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
index d53b4077d9759e..b48fc1cf7ca27e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
@@ -4,31 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiCallOut } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import React, { Component } from 'react';
+import React from 'react';
 // @ts-ignore
 import { StickyContainer } from 'react-sticky';
 import styled from 'styled-components';
-import { EuiCallOut } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { IUrlParams } from '../../../../../../context/UrlParamsContext/types';
+import { px } from '../../../../../../style/variables';
+import { history } from '../../../../../../utils/history';
 // @ts-ignore
 import Timeline from '../../../../../shared/charts/Timeline';
+import { fromQuery, toQuery } from '../../../../../shared/Links/url_helpers';
+import { getAgentMarks } from '../Marks/get_agent_marks';
+import { getErrorMarks } from '../Marks/get_error_marks';
+import { WaterfallFlyout } from './WaterfallFlyout';
+import { WaterfallItem } from './WaterfallItem';
 import {
-  APMQueryParams,
-  fromQuery,
-  toQuery
-} from '../../../../../shared/Links/url_helpers';
-import { history } from '../../../../../../utils/history';
-import { AgentMark } from '../get_agent_marks';
-import { SpanFlyout } from './SpanFlyout';
-import { TransactionFlyout } from './TransactionFlyout';
-import {
-  IServiceColors,
   IWaterfall,
   IWaterfallItem
 } from './waterfall_helpers/waterfall_helpers';
-import { WaterfallItem } from './WaterfallItem';
 
 const Container = styled.div`
   transition: 0.1s padding ease;
@@ -43,138 +38,105 @@ const TIMELINE_MARGINS = {
   bottom: 0
 };
 
+const toggleFlyout = ({
+  item,
+  location
+}: {
+  item?: IWaterfallItem;
+  location: Location;
+}) => {
+  history.replace({
+    ...location,
+    search: fromQuery({
+      ...toQuery(location.search),
+      flyoutDetailTab: undefined,
+      waterfallItemId: item?.id
+    })
+  });
+};
+
+const WaterfallItemsContainer = styled.div<{
+  paddingTop: number;
+}>`
+  padding-top: ${props => px(props.paddingTop)};
+`;
+
 interface Props {
-  agentMarks: AgentMark[];
-  urlParams: IUrlParams;
+  waterfallItemId?: string;
   waterfall: IWaterfall;
   location: Location;
-  serviceColors: IServiceColors;
   exceedsMax: boolean;
 }
 
-export class Waterfall extends Component<Props> {
-  public onOpenFlyout = (item: IWaterfallItem) => {
-    this.setQueryParams({
-      flyoutDetailTab: undefined,
-      waterfallItemId: String(item.id)
-    });
-  };
+export const Waterfall: React.FC<Props> = ({
+  waterfall,
+  exceedsMax,
+  waterfallItemId,
+  location
+}) => {
+  const itemContainerHeight = 58; // TODO: This is a nasty way to calculate the height of the svg element. A better approach should be found
+  const waterfallHeight = itemContainerHeight * waterfall.items.length;
 
-  public onCloseFlyout = () => {
-    this.setQueryParams({
-      flyoutDetailTab: undefined,
-      waterfallItemId: undefined
-    });
-  };
+  const { serviceColors, duration } = waterfall;
 
-  public renderWaterfallItem = (item: IWaterfallItem) => {
-    const { serviceColors, waterfall, urlParams }: Props = this.props;
+  const agentMarks = getAgentMarks(waterfall.entryTransaction);
+  const errorMarks = getErrorMarks(waterfall.items, serviceColors);
+
+  const renderWaterfallItem = (item: IWaterfallItem) => {
+    if (item.docType === 'error') {
+      return null;
+    }
 
     const errorCount =
       item.docType === 'transaction'
-        ? waterfall.errorCountByTransactionId[item.transaction.transaction.id]
+        ? waterfall.errorsPerTransaction[item.doc.transaction.id]
         : 0;
 
     return (
       <WaterfallItem
         key={item.id}
         timelineMargins={TIMELINE_MARGINS}
-        color={serviceColors[item.serviceName]}
+        color={serviceColors[item.doc.service.name]}
         item={item}
-        totalDuration={waterfall.duration}
-        isSelected={item.id === urlParams.waterfallItemId}
+        totalDuration={duration}
+        isSelected={item.id === waterfallItemId}
         errorCount={errorCount}
-        onClick={() => this.onOpenFlyout(item)}
+        onClick={() => toggleFlyout({ item, location })}
       />
     );
   };
 
-  public getFlyOut = () => {
-    const { waterfall, urlParams } = this.props;
-
-    const currentItem =
-      urlParams.waterfallItemId &&
-      waterfall.itemsById[urlParams.waterfallItemId];
-
-    if (!currentItem) {
-      return null;
-    }
-
-    switch (currentItem.docType) {
-      case 'span':
-        const parentTransaction = waterfall.getTransactionById(
-          currentItem.parentId
-        );
-
-        return (
-          <SpanFlyout
-            totalDuration={waterfall.duration}
-            span={currentItem.span}
-            parentTransaction={parentTransaction}
-            onClose={this.onCloseFlyout}
-          />
-        );
-      case 'transaction':
-        return (
-          <TransactionFlyout
-            transaction={currentItem.transaction}
-            onClose={this.onCloseFlyout}
-            traceRootDuration={waterfall.traceRootDuration}
-            errorCount={currentItem.errorCount}
-          />
-        );
-      default:
-        return null;
-    }
-  };
-
-  public render() {
-    const { waterfall, exceedsMax } = this.props;
-    const itemContainerHeight = 58; // TODO: This is a nasty way to calculate the height of the svg element. A better approach should be found
-    const waterfallHeight = itemContainerHeight * waterfall.orderedItems.length;
-
-    return (
-      <Container>
-        {exceedsMax ? (
-          <EuiCallOut
-            color="warning"
-            size="s"
-            iconType="alert"
-            title={i18n.translate('xpack.apm.waterfall.exceedsMax', {
-              defaultMessage:
-                'Number of items in this trace exceed what is displayed'
-            })}
-          />
-        ) : null}
-        <StickyContainer>
-          <Timeline
-            agentMarks={this.props.agentMarks}
-            duration={waterfall.duration}
-            height={waterfallHeight}
-            margins={TIMELINE_MARGINS}
-          />
-          <div
-            style={{
-              paddingTop: TIMELINE_MARGINS.top
-            }}
-          >
-            {waterfall.orderedItems.map(this.renderWaterfallItem)}
-          </div>
-        </StickyContainer>
-
-        {this.getFlyOut()}
-      </Container>
-    );
-  }
-
-  private setQueryParams(params: APMQueryParams) {
-    const { location } = this.props;
-    history.replace({
-      ...location,
-      search: fromQuery({
-        ...toQuery(location.search),
-        ...params
-      })
-    });
-  }
-}
+  return (
+    <Container>
+      {exceedsMax && (
+        <EuiCallOut
+          color="warning"
+          size="s"
+          iconType="alert"
+          title={i18n.translate('xpack.apm.waterfall.exceedsMax', {
+            defaultMessage:
+              'Number of items in this trace exceed what is displayed'
+          })}
+        />
+      )}
+      <StickyContainer>
+        <Timeline
+          marks={[...agentMarks, ...errorMarks]}
+          duration={duration}
+          height={waterfallHeight}
+          margins={TIMELINE_MARGINS}
+        />
+        <WaterfallItemsContainer paddingTop={TIMELINE_MARGINS.top}>
+          {waterfall.items.map(renderWaterfallItem)}
+        </WaterfallItemsContainer>
+      </StickyContainer>
+
+      <WaterfallFlyout
+        waterfallItemId={waterfallItemId}
+        waterfall={waterfall}
+        location={location}
+        toggleFlyout={toggleFlyout}
+      />
+    </Container>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
index 6f61f621676386..ece396bc4cfc4f 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
@@ -24,145 +24,44 @@ Object {
       "name": "GET /api",
     },
   },
-  "errorCountByTransactionId": Object {
+  "errorsCount": 1,
+  "errorsPerTransaction": Object {
     "myTransactionId1": 2,
     "myTransactionId2": 3,
   },
-  "getTransactionById": [Function],
-  "itemsById": Object {
-    "mySpanIdA": Object {
-      "childIds": Array [
-        "mySpanIdB",
-        "mySpanIdC",
-      ],
-      "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "name": "Api::ProductsController#index",
-      "offset": 40498,
-      "parentId": "myTransactionId2",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "myTransactionId2",
-        },
+  "items": Array [
+    Object {
+      "doc": Object {
         "processor": Object {
-          "event": "span",
+          "event": "transaction",
         },
         "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 6161,
-          },
-          "id": "mySpanIdA",
-          "name": "Api::ProductsController#index",
+          "name": "opbeans-node",
         },
         "timestamp": Object {
-          "us": 1549324795824504,
+          "us": 1549324795784006,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795824504,
-    },
-    "mySpanIdB": Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "name": "SELECT FROM products",
-      "offset": 41627,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
           "duration": Object {
-            "us": 481,
+            "us": 49660,
           },
-          "id": "mySpanIdB",
-          "name": "SELECT FROM products",
-        },
-        "timestamp": Object {
-          "us": 1549324795825633,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
+          "id": "myTransactionId1",
+          "name": "GET /api",
         },
       },
-      "timestamp": 1549324795825633,
-    },
-    "mySpanIdC": Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 532,
-      "id": "mySpanIdC",
-      "name": "SELECT FROM product",
-      "offset": 43899,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
+      "docType": "transaction",
+      "duration": 49660,
+      "id": "myTransactionId1",
+      "offset": 0,
+      "parent": undefined,
+      "parentId": undefined,
       "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 532,
-          },
-          "id": "mySpanIdC",
-          "name": "SELECT FROM product",
-        },
-        "timestamp": Object {
-          "us": 1549324795827905,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795827905,
     },
-    "mySpanIdD": Object {
-      "childIds": Array [
-        "myTransactionId2",
-      ],
-      "docType": "span",
-      "duration": 47557,
-      "id": "mySpanIdD",
-      "name": "GET opbeans-ruby:3000/api/products",
-      "offset": 1754,
-      "parentId": "myTransactionId1",
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "span": Object {
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "myTransactionId1",
         },
@@ -189,59 +88,45 @@ Object {
           "id": "myTransactionId1",
         },
       },
-      "timestamp": 1549324795785760,
-    },
-    "myTransactionId1": Object {
-      "childIds": Array [
-        "mySpanIdD",
-      ],
-      "docType": "transaction",
-      "duration": 49660,
-      "errorCount": 2,
-      "id": "myTransactionId1",
-      "name": "GET /api",
-      "offset": 0,
-      "parentId": undefined,
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "timestamp": 1549324795784006,
-      "transaction": Object {
-        "processor": Object {
-          "event": "transaction",
-        },
-        "service": Object {
-          "name": "opbeans-node",
-        },
-        "timestamp": Object {
-          "us": 1549324795784006,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "duration": Object {
-            "us": 49660,
+      "docType": "span",
+      "duration": 47557,
+      "id": "mySpanIdD",
+      "offset": 1754,
+      "parent": Object {
+        "doc": Object {
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "timestamp": Object {
+            "us": 1549324795784006,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 49660,
+            },
+            "id": "myTransactionId1",
+            "name": "GET /api",
           },
-          "id": "myTransactionId1",
-          "name": "GET /api",
         },
+        "docType": "transaction",
+        "duration": 49660,
+        "id": "myTransactionId1",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": undefined,
+        "skew": 0,
       },
-    },
-    "myTransactionId2": Object {
-      "childIds": Array [
-        "mySpanIdA",
-      ],
-      "docType": "transaction",
-      "duration": 8634,
-      "errorCount": 3,
-      "id": "myTransactionId2",
-      "name": "Api::ProductsController#index",
-      "offset": 39298,
-      "parentId": "mySpanIdD",
-      "serviceName": "opbeans-ruby",
+      "parentId": "myTransactionId1",
       "skew": 0,
-      "timestamp": 1549324795823304,
-      "transaction": Object {
+    },
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdD",
         },
@@ -262,181 +147,403 @@ Object {
             "us": 8634,
           },
           "id": "myTransactionId2",
+          "marks": Object {
+            "agent": Object {
+              "domComplete": 383,
+              "domInteractive": 382,
+              "timeToFirstByte": 14,
+            },
+          },
           "name": "Api::ProductsController#index",
         },
       },
-    },
-  },
-  "orderedItems": Array [
-    Object {
-      "childIds": Array [
-        "mySpanIdD",
-      ],
       "docType": "transaction",
-      "duration": 49660,
-      "errorCount": 2,
-      "id": "myTransactionId1",
-      "name": "GET /api",
-      "offset": 0,
-      "parentId": undefined,
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "timestamp": 1549324795784006,
-      "transaction": Object {
-        "processor": Object {
-          "event": "transaction",
-        },
-        "service": Object {
-          "name": "opbeans-node",
-        },
-        "timestamp": Object {
-          "us": 1549324795784006,
-        },
-        "trace": Object {
-          "id": "myTraceId",
+      "duration": 8634,
+      "id": "myTransactionId2",
+      "offset": 39298,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId1",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 47557,
+            },
+            "id": "mySpanIdD",
+            "name": "GET opbeans-ruby:3000/api/products",
+          },
+          "timestamp": Object {
+            "us": 1549324795785760,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId1",
+          },
         },
-        "transaction": Object {
-          "duration": Object {
-            "us": 49660,
+        "docType": "span",
+        "duration": 47557,
+        "id": "mySpanIdD",
+        "offset": 1754,
+        "parent": Object {
+          "doc": Object {
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-node",
+            },
+            "timestamp": Object {
+              "us": 1549324795784006,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 49660,
+              },
+              "id": "myTransactionId1",
+              "name": "GET /api",
+            },
           },
+          "docType": "transaction",
+          "duration": 49660,
           "id": "myTransactionId1",
-          "name": "GET /api",
+          "offset": 0,
+          "parent": undefined,
+          "parentId": undefined,
+          "skew": 0,
         },
+        "parentId": "myTransactionId1",
+        "skew": 0,
       },
+      "parentId": "mySpanIdD",
+      "skew": 0,
     },
     Object {
-      "childIds": Array [
-        "myTransactionId2",
-      ],
-      "docType": "span",
-      "duration": 47557,
-      "id": "mySpanIdD",
-      "name": "GET opbeans-ruby:3000/api/products",
-      "offset": 1754,
-      "parentId": "myTransactionId1",
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "span": Object {
+      "doc": Object {
         "parent": Object {
-          "id": "myTransactionId1",
+          "id": "myTransactionId2",
         },
         "processor": Object {
           "event": "span",
         },
         "service": Object {
-          "name": "opbeans-node",
+          "name": "opbeans-ruby",
         },
         "span": Object {
           "duration": Object {
-            "us": 47557,
+            "us": 6161,
           },
-          "id": "mySpanIdD",
-          "name": "GET opbeans-ruby:3000/api/products",
+          "id": "mySpanIdA",
+          "name": "Api::ProductsController#index",
         },
         "timestamp": Object {
-          "us": 1549324795785760,
+          "us": 1549324795824504,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "id": "myTransactionId1",
+          "id": "myTransactionId2",
+        },
+      },
+      "docType": "span",
+      "duration": 6161,
+      "id": "mySpanIdA",
+      "offset": 40498,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdD",
+          },
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "timestamp": Object {
+            "us": 1549324795823304,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 8634,
+            },
+            "id": "myTransactionId2",
+            "marks": Object {
+              "agent": Object {
+                "domComplete": 383,
+                "domInteractive": 382,
+                "timeToFirstByte": 14,
+              },
+            },
+            "name": "Api::ProductsController#index",
+          },
         },
+        "docType": "transaction",
+        "duration": 8634,
+        "id": "myTransactionId2",
+        "offset": 39298,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "myTransactionId1",
+            },
+            "processor": Object {
+              "event": "span",
+            },
+            "service": Object {
+              "name": "opbeans-node",
+            },
+            "span": Object {
+              "duration": Object {
+                "us": 47557,
+              },
+              "id": "mySpanIdD",
+              "name": "GET opbeans-ruby:3000/api/products",
+            },
+            "timestamp": Object {
+              "us": 1549324795785760,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "id": "myTransactionId1",
+            },
+          },
+          "docType": "span",
+          "duration": 47557,
+          "id": "mySpanIdD",
+          "offset": 1754,
+          "parent": Object {
+            "doc": Object {
+              "processor": Object {
+                "event": "transaction",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "timestamp": Object {
+                "us": 1549324795784006,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "duration": Object {
+                  "us": 49660,
+                },
+                "id": "myTransactionId1",
+                "name": "GET /api",
+              },
+            },
+            "docType": "transaction",
+            "duration": 49660,
+            "id": "myTransactionId1",
+            "offset": 0,
+            "parent": undefined,
+            "parentId": undefined,
+            "skew": 0,
+          },
+          "parentId": "myTransactionId1",
+          "skew": 0,
+        },
+        "parentId": "mySpanIdD",
+        "skew": 0,
       },
-      "timestamp": 1549324795785760,
+      "parentId": "myTransactionId2",
+      "skew": 0,
     },
     Object {
-      "childIds": Array [
-        "mySpanIdA",
-      ],
-      "docType": "transaction",
-      "duration": 8634,
-      "errorCount": 3,
-      "id": "myTransactionId2",
-      "name": "Api::ProductsController#index",
-      "offset": 39298,
-      "parentId": "mySpanIdD",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "timestamp": 1549324795823304,
-      "transaction": Object {
+      "doc": Object {
         "parent": Object {
-          "id": "mySpanIdD",
+          "id": "mySpanIdA",
         },
         "processor": Object {
-          "event": "transaction",
+          "event": "span",
         },
         "service": Object {
           "name": "opbeans-ruby",
         },
+        "span": Object {
+          "duration": Object {
+            "us": 481,
+          },
+          "id": "mySpanIdB",
+          "name": "SELECT FROM products",
+        },
         "timestamp": Object {
-          "us": 1549324795823304,
+          "us": 1549324795825633,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "duration": Object {
-            "us": 8634,
-          },
           "id": "myTransactionId2",
-          "name": "Api::ProductsController#index",
         },
       },
-    },
-    Object {
-      "childIds": Array [
-        "mySpanIdB",
-        "mySpanIdC",
-      ],
       "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "name": "Api::ProductsController#index",
-      "offset": 40498,
-      "parentId": "myTransactionId2",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "myTransactionId2",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 6161,
+      "duration": 481,
+      "id": "mySpanIdB",
+      "offset": 41627,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
           },
-          "id": "mySpanIdA",
-          "name": "Api::ProductsController#index",
-        },
-        "timestamp": Object {
-          "us": 1549324795824504,
-        },
-        "trace": Object {
-          "id": "myTraceId",
         },
-        "transaction": Object {
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 40498,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
           "id": "myTransactionId2",
+          "offset": 39298,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "myTransactionId1",
+              },
+              "processor": Object {
+                "event": "span",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "span": Object {
+                "duration": Object {
+                  "us": 47557,
+                },
+                "id": "mySpanIdD",
+                "name": "GET opbeans-ruby:3000/api/products",
+              },
+              "timestamp": Object {
+                "us": 1549324795785760,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "id": "myTransactionId1",
+              },
+            },
+            "docType": "span",
+            "duration": 47557,
+            "id": "mySpanIdD",
+            "offset": 1754,
+            "parent": Object {
+              "doc": Object {
+                "processor": Object {
+                  "event": "transaction",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "timestamp": Object {
+                  "us": 1549324795784006,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "duration": Object {
+                    "us": 49660,
+                  },
+                  "id": "myTransactionId1",
+                  "name": "GET /api",
+                },
+              },
+              "docType": "transaction",
+              "duration": 49660,
+              "id": "myTransactionId1",
+              "offset": 0,
+              "parent": undefined,
+              "parentId": undefined,
+              "skew": 0,
+            },
+            "parentId": "myTransactionId1",
+            "skew": 0,
+          },
+          "parentId": "mySpanIdD",
+          "skew": 0,
         },
+        "parentId": "myTransactionId2",
+        "skew": 0,
       },
-      "timestamp": 1549324795824504,
-    },
-    Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "name": "SELECT FROM products",
-      "offset": 41627,
       "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
       "skew": 0,
-      "span": Object {
+    },
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdA",
         },
@@ -448,13 +555,13 @@ Object {
         },
         "span": Object {
           "duration": Object {
-            "us": 481,
+            "us": 532,
           },
-          "id": "mySpanIdB",
-          "name": "SELECT FROM products",
+          "id": "mySpanIdC",
+          "name": "SELECT FROM product",
         },
         "timestamp": Object {
-          "us": 1549324795825633,
+          "us": 1549324795827905,
         },
         "trace": Object {
           "id": "myTraceId",
@@ -463,57 +570,223 @@ Object {
           "id": "myTransactionId2",
         },
       },
-      "timestamp": 1549324795825633,
-    },
-    Object {
-      "childIds": Array [],
       "docType": "span",
       "duration": 532,
       "id": "mySpanIdC",
-      "name": "SELECT FROM product",
       "offset": 43899,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 40498,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 39298,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "myTransactionId1",
+              },
+              "processor": Object {
+                "event": "span",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "span": Object {
+                "duration": Object {
+                  "us": 47557,
+                },
+                "id": "mySpanIdD",
+                "name": "GET opbeans-ruby:3000/api/products",
+              },
+              "timestamp": Object {
+                "us": 1549324795785760,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "id": "myTransactionId1",
+              },
+            },
+            "docType": "span",
+            "duration": 47557,
+            "id": "mySpanIdD",
+            "offset": 1754,
+            "parent": Object {
+              "doc": Object {
+                "processor": Object {
+                  "event": "transaction",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "timestamp": Object {
+                  "us": 1549324795784006,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "duration": Object {
+                    "us": 49660,
+                  },
+                  "id": "myTransactionId1",
+                  "name": "GET /api",
+                },
+              },
+              "docType": "transaction",
+              "duration": 49660,
+              "id": "myTransactionId1",
+              "offset": 0,
+              "parent": undefined,
+              "parentId": undefined,
+              "skew": 0,
+            },
+            "parentId": "myTransactionId1",
+            "skew": 0,
+          },
+          "parentId": "mySpanIdD",
+          "skew": 0,
+        },
+        "parentId": "myTransactionId2",
+        "skew": 0,
+      },
       "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
       "skew": 0,
-      "span": Object {
+    },
+    Object {
+      "doc": Object {
+        "agent": Object {
+          "name": "ruby",
+          "version": "2",
+        },
+        "error": Object {
+          "grouping_key": "errorGroupingKey1",
+          "id": "error1",
+          "log": Object {
+            "message": "error message",
+          },
+        },
         "parent": Object {
-          "id": "mySpanIdA",
+          "id": "myTransactionId1",
         },
         "processor": Object {
-          "event": "span",
+          "event": "error",
         },
         "service": Object {
           "name": "opbeans-ruby",
         },
-        "span": Object {
-          "duration": Object {
-            "us": 532,
-          },
-          "id": "mySpanIdC",
-          "name": "SELECT FROM product",
-        },
         "timestamp": Object {
-          "us": 1549324795827905,
+          "us": 1549324795810000,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "id": "myTransactionId2",
+          "id": "myTransactionId1",
+        },
+      },
+      "docType": "error",
+      "duration": 0,
+      "id": "error1",
+      "offset": 25994,
+      "parent": Object {
+        "doc": Object {
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "timestamp": Object {
+            "us": 1549324795784006,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 49660,
+            },
+            "id": "myTransactionId1",
+            "name": "GET /api",
+          },
         },
+        "docType": "transaction",
+        "duration": 49660,
+        "id": "myTransactionId1",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": undefined,
+        "skew": 0,
       },
-      "timestamp": 1549324795827905,
+      "parentId": "myTransactionId1",
+      "skew": 0,
     },
   ],
-  "serviceColors": Object {
-    "opbeans-node": "#3185fc",
-    "opbeans-ruby": "#00b3a4",
-  },
-  "services": Array [
-    "opbeans-node",
-    "opbeans-ruby",
-  ],
-  "traceRoot": Object {
+  "rootTransaction": Object {
     "processor": Object {
       "event": "transaction",
     },
@@ -534,7 +807,10 @@ Object {
       "name": "GET /api",
     },
   },
-  "traceRootDuration": 49660,
+  "serviceColors": Object {
+    "opbeans-node": "#3185fc",
+    "opbeans-ruby": "#00b3a4",
+  },
 }
 `;
 
@@ -562,221 +838,24 @@ Object {
         "us": 8634,
       },
       "id": "myTransactionId2",
-      "name": "Api::ProductsController#index",
-    },
-  },
-  "errorCountByTransactionId": Object {
-    "myTransactionId1": 2,
-    "myTransactionId2": 3,
-  },
-  "getTransactionById": [Function],
-  "itemsById": Object {
-    "mySpanIdA": Object {
-      "childIds": Array [
-        "mySpanIdB",
-        "mySpanIdC",
-      ],
-      "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "name": "Api::ProductsController#index",
-      "offset": 1200,
-      "parentId": "myTransactionId2",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "myTransactionId2",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 6161,
-          },
-          "id": "mySpanIdA",
-          "name": "Api::ProductsController#index",
-        },
-        "timestamp": Object {
-          "us": 1549324795824504,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795824504,
-    },
-    "mySpanIdB": Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "name": "SELECT FROM products",
-      "offset": 2329,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 481,
-          },
-          "id": "mySpanIdB",
-          "name": "SELECT FROM products",
-        },
-        "timestamp": Object {
-          "us": 1549324795825633,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795825633,
-    },
-    "mySpanIdC": Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 532,
-      "id": "mySpanIdC",
-      "name": "SELECT FROM product",
-      "offset": 4601,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 532,
-          },
-          "id": "mySpanIdC",
-          "name": "SELECT FROM product",
-        },
-        "timestamp": Object {
-          "us": 1549324795827905,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795827905,
-    },
-    "mySpanIdD": Object {
-      "docType": "span",
-      "duration": 47557,
-      "id": "mySpanIdD",
-      "name": "GET opbeans-ruby:3000/api/products",
-      "offset": 0,
-      "parentId": "myTransactionId1",
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "myTransactionId1",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-node",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 47557,
-          },
-          "id": "mySpanIdD",
-          "name": "GET opbeans-ruby:3000/api/products",
-        },
-        "timestamp": Object {
-          "us": 1549324795785760,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId1",
-        },
-      },
-      "timestamp": 1549324795785760,
-    },
-    "myTransactionId1": Object {
-      "docType": "transaction",
-      "duration": 49660,
-      "errorCount": 2,
-      "id": "myTransactionId1",
-      "name": "GET /api",
-      "offset": 0,
-      "parentId": undefined,
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "timestamp": 1549324795784006,
-      "transaction": Object {
-        "processor": Object {
-          "event": "transaction",
-        },
-        "service": Object {
-          "name": "opbeans-node",
-        },
-        "timestamp": Object {
-          "us": 1549324795784006,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "duration": Object {
-            "us": 49660,
-          },
-          "id": "myTransactionId1",
-          "name": "GET /api",
+      "marks": Object {
+        "agent": Object {
+          "domComplete": 383,
+          "domInteractive": 382,
+          "timeToFirstByte": 14,
         },
       },
-    },
-    "myTransactionId2": Object {
-      "childIds": Array [
-        "mySpanIdA",
-      ],
-      "docType": "transaction",
-      "duration": 8634,
-      "errorCount": 3,
-      "id": "myTransactionId2",
       "name": "Api::ProductsController#index",
-      "offset": 0,
-      "parentId": "mySpanIdD",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "timestamp": 1549324795823304,
-      "transaction": Object {
+    },
+  },
+  "errorsCount": 0,
+  "errorsPerTransaction": Object {
+    "myTransactionId1": 2,
+    "myTransactionId2": 3,
+  },
+  "items": Array [
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdD",
         },
@@ -797,65 +876,26 @@ Object {
             "us": 8634,
           },
           "id": "myTransactionId2",
+          "marks": Object {
+            "agent": Object {
+              "domComplete": 383,
+              "domInteractive": 382,
+              "timeToFirstByte": 14,
+            },
+          },
           "name": "Api::ProductsController#index",
         },
       },
-    },
-  },
-  "orderedItems": Array [
-    Object {
-      "childIds": Array [
-        "mySpanIdA",
-      ],
       "docType": "transaction",
       "duration": 8634,
-      "errorCount": 3,
       "id": "myTransactionId2",
-      "name": "Api::ProductsController#index",
       "offset": 0,
+      "parent": undefined,
       "parentId": "mySpanIdD",
-      "serviceName": "opbeans-ruby",
       "skew": 0,
-      "timestamp": 1549324795823304,
-      "transaction": Object {
-        "parent": Object {
-          "id": "mySpanIdD",
-        },
-        "processor": Object {
-          "event": "transaction",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "timestamp": Object {
-          "us": 1549324795823304,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "duration": Object {
-            "us": 8634,
-          },
-          "id": "myTransactionId2",
-          "name": "Api::ProductsController#index",
-        },
-      },
     },
     Object {
-      "childIds": Array [
-        "mySpanIdB",
-        "mySpanIdC",
-      ],
-      "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "name": "Api::ProductsController#index",
-      "offset": 1200,
-      "parentId": "myTransactionId2",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
+      "doc": Object {
         "parent": Object {
           "id": "myTransactionId2",
         },
@@ -882,19 +922,55 @@ Object {
           "id": "myTransactionId2",
         },
       },
-      "timestamp": 1549324795824504,
-    },
-    Object {
-      "childIds": Array [],
       "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "name": "SELECT FROM products",
-      "offset": 2329,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
+      "duration": 6161,
+      "id": "mySpanIdA",
+      "offset": 1200,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdD",
+          },
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "timestamp": Object {
+            "us": 1549324795823304,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 8634,
+            },
+            "id": "myTransactionId2",
+            "marks": Object {
+              "agent": Object {
+                "domComplete": 383,
+                "domInteractive": 382,
+                "timeToFirstByte": 14,
+              },
+            },
+            "name": "Api::ProductsController#index",
+          },
+        },
+        "docType": "transaction",
+        "duration": 8634,
+        "id": "myTransactionId2",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": "mySpanIdD",
+        "skew": 0,
+      },
+      "parentId": "myTransactionId2",
       "skew": 0,
-      "span": Object {
+    },
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdA",
         },
@@ -921,19 +997,90 @@ Object {
           "id": "myTransactionId2",
         },
       },
-      "timestamp": 1549324795825633,
-    },
-    Object {
-      "childIds": Array [],
       "docType": "span",
-      "duration": 532,
-      "id": "mySpanIdC",
-      "name": "SELECT FROM product",
-      "offset": 4601,
+      "duration": 481,
+      "id": "mySpanIdB",
+      "offset": 2329,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 1200,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 0,
+          "parent": undefined,
+          "parentId": "mySpanIdD",
+          "skew": 0,
+        },
+        "parentId": "myTransactionId2",
+        "skew": 0,
+      },
       "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
       "skew": 0,
-      "span": Object {
+    },
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdA",
         },
@@ -960,16 +1107,90 @@ Object {
           "id": "myTransactionId2",
         },
       },
-      "timestamp": 1549324795827905,
+      "docType": "span",
+      "duration": 532,
+      "id": "mySpanIdC",
+      "offset": 4601,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 1200,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 0,
+          "parent": undefined,
+          "parentId": "mySpanIdD",
+          "skew": 0,
+        },
+        "parentId": "myTransactionId2",
+        "skew": 0,
+      },
+      "parentId": "mySpanIdA",
+      "skew": 0,
     },
   ],
-  "serviceColors": Object {
-    "opbeans-ruby": "#3185fc",
-  },
-  "services": Array [
-    "opbeans-ruby",
-  ],
-  "traceRoot": Object {
+  "rootTransaction": Object {
     "processor": Object {
       "event": "transaction",
     },
@@ -990,30 +1211,61 @@ Object {
       "name": "GET /api",
     },
   },
-  "traceRootDuration": 49660,
+  "serviceColors": Object {
+    "opbeans-ruby": "#3185fc",
+  },
 }
 `;
 
 exports[`waterfall_helpers getWaterfallItems should handle cyclic references 1`] = `
 Array [
   Object {
-    "childIds": Array [
-      "a",
-    ],
+    "doc": Object {
+      "timestamp": Object {
+        "us": 10,
+      },
+      "transaction": Object {
+        "id": "a",
+      },
+    },
+    "docType": "transaction",
     "id": "a",
     "offset": 0,
+    "parent": undefined,
     "skew": 0,
-    "timestamp": 10,
   },
   Object {
-    "childIds": Array [
-      "a",
-    ],
-    "id": "a",
+    "doc": Object {
+      "parent": Object {
+        "id": "a",
+      },
+      "span": Object {
+        "id": "b",
+      },
+      "timestamp": Object {
+        "us": 20,
+      },
+    },
+    "docType": "span",
+    "id": "b",
     "offset": 10,
+    "parent": Object {
+      "doc": Object {
+        "timestamp": Object {
+          "us": 10,
+        },
+        "transaction": Object {
+          "id": "a",
+        },
+      },
+      "docType": "transaction",
+      "id": "a",
+      "offset": 0,
+      "parent": undefined,
+      "skew": 0,
+    },
     "parentId": "a",
-    "skew": undefined,
-    "timestamp": 20,
+    "skew": 0,
   },
 ]
 `;
@@ -1021,89 +1273,280 @@ Array [
 exports[`waterfall_helpers getWaterfallItems should order items correctly 1`] = `
 Array [
   Object {
-    "childIds": Array [
-      "b2",
-      "b",
-    ],
+    "doc": Object {
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "timestamp": Object {
+        "us": 1536763736366000,
+      },
+      "transaction": Object {
+        "id": "a",
+        "name": "APIRestController#products",
+      },
+    },
     "docType": "transaction",
     "duration": 9480,
-    "errorCount": 0,
     "id": "a",
-    "name": "APIRestController#products",
     "offset": 0,
-    "serviceName": "opbeans-java",
+    "parent": undefined,
     "skew": 0,
-    "timestamp": 1536763736366000,
-    "transaction": Object {},
   },
   Object {
-    "childIds": Array [],
+    "doc": Object {
+      "parent": Object {
+        "id": "a",
+      },
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "span": Object {
+        "id": "b2",
+        "name": "GET [0:0:0:0:0:0:0:1]",
+      },
+      "timestamp": Object {
+        "us": 1536763736367000,
+      },
+      "transaction": Object {
+        "id": "a",
+      },
+    },
     "docType": "span",
     "duration": 4694,
     "id": "b2",
-    "name": "GET [0:0:0:0:0:0:0:1]",
     "offset": 1000,
+    "parent": Object {
+      "doc": Object {
+        "service": Object {
+          "name": "opbeans-java",
+        },
+        "timestamp": Object {
+          "us": 1536763736366000,
+        },
+        "transaction": Object {
+          "id": "a",
+          "name": "APIRestController#products",
+        },
+      },
+      "docType": "transaction",
+      "duration": 9480,
+      "id": "a",
+      "offset": 0,
+      "parent": undefined,
+      "skew": 0,
+    },
     "parentId": "a",
-    "serviceName": "opbeans-java",
     "skew": 0,
-    "span": Object {
+  },
+  Object {
+    "doc": Object {
+      "parent": Object {
+        "id": "a",
+      },
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "span": Object {
+        "id": "b",
+        "name": "GET [0:0:0:0:0:0:0:1]",
+      },
+      "timestamp": Object {
+        "us": 1536763736368000,
+      },
       "transaction": Object {
         "id": "a",
       },
     },
-    "timestamp": 1536763736367000,
-  },
-  Object {
-    "childIds": Array [
-      "c",
-    ],
     "docType": "span",
     "duration": 4694,
     "id": "b",
-    "name": "GET [0:0:0:0:0:0:0:1]",
     "offset": 2000,
+    "parent": Object {
+      "doc": Object {
+        "service": Object {
+          "name": "opbeans-java",
+        },
+        "timestamp": Object {
+          "us": 1536763736366000,
+        },
+        "transaction": Object {
+          "id": "a",
+          "name": "APIRestController#products",
+        },
+      },
+      "docType": "transaction",
+      "duration": 9480,
+      "id": "a",
+      "offset": 0,
+      "parent": undefined,
+      "skew": 0,
+    },
     "parentId": "a",
-    "serviceName": "opbeans-java",
     "skew": 0,
-    "span": Object {
+  },
+  Object {
+    "doc": Object {
+      "parent": Object {
+        "id": "b",
+      },
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "timestamp": Object {
+        "us": 1536763736369000,
+      },
       "transaction": Object {
-        "id": "a",
+        "id": "c",
+        "name": "APIRestController#productsRemote",
       },
     },
-    "timestamp": 1536763736368000,
-  },
-  Object {
-    "childIds": Array [
-      "d",
-    ],
     "docType": "transaction",
     "duration": 3581,
-    "errorCount": 0,
     "id": "c",
-    "name": "APIRestController#productsRemote",
     "offset": 3000,
+    "parent": Object {
+      "doc": Object {
+        "parent": Object {
+          "id": "a",
+        },
+        "service": Object {
+          "name": "opbeans-java",
+        },
+        "span": Object {
+          "id": "b",
+          "name": "GET [0:0:0:0:0:0:0:1]",
+        },
+        "timestamp": Object {
+          "us": 1536763736368000,
+        },
+        "transaction": Object {
+          "id": "a",
+        },
+      },
+      "docType": "span",
+      "duration": 4694,
+      "id": "b",
+      "offset": 2000,
+      "parent": Object {
+        "doc": Object {
+          "service": Object {
+            "name": "opbeans-java",
+          },
+          "timestamp": Object {
+            "us": 1536763736366000,
+          },
+          "transaction": Object {
+            "id": "a",
+            "name": "APIRestController#products",
+          },
+        },
+        "docType": "transaction",
+        "duration": 9480,
+        "id": "a",
+        "offset": 0,
+        "parent": undefined,
+        "skew": 0,
+      },
+      "parentId": "a",
+      "skew": 0,
+    },
     "parentId": "b",
-    "serviceName": "opbeans-java",
     "skew": 0,
-    "timestamp": 1536763736369000,
-    "transaction": Object {},
   },
   Object {
-    "childIds": Array [],
+    "doc": Object {
+      "parent": Object {
+        "id": "c",
+      },
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "span": Object {
+        "id": "d",
+        "name": "SELECT",
+      },
+      "timestamp": Object {
+        "us": 1536763736371000,
+      },
+      "transaction": Object {
+        "id": "c",
+      },
+    },
     "docType": "span",
     "duration": 210,
     "id": "d",
-    "name": "SELECT",
     "offset": 5000,
-    "parentId": "c",
-    "serviceName": "opbeans-java",
-    "skew": 0,
-    "span": Object {
-      "transaction": Object {
-        "id": "c",
+    "parent": Object {
+      "doc": Object {
+        "parent": Object {
+          "id": "b",
+        },
+        "service": Object {
+          "name": "opbeans-java",
+        },
+        "timestamp": Object {
+          "us": 1536763736369000,
+        },
+        "transaction": Object {
+          "id": "c",
+          "name": "APIRestController#productsRemote",
+        },
+      },
+      "docType": "transaction",
+      "duration": 3581,
+      "id": "c",
+      "offset": 3000,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "a",
+          },
+          "service": Object {
+            "name": "opbeans-java",
+          },
+          "span": Object {
+            "id": "b",
+            "name": "GET [0:0:0:0:0:0:0:1]",
+          },
+          "timestamp": Object {
+            "us": 1536763736368000,
+          },
+          "transaction": Object {
+            "id": "a",
+          },
+        },
+        "docType": "span",
+        "duration": 4694,
+        "id": "b",
+        "offset": 2000,
+        "parent": Object {
+          "doc": Object {
+            "service": Object {
+              "name": "opbeans-java",
+            },
+            "timestamp": Object {
+              "us": 1536763736366000,
+            },
+            "transaction": Object {
+              "id": "a",
+              "name": "APIRestController#products",
+            },
+          },
+          "docType": "transaction",
+          "duration": 9480,
+          "id": "a",
+          "offset": 0,
+          "parent": undefined,
+          "skew": 0,
+        },
+        "parentId": "a",
+        "skew": 0,
       },
+      "parentId": "b",
+      "skew": 0,
     },
-    "timestamp": 1536763736371000,
+    "parentId": "c",
+    "skew": 0,
   },
 ]
 `;
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
index 6166515fd9d38d..426842bc02f510 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
@@ -11,8 +11,10 @@ import {
   getClockSkew,
   getOrderedWaterfallItems,
   getWaterfall,
-  IWaterfallItem
+  IWaterfallItem,
+  IWaterfallTransaction
 } from './waterfall_helpers';
+import { APMError } from '../../../../../../../../typings/es_schemas/ui/APMError';
 
 describe('waterfall_helpers', () => {
   describe('getWaterfall', () => {
@@ -80,7 +82,7 @@ describe('waterfall_helpers', () => {
         },
         timestamp: { us: 1549324795785760 }
       } as Span,
-      {
+      ({
         parent: { id: 'mySpanIdD' },
         processor: { event: 'transaction' },
         trace: { id: 'myTraceId' },
@@ -88,10 +90,36 @@ describe('waterfall_helpers', () => {
         transaction: {
           duration: { us: 8634 },
           name: 'Api::ProductsController#index',
-          id: 'myTransactionId2'
+          id: 'myTransactionId2',
+          marks: {
+            agent: {
+              domInteractive: 382,
+              domComplete: 383,
+              timeToFirstByte: 14
+            }
+          }
         },
         timestamp: { us: 1549324795823304 }
-      } as Transaction
+      } as unknown) as Transaction,
+      ({
+        processor: { event: 'error' },
+        parent: { id: 'myTransactionId1' },
+        timestamp: { us: 1549324795810000 },
+        trace: { id: 'myTraceId' },
+        transaction: { id: 'myTransactionId1' },
+        error: {
+          id: 'error1',
+          grouping_key: 'errorGroupingKey1',
+          log: {
+            message: 'error message'
+          }
+        },
+        service: { name: 'opbeans-ruby' },
+        agent: {
+          name: 'ruby',
+          version: '2'
+        }
+      } as unknown) as APMError
     ];
 
     it('should return full waterfall', () => {
@@ -107,8 +135,10 @@ describe('waterfall_helpers', () => {
         },
         entryTransactionId
       );
-      expect(waterfall.orderedItems.length).toBe(6);
-      expect(waterfall.orderedItems[0].id).toBe('myTransactionId1');
+
+      expect(waterfall.items.length).toBe(7);
+      expect(waterfall.items[0].id).toBe('myTransactionId1');
+      expect(waterfall.errorsCount).toEqual(1);
       expect(waterfall).toMatchSnapshot();
     });
 
@@ -125,26 +155,11 @@ describe('waterfall_helpers', () => {
         },
         entryTransactionId
       );
-      expect(waterfall.orderedItems.length).toBe(4);
-      expect(waterfall.orderedItems[0].id).toBe('myTransactionId2');
-      expect(waterfall).toMatchSnapshot();
-    });
 
-    it('getTransactionById', () => {
-      const entryTransactionId = 'myTransactionId1';
-      const errorsPerTransaction = {
-        myTransactionId1: 2,
-        myTransactionId2: 3
-      };
-      const waterfall = getWaterfall(
-        {
-          trace: { items: hits, exceedsMax: false },
-          errorsPerTransaction
-        },
-        entryTransactionId
-      );
-      const transaction = waterfall.getTransactionById('myTransactionId2');
-      expect(transaction!.transaction.id).toBe('myTransactionId2');
+      expect(waterfall.items.length).toBe(4);
+      expect(waterfall.items[0].id).toBe('myTransactionId2');
+      expect(waterfall.errorsCount).toEqual(0);
+      expect(waterfall).toMatchSnapshot();
     });
   });
 
@@ -152,84 +167,102 @@ describe('waterfall_helpers', () => {
     it('should order items correctly', () => {
       const items: IWaterfallItem[] = [
         {
+          docType: 'span',
+          doc: {
+            parent: { id: 'c' },
+            service: { name: 'opbeans-java' },
+            transaction: {
+              id: 'c'
+            },
+            timestamp: { us: 1536763736371000 },
+            span: {
+              id: 'd',
+              name: 'SELECT'
+            }
+          } as Span,
           id: 'd',
           parentId: 'c',
-          serviceName: 'opbeans-java',
-          name: 'SELECT',
           duration: 210,
-          timestamp: 1536763736371000,
           offset: 0,
-          skew: 0,
+          skew: 0
+        },
+        {
           docType: 'span',
-          span: {
+          doc: {
+            parent: { id: 'a' },
+            service: { name: 'opbeans-java' },
             transaction: {
-              id: 'c'
+              id: 'a'
+            },
+            timestamp: { us: 1536763736368000 },
+            span: {
+              id: 'b',
+              name: 'GET [0:0:0:0:0:0:0:1]'
             }
-          } as Span
-        },
-        {
+          } as Span,
           id: 'b',
           parentId: 'a',
-          serviceName: 'opbeans-java',
-          name: 'GET [0:0:0:0:0:0:0:1]',
           duration: 4694,
-          timestamp: 1536763736368000,
           offset: 0,
-          skew: 0,
+          skew: 0
+        },
+        {
           docType: 'span',
-          span: {
+          doc: {
+            parent: { id: 'a' },
+            service: { name: 'opbeans-java' },
             transaction: {
               id: 'a'
+            },
+            timestamp: { us: 1536763736367000 },
+            span: {
+              id: 'b2',
+              name: 'GET [0:0:0:0:0:0:0:1]'
             }
-          } as Span
-        },
-        {
+          } as Span,
           id: 'b2',
           parentId: 'a',
-          serviceName: 'opbeans-java',
-          name: 'GET [0:0:0:0:0:0:0:1]',
           duration: 4694,
-          timestamp: 1536763736367000,
           offset: 0,
-          skew: 0,
-          docType: 'span',
-          span: {
-            transaction: {
-              id: 'a'
-            }
-          } as Span
+          skew: 0
         },
         {
+          docType: 'transaction',
+          doc: {
+            parent: { id: 'b' },
+            service: { name: 'opbeans-java' },
+            timestamp: { us: 1536763736369000 },
+            transaction: { id: 'c', name: 'APIRestController#productsRemote' }
+          } as Transaction,
           id: 'c',
           parentId: 'b',
-          serviceName: 'opbeans-java',
-          name: 'APIRestController#productsRemote',
           duration: 3581,
-          timestamp: 1536763736369000,
           offset: 0,
-          skew: 0,
-          docType: 'transaction',
-          transaction: {} as Transaction,
-          errorCount: 0
+          skew: 0
         },
         {
+          docType: 'transaction',
+          doc: {
+            service: { name: 'opbeans-java' },
+            timestamp: { us: 1536763736366000 },
+            transaction: {
+              id: 'a',
+              name: 'APIRestController#products'
+            }
+          } as Transaction,
           id: 'a',
-          serviceName: 'opbeans-java',
-          name: 'APIRestController#products',
           duration: 9480,
-          timestamp: 1536763736366000,
           offset: 0,
-          skew: 0,
-          docType: 'transaction',
-          transaction: {} as Transaction,
-          errorCount: 0
+          skew: 0
         }
       ];
 
       const childrenByParentId = groupBy(items, hit =>
         hit.parentId ? hit.parentId : 'root'
       );
-      const entryTransactionItem = childrenByParentId.root[0];
+      const entryTransactionItem = childrenByParentId
+        .root[0] as IWaterfallTransaction;
+
       expect(
         getOrderedWaterfallItems(childrenByParentId, entryTransactionItem)
       ).toMatchSnapshot();
@@ -237,13 +270,32 @@ describe('waterfall_helpers', () => {
 
     it('should handle cyclic references', () => {
       const items = [
-        { id: 'a', timestamp: 10 } as IWaterfallItem,
-        { id: 'a', parentId: 'a', timestamp: 20 } as IWaterfallItem
+        {
+          docType: 'transaction',
+          id: 'a',
+          doc: ({
+            transaction: { id: 'a' },
+            timestamp: { us: 10 }
+          } as unknown) as Transaction
+        } as IWaterfallItem,
+        {
+          docType: 'span',
+          id: 'b',
+          parentId: 'a',
+          doc: ({
+            span: {
+              id: 'b'
+            },
+            parent: { id: 'a' },
+            timestamp: { us: 20 }
+          } as unknown) as Span
+        } as IWaterfallItem
       ];
       const childrenByParentId = groupBy(items, hit =>
         hit.parentId ? hit.parentId : 'root'
       );
-      const entryTransactionItem = childrenByParentId.root[0];
+      const entryTransactionItem = childrenByParentId
+        .root[0] as IWaterfallTransaction;
       expect(
         getOrderedWaterfallItems(childrenByParentId, entryTransactionItem)
       ).toMatchSnapshot();
@@ -254,12 +306,17 @@ describe('waterfall_helpers', () => {
     it('should adjust when child starts before parent', () => {
       const child = {
         docType: 'transaction',
-        timestamp: 0,
+        doc: {
+          timestamp: { us: 0 }
+        },
         duration: 50
       } as IWaterfallItem;
 
       const parent = {
-        timestamp: 100,
+        docType: 'transaction',
+        doc: {
+          timestamp: { us: 100 }
+        },
         duration: 100,
         skew: 5
       } as IWaterfallItem;
@@ -270,12 +327,17 @@ describe('waterfall_helpers', () => {
     it('should not adjust when child starts after parent has ended', () => {
       const child = {
         docType: 'transaction',
-        timestamp: 250,
+        doc: {
+          timestamp: { us: 250 }
+        },
         duration: 50
       } as IWaterfallItem;
 
       const parent = {
-        timestamp: 100,
+        docType: 'transaction',
+        doc: {
+          timestamp: { us: 100 }
+        },
         duration: 100,
         skew: 5
       } as IWaterfallItem;
@@ -286,12 +348,17 @@ describe('waterfall_helpers', () => {
     it('should not adjust when child starts within parent duration', () => {
       const child = {
         docType: 'transaction',
-        timestamp: 150,
+        doc: {
+          timestamp: { us: 150 }
+        },
         duration: 50
       } as IWaterfallItem;
 
       const parent = {
-        timestamp: 100,
+        docType: 'transaction',
+        doc: {
+          timestamp: { us: 100 }
+        },
         duration: 100,
         skew: 5
       } as IWaterfallItem;
@@ -305,7 +372,27 @@ describe('waterfall_helpers', () => {
       } as IWaterfallItem;
 
       const parent = {
-        timestamp: 100,
+        docType: 'span',
+        doc: {
+          timestamp: { us: 100 }
+        },
+        duration: 100,
+        skew: 5
+      } as IWaterfallItem;
+
+      expect(getClockSkew(child, parent)).toBe(5);
+    });
+
+    it('should return parent skew for errors', () => {
+      const child = {
+        docType: 'error'
+      } as IWaterfallItem;
+
+      const parent = {
+        docType: 'transaction',
+        doc: {
+          timestamp: { us: 100 }
+        },
         duration: 100,
         skew: 5
       } as IWaterfallItem;
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
index 2a69c5f51173d5..1af6cddb3ba4a7 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
@@ -6,60 +6,52 @@
 
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import {
+  first,
   flatten,
   groupBy,
-  indexBy,
+  isEmpty,
   sortBy,
+  sum,
   uniq,
-  zipObject,
-  isEmpty,
-  first
+  zipObject
 } from 'lodash';
 import { TraceAPIResponse } from '../../../../../../../../server/lib/traces/get_trace';
+import { APMError } from '../../../../../../../../typings/es_schemas/ui/APMError';
 import { Span } from '../../../../../../../../typings/es_schemas/ui/Span';
 import { Transaction } from '../../../../../../../../typings/es_schemas/ui/Transaction';
 
-interface IWaterfallIndex {
-  [key: string]: IWaterfallItem | undefined;
-}
-
 interface IWaterfallGroup {
   [key: string]: IWaterfallItem[];
 }
 
 export interface IWaterfall {
   entryTransaction?: Transaction;
-  traceRoot?: Transaction;
-  traceRootDuration?: number;
+  rootTransaction?: Transaction;
 
   /**
    * Duration in us
    */
   duration: number;
-  services: string[];
-  orderedItems: IWaterfallItem[];
-  itemsById: IWaterfallIndex;
-  getTransactionById: (id?: IWaterfallItem['id']) => Transaction | undefined;
-  errorCountByTransactionId: TraceAPIResponse['errorsPerTransaction'];
+  items: IWaterfallItem[];
+  errorsPerTransaction: TraceAPIResponse['errorsPerTransaction'];
+  errorsCount: number;
   serviceColors: IServiceColors;
 }
 
-interface IWaterfallItemBase {
-  id: string | number;
+interface IWaterfallItemBase<T, U> {
+  docType: U;
+  doc: T;
+
+  id: string;
+
+  parent?: IWaterfallItem;
   parentId?: string;
-  serviceName: string;
-  name: string;
 
   /**
    * Duration in us
    */
   duration: number;
 
-  /**
-   * start timestamp in us
-   */
-  timestamp: number;
-
   /**
    * offset from first item in us
    */
@@ -69,53 +61,53 @@ interface IWaterfallItemBase {
    * skew from timestamp in us
    */
   skew: number;
-  childIds?: Array<IWaterfallItemBase['id']>;
-}
-
-interface IWaterfallItemTransaction extends IWaterfallItemBase {
-  transaction: Transaction;
-  docType: 'transaction';
-  errorCount: number;
 }
 
-interface IWaterfallItemSpan extends IWaterfallItemBase {
-  span: Span;
-  docType: 'span';
-}
+export type IWaterfallTransaction = IWaterfallItemBase<
+  Transaction,
+  'transaction'
+>;
+export type IWaterfallSpan = IWaterfallItemBase<Span, 'span'>;
+export type IWaterfallError = IWaterfallItemBase<APMError, 'error'>;
 
-export type IWaterfallItem = IWaterfallItemSpan | IWaterfallItemTransaction;
+export type IWaterfallItem =
+  | IWaterfallTransaction
+  | IWaterfallSpan
+  | IWaterfallError;
 
-function getTransactionItem(
-  transaction: Transaction,
-  errorsPerTransaction: TraceAPIResponse['errorsPerTransaction']
-): IWaterfallItemTransaction {
+function getTransactionItem(transaction: Transaction): IWaterfallTransaction {
   return {
+    docType: 'transaction',
+    doc: transaction,
     id: transaction.transaction.id,
-    parentId: transaction.parent && transaction.parent.id,
-    serviceName: transaction.service.name,
-    name: transaction.transaction.name,
+    parentId: transaction.parent?.id,
     duration: transaction.transaction.duration.us,
-    timestamp: transaction.timestamp.us,
     offset: 0,
-    skew: 0,
-    docType: 'transaction',
-    transaction,
-    errorCount: errorsPerTransaction[transaction.transaction.id] || 0
+    skew: 0
   };
 }
 
-function getSpanItem(span: Span): IWaterfallItemSpan {
+function getSpanItem(span: Span): IWaterfallSpan {
   return {
+    docType: 'span',
+    doc: span,
     id: span.span.id,
-    parentId: span.parent && span.parent.id,
-    serviceName: span.service.name,
-    name: span.span.name,
+    parentId: span.parent?.id,
     duration: span.span.duration.us,
-    timestamp: span.timestamp.us,
+    offset: 0,
+    skew: 0
+  };
+}
+
+function getErrorItem(error: APMError): IWaterfallError {
+  return {
+    docType: 'error',
+    doc: error,
+    id: error.error.id,
+    parentId: error.parent?.id,
     offset: 0,
     skew: 0,
-    docType: 'span',
-    span
+    duration: 0
   };
 }
 
@@ -126,18 +118,17 @@ export function getClockSkew(
   if (!parentItem) {
     return 0;
   }
-
   switch (item.docType) {
-    // don't calculate skew for spans. Just use parent's skew
+    // don't calculate skew for spans and errors. Just use parent's skew
+    case 'error':
     case 'span':
       return parentItem.skew;
-
     // transaction is the inital entry in a service. Calculate skew for this, and it will be propogated to all child spans
     case 'transaction': {
-      const parentStart = parentItem.timestamp + parentItem.skew;
+      const parentStart = parentItem.doc.timestamp.us + parentItem.skew;
 
       // determine if child starts before the parent
-      const offsetStart = parentStart - item.timestamp;
+      const offsetStart = parentStart - item.doc.timestamp.us;
       if (offsetStart > 0) {
         const latency = Math.max(parentItem.duration - item.duration, 0) / 2;
         return offsetStart + latency;
@@ -151,9 +142,14 @@ export function getClockSkew(
 
 export function getOrderedWaterfallItems(
   childrenByParentId: IWaterfallGroup,
-  entryTransactionItem: IWaterfallItem
+  entryWaterfallTransaction?: IWaterfallTransaction
 ) {
+  if (!entryWaterfallTransaction) {
+    return [];
+  }
+  const entryTimestamp = entryWaterfallTransaction.doc.timestamp.us;
   const visitedWaterfallItemSet = new Set();
+
   function getSortedChildren(
     item: IWaterfallItem,
     parentItem?: IWaterfallItem
@@ -162,10 +158,16 @@ export function getOrderedWaterfallItems(
       return [];
     }
     visitedWaterfallItemSet.add(item);
-    const children = sortBy(childrenByParentId[item.id] || [], 'timestamp');
 
-    item.childIds = children.map(child => child.id);
-    item.offset = item.timestamp - entryTransactionItem.timestamp;
+    const children = sortBy(
+      childrenByParentId[item.id] || [],
+      'doc.timestamp.us'
+    );
+
+    item.parent = parentItem;
+    // get offset from the beginning of trace
+    item.offset = item.doc.timestamp.us - entryTimestamp;
+    // move the item to the right if it starts before its parent
     item.skew = getClockSkew(item, parentItem);
 
     const deepChildren = flatten(
@@ -174,24 +176,21 @@ export function getOrderedWaterfallItems(
     return [item, ...deepChildren];
   }
 
-  return getSortedChildren(entryTransactionItem);
+  return getSortedChildren(entryWaterfallTransaction);
 }
 
-function getTraceRoot(childrenByParentId: IWaterfallGroup) {
+function getRootTransaction(childrenByParentId: IWaterfallGroup) {
   const item = first(childrenByParentId.root);
   if (item && item.docType === 'transaction') {
-    return item.transaction;
+    return item.doc;
   }
 }
 
-function getServices(items: IWaterfallItem[]) {
-  const serviceNames = items.map(item => item.serviceName);
-  return uniq(serviceNames);
-}
-
 export type IServiceColors = Record<string, string>;
 
-function getServiceColors(services: string[]) {
+function getServiceColors(waterfallItems: IWaterfallItem[]) {
+  const services = uniq(waterfallItems.map(item => item.doc.service.name));
+
   const assignedColors = [
     theme.euiColorVis1,
     theme.euiColorVis0,
@@ -205,30 +204,35 @@ function getServiceColors(services: string[]) {
   return zipObject(services, assignedColors) as IServiceColors;
 }
 
-function getDuration(items: IWaterfallItem[]) {
-  if (items.length === 0) {
-    return 0;
-  }
-  const timestampStart = items[0].timestamp;
-  const timestampEnd = Math.max(
-    ...items.map(item => item.timestamp + item.duration + item.skew)
+const getWaterfallDuration = (waterfallItems: IWaterfallItem[]) =>
+  Math.max(
+    ...waterfallItems.map(item => item.offset + item.skew + item.duration),
+    0
   );
-  return timestampEnd - timestampStart;
-}
 
-function createGetTransactionById(itemsById: IWaterfallIndex) {
-  return (id?: IWaterfallItem['id']) => {
-    if (!id) {
-      return undefined;
+const getWaterfallItems = (items: TraceAPIResponse['trace']['items']) =>
+  items.map(item => {
+    const docType = item.processor.event;
+    switch (docType) {
+      case 'span':
+        return getSpanItem(item as Span);
+      case 'transaction':
+        return getTransactionItem(item as Transaction);
+      case 'error':
+        return getErrorItem(item as APMError);
     }
+  });
 
-    const item = itemsById[id];
-    const isTransaction = item?.docType === 'transaction';
-    if (isTransaction) {
-      return (item as IWaterfallItemTransaction).transaction;
-    }
-  };
-}
+const getChildrenGroupedByParentId = (waterfallItems: IWaterfallItem[]) =>
+  groupBy(waterfallItems, item => (item.parentId ? item.parentId : 'root'));
+
+const getEntryWaterfallTransaction = (
+  entryTransactionId: string,
+  waterfallItems: IWaterfallItem[]
+): IWaterfallTransaction | undefined =>
+  waterfallItems.find(
+    item => item.docType === 'transaction' && item.id === entryTransactionId
+  ) as IWaterfallTransaction;
 
 export function getWaterfall(
   { trace, errorsPerTransaction }: TraceAPIResponse,
@@ -236,59 +240,41 @@ export function getWaterfall(
 ): IWaterfall {
   if (isEmpty(trace.items) || !entryTransactionId) {
     return {
-      services: [],
       duration: 0,
-      orderedItems: [],
-      itemsById: {},
-      getTransactionById: () => undefined,
-      errorCountByTransactionId: errorsPerTransaction,
+      items: [],
+      errorsPerTransaction,
+      errorsCount: sum(Object.values(errorsPerTransaction)),
       serviceColors: {}
     };
   }
 
-  const waterfallItems = trace.items.map(traceItem => {
-    const docType = traceItem.processor.event;
-    switch (docType) {
-      case 'span':
-        return getSpanItem(traceItem as Span);
-      case 'transaction':
-        return getTransactionItem(
-          traceItem as Transaction,
-          errorsPerTransaction
-        );
-    }
-  });
+  const waterfallItems: IWaterfallItem[] = getWaterfallItems(trace.items);
+
+  const childrenByParentId = getChildrenGroupedByParentId(waterfallItems);
 
-  const childrenByParentId = groupBy(waterfallItems, item =>
-    item.parentId ? item.parentId : 'root'
+  const entryWaterfallTransaction = getEntryWaterfallTransaction(
+    entryTransactionId,
+    waterfallItems
   );
-  const entryTransactionItem = waterfallItems.find(
-    waterfallItem =>
-      waterfallItem.docType === 'transaction' &&
-      waterfallItem.id === entryTransactionId
+
+  const items = getOrderedWaterfallItems(
+    childrenByParentId,
+    entryWaterfallTransaction
   );
-  const itemsById: IWaterfallIndex = indexBy(waterfallItems, 'id');
-  const orderedItems = entryTransactionItem
-    ? getOrderedWaterfallItems(childrenByParentId, entryTransactionItem)
-    : [];
-  const traceRoot = getTraceRoot(childrenByParentId);
-  const duration = getDuration(orderedItems);
-  const traceRootDuration = traceRoot && traceRoot.transaction.duration.us;
-  const services = getServices(orderedItems);
-  const getTransactionById = createGetTransactionById(itemsById);
-  const serviceColors = getServiceColors(services);
-  const entryTransaction = getTransactionById(entryTransactionId);
+
+  const rootTransaction = getRootTransaction(childrenByParentId);
+  const duration = getWaterfallDuration(items);
+  const serviceColors = getServiceColors(items);
+
+  const entryTransaction = entryWaterfallTransaction?.doc;
 
   return {
     entryTransaction,
-    traceRoot,
-    traceRootDuration,
+    rootTransaction,
     duration,
-    services,
-    orderedItems,
-    itemsById,
-    getTransactionById,
-    errorCountByTransactionId: errorsPerTransaction,
+    items,
+    errorsPerTransaction,
+    errorsCount: items.filter(item => item.docType === 'error').length,
     serviceColors
   };
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.ts
deleted file mode 100644
index af76451db68b7b..00000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.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.
- */
-
-import { sortBy } from 'lodash';
-import { Transaction } from '../../../../../../typings/es_schemas/ui/Transaction';
-
-export interface AgentMark {
-  name: string;
-  us: number;
-}
-
-export function getAgentMarks(transaction: Transaction): AgentMark[] {
-  if (!(transaction.transaction.marks && transaction.transaction.marks.agent)) {
-    return [];
-  }
-
-  return sortBy(
-    Object.entries(transaction.transaction.marks.agent).map(([name, ms]) => ({
-      name,
-      us: ms * 1000
-    })),
-    'us'
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
index 2f34cc86c5cfc2..77be5c999f7c36 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
@@ -6,16 +6,13 @@
 
 import { Location } from 'history';
 import React from 'react';
-import { Transaction } from '../../../../../../typings/es_schemas/ui/Transaction';
 import { IUrlParams } from '../../../../../context/UrlParamsContext/types';
-import { getAgentMarks } from './get_agent_marks';
 import { ServiceLegends } from './ServiceLegends';
 import { Waterfall } from './Waterfall';
 import { IWaterfall } from './Waterfall/waterfall_helpers/waterfall_helpers';
 
 interface Props {
   urlParams: IUrlParams;
-  transaction: Transaction;
   location: Location;
   waterfall: IWaterfall;
   exceedsMax: boolean;
@@ -24,11 +21,9 @@ interface Props {
 export function WaterfallContainer({
   location,
   urlParams,
-  transaction,
   waterfall,
   exceedsMax
 }: Props) {
-  const agentMarks = getAgentMarks(transaction);
   if (!waterfall) {
     return null;
   }
@@ -37,10 +32,8 @@ export function WaterfallContainer({
     <div>
       <ServiceLegends serviceColors={waterfall.serviceColors} />
       <Waterfall
-        agentMarks={agentMarks}
         location={location}
-        serviceColors={waterfall.serviceColors}
-        urlParams={urlParams}
+        waterfallItemId={urlParams.waterfallItemId}
         waterfall={waterfall}
         exceedsMax={exceedsMax}
       />
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/__tests__/ErrorCount.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/__tests__/ErrorCount.test.tsx
new file mode 100644
index 00000000000000..62b5f7834d3a9d
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/__tests__/ErrorCount.test.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { fireEvent, render } from '@testing-library/react';
+import React from 'react';
+import { expectTextsInDocument } from '../../../../../utils/testHelpers';
+import { ErrorCount } from '../ErrorCount';
+
+describe('ErrorCount', () => {
+  it('shows singular error message', () => {
+    const component = render(<ErrorCount count={1} />);
+    expectTextsInDocument(component, ['1 Error']);
+  });
+  it('shows plural error message', () => {
+    const component = render(<ErrorCount count={2} />);
+    expectTextsInDocument(component, ['2 Errors']);
+  });
+  it('prevents click propagation', () => {
+    const mock = jest.fn();
+    const { getByText } = render(
+      <button onClick={mock}>
+        <ErrorCount count={1} />
+      </button>
+    );
+    fireEvent(
+      getByText('1 Error'),
+      new MouseEvent('click', {
+        bubbles: true,
+        cancelable: true
+      })
+    );
+    expect(mock).not.toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
index b56370a59c8e22..6dcab6c6b97c16 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
@@ -5,30 +5,29 @@
  */
 
 import {
+  EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiPagination,
   EuiPanel,
   EuiSpacer,
-  EuiEmptyPrompt,
-  EuiTitle,
-  EuiPagination
+  EuiTitle
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import React, { useState, useEffect } from 'react';
-import { sum } from 'lodash';
+import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
-import { IUrlParams } from '../../../../context/UrlParamsContext/types';
-import { TransactionActionMenu } from '../../../shared/TransactionActionMenu/TransactionActionMenu';
-import { TransactionTabs } from './TransactionTabs';
-import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';
-import { LoadingStatePrompt } from '../../../shared/LoadingStatePrompt';
-import { TransactionSummary } from '../../../shared/Summary/TransactionSummary';
 import { IBucket } from '../../../../../server/lib/transactions/distribution/get_buckets/transform';
+import { IUrlParams } from '../../../../context/UrlParamsContext/types';
+import { px, units } from '../../../../style/variables';
 import { history } from '../../../../utils/history';
 import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
+import { LoadingStatePrompt } from '../../../shared/LoadingStatePrompt';
+import { TransactionSummary } from '../../../shared/Summary/TransactionSummary';
+import { TransactionActionMenu } from '../../../shared/TransactionActionMenu/TransactionActionMenu';
 import { MaybeViewTraceLink } from './MaybeViewTraceLink';
-import { units, px } from '../../../../style/variables';
+import { TransactionTabs } from './TransactionTabs';
+import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';
 
 const PaginationContainer = styled.div`
   margin-left: ${px(units.quarter)};
@@ -140,8 +139,8 @@ export const WaterfallWithSummmary: React.FC<Props> = ({
       <EuiSpacer size="s" />
 
       <TransactionSummary
-        errorCount={sum(Object.values(waterfall.errorCountByTransactionId))}
-        totalDuration={waterfall.traceRootDuration}
+        errorCount={waterfall.errorsCount}
+        totalDuration={waterfall.rootTransaction?.transaction.duration.us}
         transaction={entryTransaction}
       />
       <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
index 0312e94d7ee192..eba59f6e3ce44f 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
@@ -18,7 +18,7 @@ interface Props extends EuiLinkAnchorProps {
   children?: React.ReactNode;
 }
 
-export type APMLinkExtendProps = Omit<Props, 'path' | 'query'>;
+export type APMLinkExtendProps = Omit<Props, 'path'>;
 
 export const PERSISTENT_APM_PARAMS = [
   'kuery',
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
index 4b6355034f16ae..99d8a0790a816e 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
@@ -31,11 +31,15 @@ describe('SpanMetadata', () => {
           name: 'opbeans-java'
         },
         span: {
-          id: '7efbc7056b746fcb'
+          id: '7efbc7056b746fcb',
+          message: {
+            age: { ms: 1577958057123 },
+            queue: { name: 'queue name' }
+          }
         }
       } as unknown) as Span;
       const output = render(<SpanMetadata span={span} />, renderOptions);
-      expectTextsInDocument(output, ['Service', 'Agent']);
+      expectTextsInDocument(output, ['Service', 'Agent', 'Message']);
     });
   });
   describe('when a span is presented', () => {
@@ -55,11 +59,15 @@ describe('SpanMetadata', () => {
             response: { status_code: 200 }
           },
           subtype: 'http',
-          type: 'external'
+          type: 'external',
+          message: {
+            age: { ms: 1577958057123 },
+            queue: { name: 'queue name' }
+          }
         }
       } as unknown) as Span;
       const output = render(<SpanMetadata span={span} />, renderOptions);
-      expectTextsInDocument(output, ['Service', 'Agent', 'Span']);
+      expectTextsInDocument(output, ['Service', 'Agent', 'Span', 'Message']);
     });
   });
   describe('when there is no id inside span', () => {
@@ -83,7 +91,7 @@ describe('SpanMetadata', () => {
       } as unknown) as Span;
       const output = render(<SpanMetadata span={span} />, renderOptions);
       expectTextsInDocument(output, ['Service', 'Agent']);
-      expectTextsNotInDocument(output, ['Span']);
+      expectTextsNotInDocument(output, ['Span', 'Message']);
     });
   });
 });
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts
index 7012bbcc8fceaf..5a83a9bf4ef9e1 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts
@@ -11,7 +11,8 @@ import {
   SPAN,
   LABELS,
   TRANSACTION,
-  TRACE
+  TRACE,
+  MESSAGE_SPAN
 } from '../sections';
 
 export const SPAN_METADATA_SECTIONS: Section[] = [
@@ -20,5 +21,6 @@ export const SPAN_METADATA_SECTIONS: Section[] = [
   TRANSACTION,
   TRACE,
   SERVICE,
+  MESSAGE_SPAN,
   AGENT
 ];
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
index 1fcb093fa03544..93e87e884ea766 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
@@ -35,6 +35,10 @@ function getTransaction() {
       notIncluded: 'transaction not included value',
       custom: {
         someKey: 'custom value'
+      },
+      message: {
+        age: { ms: 1577958057123 },
+        queue: { name: 'queue name' }
       }
     }
   } as unknown) as Transaction;
@@ -59,7 +63,8 @@ describe('TransactionMetadata', () => {
       'Agent',
       'URL',
       'User',
-      'Custom'
+      'Custom',
+      'Message'
     ]);
   });
 
@@ -81,7 +86,9 @@ describe('TransactionMetadata', () => {
       'agent.someKey',
       'url.someKey',
       'user.someKey',
-      'transaction.custom.someKey'
+      'transaction.custom.someKey',
+      'transaction.message.age.ms',
+      'transaction.message.queue.name'
     ]);
 
     // excluded keys
@@ -109,7 +116,9 @@ describe('TransactionMetadata', () => {
       'agent value',
       'url value',
       'user value',
-      'custom value'
+      'custom value',
+      '1577958057123',
+      'queue name'
     ]);
 
     // excluded values
@@ -138,7 +147,8 @@ describe('TransactionMetadata', () => {
       'Process',
       'Agent',
       'URL',
-      'Custom'
+      'Custom',
+      'Message'
     ]);
   });
 });
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts
index 6b30c82bc35a06..18751efc6e1c1f 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts
@@ -18,7 +18,8 @@ import {
   PAGE,
   USER,
   USER_AGENT,
-  CUSTOM_TRANSACTION
+  CUSTOM_TRANSACTION,
+  MESSAGE_TRANSACTION
 } from '../sections';
 
 export const TRANSACTION_METADATA_SECTIONS: Section[] = [
@@ -29,6 +30,7 @@ export const TRANSACTION_METADATA_SECTIONS: Section[] = [
   CONTAINER,
   SERVICE,
   PROCESS,
+  MESSAGE_TRANSACTION,
   AGENT,
   URL,
   { ...PAGE, key: 'transaction.page' },
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/sections.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/sections.ts
index 403663ce2095a1..ac8e9559357e3c 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/sections.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/sections.ts
@@ -136,3 +136,20 @@ export const CUSTOM_TRANSACTION: Section = {
   key: 'transaction.custom',
   label: customLabel
 };
+
+const messageLabel = i18n.translate(
+  'xpack.apm.metadataTable.section.messageLabel',
+  {
+    defaultMessage: 'Message'
+  }
+);
+
+export const MESSAGE_TRANSACTION: Section = {
+  key: 'transaction.message',
+  label: messageLabel
+};
+
+export const MESSAGE_SPAN: Section = {
+  key: 'span.message',
+  label: messageLabel
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItem.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItemBadge.tsx
similarity index 51%
rename from x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItem.tsx
rename to x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItemBadge.tsx
index 964debbedb2e42..7558f002c0afc4 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItem.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItemBadge.tsx
@@ -6,28 +6,25 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
+import { EuiBadge } from '@elastic/eui';
+import euiThemeLight from '@elastic/eui/dist/eui_theme_light.json';
 import { px } from '../../../../public/style/variables';
-import { ErrorCountBadge } from '../../app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge';
 import { units } from '../../../style/variables';
 
 interface Props {
   count: number;
 }
 
-const Badge = styled(ErrorCountBadge)`
+const Badge = styled(EuiBadge)`
   margin-top: ${px(units.eighth)};
 `;
 
-const ErrorCountSummaryItem = ({ count }: Props) => {
-  return (
-    <Badge>
-      {i18n.translate('xpack.apm.transactionDetails.errorCount', {
-        defaultMessage:
-          '{errorCount, number} {errorCount, plural, one {Error} other {Errors}}',
-        values: { errorCount: count }
-      })}
-    </Badge>
-  );
-};
-
-export { ErrorCountSummaryItem };
+export const ErrorCountSummaryItemBadge = ({ count }: Props) => (
+  <Badge color={euiThemeLight.euiColorDanger}>
+    {i18n.translate('xpack.apm.transactionDetails.errorCount', {
+      defaultMessage:
+        '{errorCount, number} {errorCount, plural, one {Error} other {Errors}}',
+      values: { errorCount: count }
+    })}
+  </Badge>
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx
index 8b7380a18edc39..51da61cd7c1a6e 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx
@@ -8,7 +8,7 @@ import { Transaction } from '../../../../typings/es_schemas/ui/Transaction';
 import { Summary } from './';
 import { TimestampTooltip } from '../TimestampTooltip';
 import { DurationSummaryItem } from './DurationSummaryItem';
-import { ErrorCountSummaryItem } from './ErrorCountSummaryItem';
+import { ErrorCountSummaryItemBadge } from './ErrorCountSummaryItemBadge';
 import { isRumAgentName } from '../../../../common/agent_name';
 import { HttpInfoSummaryItem } from './HttpInfoSummaryItem';
 import { TransactionResultSummaryItem } from './TransactionResultSummaryItem';
@@ -54,7 +54,7 @@ const TransactionSummary = ({
       parentType="trace"
     />,
     getTransactionResultSummaryItem(transaction),
-    errorCount ? <ErrorCountSummaryItem count={errorCount} /> : null,
+    errorCount ? <ErrorCountSummaryItemBadge count={errorCount} /> : null,
     transaction.user_agent ? (
       <UserAgentSummaryItem {...transaction.user_agent} />
     ) : null
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/__test__/ErrorCountSummaryItemBadge.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/__test__/ErrorCountSummaryItemBadge.test.tsx
new file mode 100644
index 00000000000000..33f5752b6389b0
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/__test__/ErrorCountSummaryItemBadge.test.tsx
@@ -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 React from 'react';
+import { ErrorCountSummaryItemBadge } from '../ErrorCountSummaryItemBadge';
+import { render } from '@testing-library/react';
+import { expectTextsInDocument } from '../../../../utils/testHelpers';
+
+describe('ErrorCountSummaryItemBadge', () => {
+  it('shows singular error message', () => {
+    const component = render(<ErrorCountSummaryItemBadge count={1} />);
+    expectTextsInDocument(component, ['1 Error']);
+  });
+  it('shows plural error message', () => {
+    const component = render(<ErrorCountSummaryItemBadge count={2} />);
+    expectTextsInDocument(component, ['2 Errors']);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/Legends.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/Legends.js
index 848c975942ff64..99eb17386f847b 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/Legends.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/Legends.js
@@ -7,7 +7,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import styled from 'styled-components';
-import Legend from '../Legend';
+import { Legend } from '../Legend';
 import {
   unit,
   units,
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
index c46cbbbcccc0b8..557751a0f02268 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
@@ -2725,11 +2725,14 @@ Array [
           <styled.span
             color="#3185fc"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c2"
               color="#3185fc"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -2763,11 +2766,14 @@ Array [
           <styled.span
             color="#e6c220"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c5"
               color="#e6c220"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -2794,11 +2800,14 @@ Array [
           <styled.span
             color="#f98510"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c6"
               color="#f98510"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -5167,11 +5176,14 @@ Array [
                             <styled.span
                               color="#3185fc"
                               radius={8}
+                              shape="circle"
+                              withMargin={true}
                             >
                               <span
                                 className="c6"
                                 color="#3185fc"
                                 radius={8}
+                                shape="circle"
                               />
                             </styled.span>
                             Avg.
@@ -5210,11 +5222,14 @@ Array [
                             <styled.span
                               color="#e6c220"
                               radius={8}
+                              shape="circle"
+                              withMargin={true}
                             >
                               <span
                                 className="c8"
                                 color="#e6c220"
                                 radius={8}
+                                shape="circle"
                               />
                             </styled.span>
                             95th
@@ -5253,11 +5268,14 @@ Array [
                             <styled.span
                               color="#f98510"
                               radius={8}
+                              shape="circle"
+                              withMargin={true}
                             >
                               <span
                                 className="c9"
                                 color="#f98510"
                                 radius={8}
+                                shape="circle"
                               />
                             </styled.span>
                             99th
@@ -5886,11 +5904,14 @@ Array [
           <styled.span
             color="#3185fc"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c2"
               color="#3185fc"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -5924,11 +5945,14 @@ Array [
           <styled.span
             color="#e6c220"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c5"
               color="#e6c220"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -5955,11 +5979,14 @@ Array [
           <styled.span
             color="#f98510"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c6"
               color="#f98510"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.js
deleted file mode 100644
index 601482430b00f5..00000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.js
+++ /dev/null
@@ -1,56 +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, { PureComponent } from 'react';
-import styled from 'styled-components';
-import { units, px, fontSizes } from '../../../../style/variables';
-import theme from '@elastic/eui/dist/eui_theme_light.json';
-
-const Container = styled.div`
-  display: flex;
-  align-items: center;
-  font-size: ${props => props.fontSize};
-  color: ${theme.euiColorDarkShade};
-  cursor: ${props => (props.clickable ? 'pointer' : 'initial')};
-  opacity: ${props => (props.disabled ? 0.4 : 1)};
-  user-select: none;
-`;
-
-export const Indicator = styled.span`
-  width: ${props => px(props.radius)};
-  height: ${props => px(props.radius)};
-  margin-right: ${props => px(props.radius / 2)};
-  background: ${props => props.color};
-  border-radius: 100%;
-`;
-
-export default class Legend extends PureComponent {
-  render() {
-    const {
-      onClick,
-      text,
-      color = theme.euiColorVis1,
-      fontSize = fontSizes.small,
-      radius = units.minus - 1,
-      disabled = false,
-      clickable = false,
-      indicator,
-      ...rest
-    } = this.props;
-    return (
-      <Container
-        onClick={onClick}
-        disabled={disabled}
-        clickable={clickable || Boolean(onClick)}
-        fontSize={fontSize}
-        {...rest}
-      >
-        {indicator ? indicator() : <Indicator color={color} radius={radius} />}
-        {text}
-      </Container>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.tsx
new file mode 100644
index 00000000000000..436b020bc9eba7
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import React from 'react';
+import styled from 'styled-components';
+import { fontSizes, px, units } from '../../../../style/variables';
+
+export enum Shape {
+  circle = 'circle',
+  square = 'square'
+}
+
+interface ContainerProps {
+  onClick: (e: Event) => void;
+  fontSize?: string;
+  clickable: boolean;
+  disabled: boolean;
+}
+const Container = styled.div<ContainerProps>`
+  display: flex;
+  align-items: center;
+  font-size: ${props => props.fontSize};
+  color: ${theme.euiColorDarkShade};
+  cursor: ${props => (props.clickable ? 'pointer' : 'initial')};
+  opacity: ${props => (props.disabled ? 0.4 : 1)};
+  user-select: none;
+`;
+
+interface IndicatorProps {
+  radius: number;
+  color: string;
+  shape: Shape;
+  withMargin: boolean;
+}
+export const Indicator = styled.span<IndicatorProps>`
+  width: ${props => px(props.radius)};
+  height: ${props => px(props.radius)};
+  margin-right: ${props => (props.withMargin ? px(props.radius / 2) : 0)};
+  background: ${props => props.color};
+  border-radius: ${props => {
+    return props.shape === Shape.circle ? '100%' : '0';
+  }};
+`;
+
+interface Props {
+  onClick?: any;
+  text?: string;
+  color?: string;
+  fontSize?: string;
+  radius?: number;
+  disabled?: boolean;
+  clickable?: boolean;
+  shape?: Shape;
+  indicator?: () => React.ReactNode;
+}
+
+export const Legend: React.FC<Props> = ({
+  onClick,
+  text,
+  color = theme.euiColorVis1,
+  fontSize = fontSizes.small,
+  radius = units.minus - 1,
+  disabled = false,
+  clickable = false,
+  shape = Shape.circle,
+  indicator,
+  ...rest
+}) => {
+  return (
+    <Container
+      onClick={onClick}
+      disabled={disabled}
+      clickable={clickable || Boolean(onClick)}
+      fontSize={fontSize}
+      {...rest}
+    >
+      {indicator ? (
+        indicator()
+      ) : (
+        <Indicator
+          color={color}
+          radius={radius}
+          shape={shape}
+          withMargin={!!text}
+        />
+      )}
+      {text}
+    </Container>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/AgentMarker.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx
similarity index 56%
rename from x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/AgentMarker.js
rename to x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx
index 8ee23d61fe0eb6..ffdbfe6cce7ec8 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/AgentMarker.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import PropTypes from 'prop-types';
 import { EuiToolTip } from '@elastic/eui';
-import Legend from '../Legend';
-import { units, px } from '../../../../style/variables';
-import styled from 'styled-components';
-import { asDuration } from '../../../../utils/formatters';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
+import React from 'react';
+import styled from 'styled-components';
+import { px, units } from '../../../../../style/variables';
+import { asDuration } from '../../../../../utils/formatters';
+import { Legend } from '../../Legend';
+import { AgentMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks';
 
 const NameContainer = styled.div`
   border-bottom: 1px solid ${theme.euiColorMediumShade};
@@ -23,33 +23,25 @@ const TimeContainer = styled.div`
   padding-top: ${px(units.half)};
 `;
 
-export default function AgentMarker({ agentMark, x }) {
-  const legendWidth = 11;
+interface Props {
+  mark: AgentMark;
+}
+
+export const AgentMarker: React.FC<Props> = ({ mark }) => {
   return (
-    <div
-      style={{
-        position: 'absolute',
-        left: px(x - legendWidth / 2),
-        bottom: 0
-      }}
-    >
+    <>
       <EuiToolTip
-        id={agentMark.name}
+        id={mark.id}
         position="top"
         content={
           <div>
-            <NameContainer>{agentMark.name}</NameContainer>
-            <TimeContainer>{asDuration(agentMark.us)}</TimeContainer>
+            <NameContainer>{mark.id}</NameContainer>
+            <TimeContainer>{asDuration(mark.offset)}</TimeContainer>
           </div>
         }
       >
         <Legend clickable color={theme.euiColorMediumShade} />
       </EuiToolTip>
-    </div>
+    </>
   );
-}
-
-AgentMarker.propTypes = {
-  agentMark: PropTypes.object.isRequired,
-  x: PropTypes.number.isRequired
 };
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx
new file mode 100644
index 00000000000000..51368a4fb946d5
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiPopover, EuiText } from '@elastic/eui';
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import {
+  TRACE_ID,
+  TRANSACTION_ID
+} from '../../../../../../common/elasticsearch_fieldnames';
+import { useUrlParams } from '../../../../../hooks/useUrlParams';
+import { px, unit, units } from '../../../../../style/variables';
+import { asDuration } from '../../../../../utils/formatters';
+import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+import { ErrorDetailLink } from '../../../Links/apm/ErrorDetailLink';
+import { Legend, Shape } from '../../Legend';
+
+interface Props {
+  mark: ErrorMark;
+}
+
+const Popover = styled.div`
+  max-width: ${px(280)};
+`;
+
+const TimeLegend = styled(Legend)`
+  margin-bottom: ${px(unit)};
+`;
+
+const ErrorLink = styled(ErrorDetailLink)`
+  display: block;
+  margin: ${px(units.half)} 0 ${px(units.half)} 0;
+`;
+
+const Button = styled(Legend)`
+  height: 20px;
+  display: flex;
+  align-items: flex-end;
+`;
+
+export const ErrorMarker: React.FC<Props> = ({ mark }) => {
+  const { urlParams } = useUrlParams();
+  const [isPopoverOpen, showPopover] = useState(false);
+
+  const togglePopover = () => showPopover(!isPopoverOpen);
+
+  const button = (
+    <Button
+      clickable
+      color={theme.euiColorDanger}
+      shape={Shape.square}
+      onClick={togglePopover}
+    />
+  );
+
+  const { error } = mark;
+
+  const { rangeTo, rangeFrom } = urlParams;
+  const query = {
+    kuery: encodeURIComponent(
+      `${TRACE_ID} : "${error.trace?.id}" and ${TRANSACTION_ID} : "${error.transaction?.id}"`
+    ),
+    rangeFrom,
+    rangeTo
+  };
+
+  return (
+    <EuiPopover
+      id="popover"
+      button={button}
+      isOpen={isPopoverOpen}
+      closePopover={togglePopover}
+      anchorPosition="upCenter"
+    >
+      <Popover>
+        <TimeLegend
+          text={asDuration(mark.offset)}
+          indicator={() => (
+            <div style={{ marginRight: px(units.quarter) }}>@</div>
+          )}
+        />
+        <Legend
+          key={mark.serviceColor}
+          color={mark.serviceColor}
+          text={error.service.name}
+        />
+        <EuiText size="s">
+          <ErrorLink
+            serviceName={error.service.name}
+            errorGroupId={error.error.grouping_key}
+            query={query}
+          >
+            {error.error.log?.message || error.error.exception?.[0]?.message}
+          </ErrorLink>
+        </EuiText>
+      </Popover>
+    </EuiPopover>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/AgentMarker.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/AgentMarker.test.tsx
new file mode 100644
index 00000000000000..718bbc5e384191
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/AgentMarker.test.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import { AgentMarker } from '../AgentMarker';
+import { AgentMark } from '../../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks';
+
+describe('AgentMarker', () => {
+  const mark = {
+    id: 'agent',
+    offset: 1000,
+    type: 'agentMark',
+    verticalLine: true
+  } as AgentMark;
+  it('renders', () => {
+    const component = shallow(<AgentMarker mark={mark} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/ErrorMarker.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/ErrorMarker.test.tsx
new file mode 100644
index 00000000000000..020ce63eff1fdd
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/ErrorMarker.test.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import { ErrorMarker } from '../ErrorMarker';
+import { ErrorMark } from '../../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+
+describe('ErrorMarker', () => {
+  const mark = {
+    id: 'agent',
+    offset: 10000,
+    type: 'errorMark',
+    verticalLine: true,
+    error: {
+      trace: { id: '123' },
+      transaction: { id: '456' },
+      error: { grouping_key: '123' },
+      service: { name: 'bar' }
+    },
+    serviceColor: '#fff'
+  } as ErrorMark;
+  it('renders', () => {
+    const component = shallow(<ErrorMarker mark={mark} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/Marker.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/Marker.test.tsx
new file mode 100644
index 00000000000000..34ff24fea0986b
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/Marker.test.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import { Marker } from '../';
+import { AgentMark } from '../../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks';
+import { ErrorMark } from '../../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+
+describe('Marker', () => {
+  it('renders agent marker', () => {
+    const mark = {
+      id: 'agent',
+      offset: 1000,
+      type: 'agentMark',
+      verticalLine: true
+    } as AgentMark;
+    const component = shallow(<Marker mark={mark} x={10} />);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders error marker', () => {
+    const mark = {
+      id: 'agent',
+      offset: 1000,
+      type: 'errorMark',
+      verticalLine: true,
+      error: {
+        trace: { id: '123' },
+        transaction: { id: '456' },
+        error: { grouping_key: '123' },
+        service: { name: 'bar' }
+      },
+      serviceColor: '#fff'
+    } as ErrorMark;
+    const component = shallow(<Marker mark={mark} x={10} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/AgentMarker.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/AgentMarker.test.tsx.snap
new file mode 100644
index 00000000000000..6ef402c7481b20
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/AgentMarker.test.tsx.snap
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AgentMarker renders 1`] = `
+<Fragment>
+  <EuiToolTip
+    content={
+      <div>
+        <ForwardRef(styled.div)>
+          agent
+        </ForwardRef(styled.div)>
+        <ForwardRef(styled.div)>
+          1,000 μs
+        </ForwardRef(styled.div)>
+      </div>
+    }
+    delay="regular"
+    id="agent"
+    position="top"
+  >
+    <Legend
+      clickable={true}
+      color="#98a2b3"
+    />
+  </EuiToolTip>
+</Fragment>
+`;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/ErrorMarker.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/ErrorMarker.test.tsx.snap
new file mode 100644
index 00000000000000..d3eedd2a9412ce
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/ErrorMarker.test.tsx.snap
@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ErrorMarker renders 1`] = `
+<EuiPopover
+  anchorPosition="upCenter"
+  button={
+    <ForwardRef(Styled(Legend))
+      clickable={true}
+      color="#bd271e"
+      onClick={[Function]}
+      shape="square"
+    />
+  }
+  closePopover={[Function]}
+  display="inlineBlock"
+  hasArrow={true}
+  id="popover"
+  isOpen={false}
+  ownFocus={false}
+  panelPaddingSize="m"
+>
+  <styled.div>
+    <Styled(Legend)
+      indicator={[Function]}
+      text="10,000 μs"
+    />
+    <Legend
+      color="#fff"
+      key="#fff"
+      text="bar"
+    />
+    <EuiText
+      size="s"
+    >
+      <Styled(ErrorDetailLink)
+        errorGroupId="123"
+        query={
+          Object {
+            "kuery": "trace.id%20%3A%20%22123%22%20and%20transaction.id%20%3A%20%22456%22",
+            "rangeFrom": undefined,
+            "rangeTo": undefined,
+          }
+        }
+        serviceName="bar"
+      />
+    </EuiText>
+  </styled.div>
+</EuiPopover>
+`;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/Marker.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/Marker.test.tsx.snap
new file mode 100644
index 00000000000000..f108eb7ebf3ea4
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/Marker.test.tsx.snap
@@ -0,0 +1,58 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Marker renders agent marker 1`] = `
+<styled.div
+  style={
+    Object {
+      "left": "4.5px",
+    }
+  }
+>
+  <AgentMarker
+    mark={
+      Object {
+        "id": "agent",
+        "offset": 1000,
+        "type": "agentMark",
+        "verticalLine": true,
+      }
+    }
+  />
+</styled.div>
+`;
+
+exports[`Marker renders error marker 1`] = `
+<styled.div
+  style={
+    Object {
+      "left": "4.5px",
+    }
+  }
+>
+  <ErrorMarker
+    mark={
+      Object {
+        "error": Object {
+          "error": Object {
+            "grouping_key": "123",
+          },
+          "service": Object {
+            "name": "bar",
+          },
+          "trace": Object {
+            "id": "123",
+          },
+          "transaction": Object {
+            "id": "456",
+          },
+        },
+        "id": "agent",
+        "offset": 1000,
+        "serviceColor": "#fff",
+        "type": "errorMark",
+        "verticalLine": true,
+      }
+    }
+  />
+</styled.div>
+`;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx
new file mode 100644
index 00000000000000..03124952c3f880
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import styled from 'styled-components';
+import { px } from '../../../../../style/variables';
+import { AgentMarker } from './AgentMarker';
+import { ErrorMarker } from './ErrorMarker';
+import { AgentMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks';
+import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+
+interface Props {
+  mark: ErrorMark | AgentMark;
+  x: number;
+}
+
+const MarkerContainer = styled.div`
+  position: absolute;
+  bottom: 0;
+`;
+
+export const Marker: React.FC<Props> = ({ mark, x }) => {
+  const legendWidth = 11;
+  return (
+    <MarkerContainer style={{ left: px(x - legendWidth / 2) }}>
+      {mark.type === 'errorMark' ? (
+        <ErrorMarker mark={mark} />
+      ) : (
+        <AgentMarker mark={mark} />
+      )}
+    </MarkerContainer>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js
index 346aec9fb080a2..40df82b4cf1e08 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js
@@ -10,7 +10,7 @@ import { inRange } from 'lodash';
 import { Sticky } from 'react-sticky';
 import { XYPlot, XAxis } from 'react-vis';
 import LastTickValue from './LastTickValue';
-import AgentMarker from './AgentMarker';
+import { Marker } from './Marker';
 import { px } from '../../../../style/variables';
 import { getDurationFormatter } from '../../../../utils/formatters';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
@@ -31,7 +31,7 @@ const getXAxisTickValues = (tickValues, topTraceDuration) => {
   });
 };
 
-function TimelineAxis({ plotValues, agentMarks, topTraceDuration }) {
+function TimelineAxis({ plotValues, marks, topTraceDuration }) {
   const { margins, tickValues, width, xDomain, xMax, xScale } = plotValues;
   const tickFormatter = getDurationFormatter(xMax);
   const xAxisTickValues = getXAxisTickValues(tickValues, topTraceDuration);
@@ -82,12 +82,8 @@ function TimelineAxis({ plotValues, agentMarks, topTraceDuration }) {
                 />
               )}
 
-              {agentMarks.map(agentMark => (
-                <AgentMarker
-                  key={agentMark.name}
-                  agentMark={agentMark}
-                  x={xScale(agentMark.us)}
-                />
+              {marks.map(mark => (
+                <Marker key={mark.id} mark={mark} x={xScale(mark.offset)} />
               ))}
             </XYPlot>
           </div>
@@ -100,11 +96,11 @@ function TimelineAxis({ plotValues, agentMarks, topTraceDuration }) {
 TimelineAxis.propTypes = {
   header: PropTypes.node,
   plotValues: PropTypes.object.isRequired,
-  agentMarks: PropTypes.array
+  marks: PropTypes.array
 };
 
 TimelineAxis.defaultProps = {
-  agentMarks: []
+  marks: []
 };
 
 export default TimelineAxis;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js
index cac5af3ee1dedb..baf3a26cb6cbf5 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js
@@ -11,7 +11,7 @@ import theme from '@elastic/eui/dist/eui_theme_light.json';
 
 class VerticalLines extends PureComponent {
   render() {
-    const { topTraceDuration } = this.props;
+    const { topTraceDuration, marks } = this.props;
     const {
       width,
       height,
@@ -20,7 +20,9 @@ class VerticalLines extends PureComponent {
       tickValues
     } = this.props.plotValues;
 
-    const agentMarkTimes = this.props.agentMarks.map(({ us }) => us);
+    const markTimes = marks
+      .filter(mark => mark.verticalLine)
+      .map(({ offset }) => offset);
 
     return (
       <div
@@ -43,7 +45,7 @@ class VerticalLines extends PureComponent {
           />
 
           <VerticalGridLines
-            tickValues={agentMarkTimes}
+            tickValues={markTimes}
             style={{ stroke: theme.euiColorMediumShade }}
           />
 
@@ -61,11 +63,11 @@ class VerticalLines extends PureComponent {
 
 VerticalLines.propTypes = {
   plotValues: PropTypes.object.isRequired,
-  agentMarks: PropTypes.array
+  marks: PropTypes.array
 };
 
 VerticalLines.defaultProps = {
-  agentMarks: []
+  marks: []
 };
 
 export default VerticalLines;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js
index e76401e36a5687..5428dd8317f641 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js
@@ -29,10 +29,25 @@ describe('Timeline', () => {
         bottom: 0
       },
       animation: null,
-      agentMarks: [
-        { name: 'timeToFirstByte', us: 100000 },
-        { name: 'domInteractive', us: 110000 },
-        { name: 'domComplete', us: 190000 }
+      marks: [
+        {
+          id: 'timeToFirstByte',
+          offset: 100000,
+          type: 'agentMark',
+          verticalLine: true
+        },
+        {
+          id: 'domInteractive',
+          offset: 110000,
+          type: 'agentMark',
+          verticalLine: true
+        },
+        {
+          id: 'domComplete',
+          offset: 190000,
+          type: 'agentMark',
+          verticalLine: true
+        }
       ]
     };
 
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 80baba28fcfdf1..0cc51dda4a9b50 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
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Timeline should render with data 1`] = `
-.c0 {
+.c1 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -20,14 +20,19 @@ exports[`Timeline should render with data 1`] = `
   user-select: none;
 }
 
-.c1 {
+.c2 {
   width: 11px;
   height: 11px;
-  margin-right: 5.5px;
+  margin-right: 0;
   background: #98a2b3;
   border-radius: 100%;
 }
 
+.c0 {
+  position: absolute;
+  bottom: 0;
+}
+
 <div
   onScroll={[Function]}
   onTouchEnd={[Function]}
@@ -526,132 +531,162 @@ exports[`Timeline should render with data 1`] = `
                 </text>
               </g>
             </svg>
-            <div
+            <styled.div
               style={
                 Object {
-                  "bottom": 0,
                   "left": "494.5px",
-                  "position": "absolute",
                 }
               }
             >
-              <span
-                className="euiToolTipAnchor"
-                onMouseOut={[Function]}
-                onMouseOver={[Function]}
+              <div
+                className="c0"
+                style={
+                  Object {
+                    "left": "494.5px",
+                  }
+                }
               >
-                <styled.div
-                  clickable={true}
-                  disabled={false}
-                  fontSize="12px"
-                  onBlur={[Function]}
-                  onFocus={[Function]}
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
                 >
-                  <div
-                    className="c0"
+                  <styled.div
+                    clickable={true}
                     disabled={false}
                     fontSize="12px"
                     onBlur={[Function]}
                     onFocus={[Function]}
                   >
-                    <styled.span
-                      color="#98a2b3"
-                      radius={11}
+                    <div
+                      className="c1"
+                      disabled={false}
+                      fontSize="12px"
+                      onBlur={[Function]}
+                      onFocus={[Function]}
                     >
-                      <span
-                        className="c1"
+                      <styled.span
                         color="#98a2b3"
                         radius={11}
-                      />
-                    </styled.span>
-                  </div>
-                </styled.div>
-              </span>
-            </div>
-            <div
+                        shape="circle"
+                        withMargin={false}
+                      >
+                        <span
+                          className="c2"
+                          color="#98a2b3"
+                          radius={11}
+                          shape="circle"
+                        />
+                      </styled.span>
+                    </div>
+                  </styled.div>
+                </span>
+              </div>
+            </styled.div>
+            <styled.div
               style={
                 Object {
-                  "bottom": 0,
                   "left": "539.5px",
-                  "position": "absolute",
                 }
               }
             >
-              <span
-                className="euiToolTipAnchor"
-                onMouseOut={[Function]}
-                onMouseOver={[Function]}
+              <div
+                className="c0"
+                style={
+                  Object {
+                    "left": "539.5px",
+                  }
+                }
               >
-                <styled.div
-                  clickable={true}
-                  disabled={false}
-                  fontSize="12px"
-                  onBlur={[Function]}
-                  onFocus={[Function]}
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
                 >
-                  <div
-                    className="c0"
+                  <styled.div
+                    clickable={true}
                     disabled={false}
                     fontSize="12px"
                     onBlur={[Function]}
                     onFocus={[Function]}
                   >
-                    <styled.span
-                      color="#98a2b3"
-                      radius={11}
+                    <div
+                      className="c1"
+                      disabled={false}
+                      fontSize="12px"
+                      onBlur={[Function]}
+                      onFocus={[Function]}
                     >
-                      <span
-                        className="c1"
+                      <styled.span
                         color="#98a2b3"
                         radius={11}
-                      />
-                    </styled.span>
-                  </div>
-                </styled.div>
-              </span>
-            </div>
-            <div
+                        shape="circle"
+                        withMargin={false}
+                      >
+                        <span
+                          className="c2"
+                          color="#98a2b3"
+                          radius={11}
+                          shape="circle"
+                        />
+                      </styled.span>
+                    </div>
+                  </styled.div>
+                </span>
+              </div>
+            </styled.div>
+            <styled.div
               style={
                 Object {
-                  "bottom": 0,
                   "left": "899.5px",
-                  "position": "absolute",
                 }
               }
             >
-              <span
-                className="euiToolTipAnchor"
-                onMouseOut={[Function]}
-                onMouseOver={[Function]}
+              <div
+                className="c0"
+                style={
+                  Object {
+                    "left": "899.5px",
+                  }
+                }
               >
-                <styled.div
-                  clickable={true}
-                  disabled={false}
-                  fontSize="12px"
-                  onBlur={[Function]}
-                  onFocus={[Function]}
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
                 >
-                  <div
-                    className="c0"
+                  <styled.div
+                    clickable={true}
                     disabled={false}
                     fontSize="12px"
                     onBlur={[Function]}
                     onFocus={[Function]}
                   >
-                    <styled.span
-                      color="#98a2b3"
-                      radius={11}
+                    <div
+                      className="c1"
+                      disabled={false}
+                      fontSize="12px"
+                      onBlur={[Function]}
+                      onFocus={[Function]}
                     >
-                      <span
-                        className="c1"
+                      <styled.span
                         color="#98a2b3"
                         radius={11}
-                      />
-                    </styled.span>
-                  </div>
-                </styled.div>
-              </span>
-            </div>
+                        shape="circle"
+                        withMargin={false}
+                      >
+                        <span
+                          className="c2"
+                          color="#98a2b3"
+                          radius={11}
+                          shape="circle"
+                        />
+                      </styled.span>
+                    </div>
+                  </styled.div>
+                </span>
+              </div>
+            </styled.div>
           </div>
         </div>
       </div>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/index.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/index.js
index 53b0b4eb57b3d3..327049a61a1ac6 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/index.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/index.js
@@ -14,7 +14,7 @@ import VerticalLines from './VerticalLines';
 
 class Timeline extends PureComponent {
   render() {
-    const { width, duration, agentMarks, height, margins } = this.props;
+    const { width, duration, marks, height, margins } = this.props;
     if (duration == null || !width) {
       return null;
     }
@@ -24,12 +24,12 @@ class Timeline extends PureComponent {
       <div>
         <TimelineAxis
           plotValues={plotValues}
-          agentMarks={agentMarks}
+          marks={marks}
           topTraceDuration={duration}
         />
         <VerticalLines
           plotValues={plotValues}
-          agentMarks={agentMarks}
+          marks={marks}
           topTraceDuration={duration}
         />
       </div>
@@ -38,7 +38,7 @@ class Timeline extends PureComponent {
 }
 
 Timeline.propTypes = {
-  agentMarks: PropTypes.array,
+  marks: PropTypes.array,
   duration: PropTypes.number,
   height: PropTypes.number.isRequired,
   header: PropTypes.node,
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Tooltip/index.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Tooltip/index.js
index 239e46c25904da..0441e556c08ac3 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Tooltip/index.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Tooltip/index.js
@@ -17,7 +17,7 @@ import {
   fontSize,
   fontSizes
 } from '../../../../style/variables';
-import Legend from '../Legend';
+import { Legend } from '../Legend';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import { asAbsoluteDateTime } from '../../../../utils/formatters';
 
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts b/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts
index 72ba50d66924d0..6027693be51801 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts
@@ -55,7 +55,6 @@ export async function getTraceErrorsPerTransaction(
   } as const;
 
   const resp = await client.search(params);
-
   return (resp.aggregations?.transactions.buckets || []).reduce(
     (acc, bucket) => ({
       ...acc,
diff --git a/x-pack/legacy/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
index 4484f41d06ac85..a2828e1d74920a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
@@ -16,6 +16,7 @@ Object {
               "processor.event": Array [
                 "span",
                 "transaction",
+                "error",
               ],
             },
           },
diff --git a/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts b/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts
index 8ea548ab3724bc..8118b6acaee397 100644
--- a/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts
@@ -13,6 +13,7 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { Span } from '../../../typings/es_schemas/ui/Span';
 import { Transaction } from '../../../typings/es_schemas/ui/Transaction';
+import { APMError } from '../../../typings/es_schemas/ui/APMError';
 import { rangeFilter } from '../helpers/range_filter';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
 
@@ -34,7 +35,7 @@ export async function getTraceItems(
         bool: {
           filter: [
             { term: { [TRACE_ID]: traceId } },
-            { terms: { [PROCESSOR_EVENT]: ['span', 'transaction'] } },
+            { terms: { [PROCESSOR_EVENT]: ['span', 'transaction', 'error'] } },
             { range: rangeFilter(start, end) }
           ],
           should: {
@@ -51,7 +52,7 @@ export async function getTraceItems(
     }
   };
 
-  const resp = await client.search<Transaction | Span>(params);
+  const resp = await client.search<Transaction | Span | APMError>(params);
 
   return {
     items: resp.hits.hits.map(hit => hit._source),
diff --git a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/SpanRaw.ts b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/SpanRaw.ts
index 5ba480221c997e..60e523f1aa0430 100644
--- a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/SpanRaw.ts
+++ b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/SpanRaw.ts
@@ -40,6 +40,12 @@ export interface SpanRaw extends APMBaseDoc {
       statement?: string;
       type?: string;
     };
+    message?: {
+      queue?: { name: string };
+      age?: { ms: number };
+      body?: string;
+      headers?: Record<string, unknown>;
+    };
   };
   transaction?: {
     id: string;
diff --git a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/TransactionRaw.ts b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/TransactionRaw.ts
index ce7c11f34a220a..4dc5f8c897c265 100644
--- a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/TransactionRaw.ts
+++ b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/TransactionRaw.ts
@@ -43,6 +43,12 @@ export interface TransactionRaw extends APMBaseDoc {
     };
     type: string;
     custom?: Record<string, unknown>;
+    message?: {
+      queue?: { name: string };
+      age?: { ms: number };
+      body?: string;
+      headers?: Record<string, unknown>;
+    };
   };
 
   // Shared by errors and transactions
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json b/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
index 843fba30bb4899..c78cfeea8473d7 100644
--- a/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
+++ b/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
@@ -19,6 +19,7 @@
         "smile"
       ]
     },
-    "template": "_sql?format=json\n{\n  \"query\": \"\"\"\n  SELECT * FROM \"${1:TABLE}\"\n  \"\"\"\n}\n"
+    "template": "_sql?format=json\n{\n  \"query\": \"\"\"\n  SELECT * FROM \"${1:TABLE}\"\n  \"\"\"\n}\n",
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html"
   }
 }
diff --git a/x-pack/legacy/plugins/infra/common/ecs_allowed_list.ts b/x-pack/legacy/plugins/infra/common/ecs_allowed_list.ts
index 1728cd1fa4b45d..f1d0577b4cb199 100644
--- a/x-pack/legacy/plugins/infra/common/ecs_allowed_list.ts
+++ b/x-pack/legacy/plugins/infra/common/ecs_allowed_list.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { first } from 'lodash';
+import { first, memoize } from 'lodash';
 
 export const ECS_ALLOWED_LIST = [
   'host',
@@ -46,8 +46,9 @@ export const DOCKER_ALLOWED_LIST = [
 ];
 
 export const AWS_S3_ALLOWED_LIST = ['aws.s3'];
+export const AWS_METRICS_ALLOWED_LIST = ['aws.cloudwatch'];
 
-export const getAllowedListForPrefix = (prefix: string) => {
+export const getAllowedListForPrefix = memoize((prefix: string) => {
   const firstPart = first(prefix.split(/\./));
   const defaultAllowedList = prefix ? [...ECS_ALLOWED_LIST, prefix] : ECS_ALLOWED_LIST;
   switch (firstPart) {
@@ -61,7 +62,10 @@ export const getAllowedListForPrefix = (prefix: string) => {
       if (prefix === 'aws.s3_daily_storage') {
         return [...defaultAllowedList, ...AWS_S3_ALLOWED_LIST];
       }
+      if (prefix === 'aws.metrics') {
+        return [...defaultAllowedList, ...AWS_METRICS_ALLOWED_LIST];
+      }
     default:
       return defaultAllowedList;
   }
-};
+});
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
index 6c27e54a78bee4..4bb1aefb5b2c72 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
@@ -12,6 +12,7 @@ import { getMetricsAggregations } from './query_helpers';
 import { calculateMetricInterval } from '../../utils/calculate_metric_interval';
 import { SnapshotModel, SnapshotModelMetricAggRT } from '../../../common/inventory_models/types';
 import { KibanaFramework } from '../adapters/framework/kibana_framework_adapter';
+import { getDatasetForField } from '../../routes/metrics_explorer/lib/get_dataset_for_field';
 
 export const createTimeRangeWithInterval = async (
   framework: KibanaFramework,
@@ -19,7 +20,7 @@ export const createTimeRangeWithInterval = async (
   options: InfraSnapshotRequestOptions
 ): Promise<InfraTimerangeInput> => {
   const aggregations = getMetricsAggregations(options);
-  const modules = aggregationsToModules(aggregations);
+  const modules = await aggregationsToModules(framework, requestContext, aggregations, options);
   const interval =
     (await calculateMetricInterval(
       framework,
@@ -39,21 +40,30 @@ export const createTimeRangeWithInterval = async (
   };
 };
 
-const aggregationsToModules = (aggregations: SnapshotModel): string[] => {
-  return uniq(
-    Object.values(aggregations)
-      .reduce((modules, agg) => {
-        if (SnapshotModelMetricAggRT.is(agg)) {
-          return modules.concat(Object.values(agg).map(a => a?.field));
-        }
-        return modules;
-      }, [] as Array<string | undefined>)
-      .filter(v => v)
-      .map(field =>
-        field!
-          .split(/\./)
-          .slice(0, 2)
-          .join('.')
-      )
-  ) as string[];
+const aggregationsToModules = async (
+  framework: KibanaFramework,
+  requestContext: RequestHandlerContext,
+  aggregations: SnapshotModel,
+  options: InfraSnapshotRequestOptions
+): Promise<string[]> => {
+  const uniqueFields = Object.values(aggregations)
+    .reduce<Array<string | undefined>>((fields, agg) => {
+      if (SnapshotModelMetricAggRT.is(agg)) {
+        return uniq(fields.concat(Object.values(agg).map(a => a?.field)));
+      }
+      return fields;
+    }, [])
+    .filter(v => v) as string[];
+  const fields = await Promise.all(
+    uniqueFields.map(
+      async field =>
+        await getDatasetForField(
+          framework,
+          requestContext,
+          field as string,
+          options.sourceConfiguration.metricAlias
+        )
+    )
+  );
+  return fields.filter(f => f) as string[];
 };
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/get_dataset_for_field.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/get_dataset_for_field.ts
new file mode 100644
index 00000000000000..66f0ca8fc706a3
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/get_dataset_for_field.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RequestHandlerContext } from 'kibana/server';
+import { KibanaFramework } from '../../../lib/adapters/framework/kibana_framework_adapter';
+
+interface EventDatasetHit {
+  _source: {
+    event?: {
+      dataset?: string;
+    };
+  };
+}
+
+export const getDatasetForField = async (
+  framework: KibanaFramework,
+  requestContext: RequestHandlerContext,
+  field: string,
+  indexPattern: string
+) => {
+  const params = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
+    terminateAfter: 1,
+    index: indexPattern,
+    body: {
+      query: { exists: { field } },
+      size: 1,
+      _source: ['event.dataset'],
+    },
+  };
+
+  const response = await framework.callWithRequest<EventDatasetHit>(
+    requestContext,
+    'search',
+    params
+  );
+  if (response.hits.total.value === 0) {
+    return null;
+  }
+
+  return response.hits.hits?.[0]._source.event?.dataset;
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
index 17fc46b41278af..8ab3fdccbe72b8 100644
--- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { union } from 'lodash';
+import { union, uniq } from 'lodash';
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
 import { KibanaFramework } from '../../../lib/adapters/framework/kibana_framework_adapter';
 import {
@@ -16,6 +16,7 @@ import {
 import { createMetricModel } from './create_metrics_model';
 import { JsonObject } from '../../../../common/typed_json';
 import { calculateMetricInterval } from '../../../utils/calculate_metric_interval';
+import { getDatasetForField } from './get_dataset_for_field';
 
 export const populateSeriesWithTSVBData = (
   request: KibanaRequest,
@@ -53,6 +54,12 @@ export const populateSeriesWithTSVBData = (
 
   // Create the TSVB model based on the request options
   const model = createMetricModel(options);
+  const modules = await Promise.all(
+    uniq(options.metrics.filter(m => m.field)).map(
+      async m =>
+        await getDatasetForField(framework, requestContext, m.field as string, options.indexPattern)
+    )
+  );
   const calculatedInterval = await calculateMetricInterval(
     framework,
     requestContext,
@@ -61,14 +68,7 @@ export const populateSeriesWithTSVBData = (
       timestampField: options.timerange.field,
       timerange: options.timerange,
     },
-    options.metrics
-      .filter(metric => metric.field)
-      .map(metric => {
-        return metric
-          .field!.split(/\./)
-          .slice(0, 2)
-          .join('.');
-      })
+    modules.filter(m => m) as string[]
   );
 
   if (calculatedInterval) {
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
index 82e172b6bd7e27..626ef99ac13aae 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
@@ -610,7 +610,7 @@ describe('IndexPatternDimensionPanel', () => {
       });
     });
 
-    it('should indicate document compatibility with selected field operation', () => {
+    it('should select the Records field when count is selected', () => {
       const initialState: IndexPatternPrivateState = {
         ...state,
         layers: {
@@ -639,12 +639,9 @@ describe('IndexPatternDimensionPanel', () => {
         .find('button[data-test-subj="lns-indexPatternDimensionIncompatible-count"]')
         .simulate('click');
 
-      const options = wrapper.find(EuiComboBox).prop('options');
-
-      expect(options![0]['data-test-subj']).not.toContain('Incompatible');
-      options![1].options!.map(option =>
-        expect(option['data-test-subj']).toContain('Incompatible')
-      );
+      const newColumnState = setState.mock.calls[0][0].layers.first.columns.col2;
+      expect(newColumnState.operationType).toEqual('count');
+      expect(newColumnState.sourceField).toEqual('Records');
     });
 
     it('should indicate document and field compatibility with selected document operation', () => {
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/popover_editor.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/popover_editor.tsx
index c44d63b01c1b3f..98773c04db4a6a 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/popover_editor.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/popover_editor.tsx
@@ -127,7 +127,7 @@ export function PopoverEditor(props: PopoverEditorProps) {
             compatibleWithCurrentField ? '' : 'Incompatible'
           }-${operationType}`,
           onClick() {
-            if (!selectedColumn) {
+            if (!selectedColumn || !compatibleWithCurrentField) {
               const possibleFields = fieldByOperation[operationType] || [];
 
               if (possibleFields.length === 1) {
@@ -152,11 +152,6 @@ export function PopoverEditor(props: PopoverEditorProps) {
               trackUiEvent(`indexpattern_dimension_operation_${operationType}`);
               return;
             }
-            if (!compatibleWithCurrentField) {
-              setInvalidOperationType(operationType);
-              trackUiEvent(`indexpattern_dimension_operation_${operationType}`);
-              return;
-            }
             if (incompatibleSelectedOperationType) {
               setInvalidOperationType(null);
             }
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
index 15f19bb9d97e6b..b58a2d8ca52c75 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
@@ -115,8 +115,12 @@ export function getIndexPatternDatasource({
   const indexPatternDatasource: Datasource<IndexPatternPrivateState, IndexPatternPersistedState> = {
     id: 'indexpattern',
 
-    initialize(state?: IndexPatternPersistedState) {
-      return loadInitialState({ state, savedObjectsClient });
+    async initialize(state?: IndexPatternPersistedState) {
+      return loadInitialState({
+        state,
+        savedObjectsClient,
+        defaultIndexPatternId: core.uiSettings.get('defaultIndex'),
+      });
     },
 
     getPersistableState({ currentIndexPatternId, layers }: IndexPatternPrivateState) {
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts
index 2fb678aed5a54b..e180ab690d4185 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts
@@ -114,8 +114,9 @@ const sampleIndexPatterns = {
       {
         name: 'source',
         type: 'string',
-        aggregatable: true,
-        searchable: true,
+        aggregatable: false,
+        searchable: false,
+        scripted: true,
         aggregationRestrictions: {
           terms: {
             agg: 'terms',
@@ -196,7 +197,7 @@ describe('loader', () => {
       expect(cache).toMatchObject(sampleIndexPatterns);
     });
 
-    it('should not allow full text fields', async () => {
+    it('should allow scripted, but not full text fields', async () => {
       const cache = await loadIndexPatterns({
         cache: {},
         patterns: ['a', 'b'],
@@ -286,6 +287,26 @@ describe('loader', () => {
       });
     });
 
+    it('should use the default index pattern id, if provided', async () => {
+      const state = await loadInitialState({
+        defaultIndexPatternId: 'b',
+        savedObjectsClient: mockClient(),
+      });
+
+      expect(state).toMatchObject({
+        currentIndexPatternId: 'b',
+        indexPatternRefs: [
+          { id: 'a', title: sampleIndexPatterns.a.title },
+          { id: 'b', title: sampleIndexPatterns.b.title },
+        ],
+        indexPatterns: {
+          b: sampleIndexPatterns.b,
+        },
+        layers: {},
+        showEmptyFields: false,
+      });
+    });
+
     it('should initialize from saved state', async () => {
       const savedState: IndexPatternPersistedState = {
         currentIndexPatternId: 'b',
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
index 661c627f3454f6..7f46f50786cf48 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
@@ -84,9 +84,11 @@ export async function loadIndexPatterns({
 export async function loadInitialState({
   state,
   savedObjectsClient,
+  defaultIndexPatternId,
 }: {
   state?: IndexPatternPersistedState;
   savedObjectsClient: SavedObjectsClient;
+  defaultIndexPatternId?: string;
 }): Promise<IndexPatternPrivateState> {
   const indexPatternRefs = await loadIndexPatternRefs(savedObjectsClient);
   const requiredPatterns = _.unique(
@@ -94,7 +96,7 @@ export async function loadInitialState({
       ? Object.values(state.layers)
           .map(l => l.indexPatternId)
           .concat(state.currentIndexPatternId)
-      : [indexPatternRefs[0].id]
+      : [defaultIndexPatternId || indexPatternRefs[0].id]
   );
 
   const currentIndexPatternId = requiredPatterns[0];
@@ -280,7 +282,7 @@ function fromSavedObject(
     type,
     title: attributes.title,
     fields: (JSON.parse(attributes.fields) as IndexPatternField[])
-      .filter(({ aggregatable }) => !!aggregatable)
+      .filter(({ aggregatable, scripted }) => !!aggregatable || !!scripted)
       .concat(documentField),
     typeMeta: attributes.typeMeta
       ? (JSON.parse(attributes.typeMeta) as SavedRestrictionsInfo)
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts
index 9ed50836333148..50478515d19ce2 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts
@@ -39,6 +39,7 @@ export interface IndexPatternField {
   type: string;
   esTypes?: string[];
   aggregatable: boolean;
+  scripted?: boolean;
   searchable: boolean;
   aggregationRestrictions?: AggregationRestrictions;
 }
diff --git a/x-pack/legacy/plugins/maps/common/constants.js b/x-pack/legacy/plugins/maps/common/constants.js
index b97845a458d51b..6e7776d43f4d46 100644
--- a/x-pack/legacy/plugins/maps/common/constants.js
+++ b/x-pack/legacy/plugins/maps/common/constants.js
@@ -23,6 +23,7 @@ export const EMS_TILES_VECTOR_TILE_PATH = 'ems/tiles/vector/tile';
 export const MAP_SAVED_OBJECT_TYPE = 'map';
 export const APP_ID = 'maps';
 export const APP_ICON = 'gisApp';
+export const TELEMETRY_TYPE = 'maps-telemetry';
 
 export const MAP_APP_PATH = `app/${APP_ID}`;
 export const GIS_API_PATH = `api/${APP_ID}`;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
index 8850c4c07ab736..76ecc18f2f7d76 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
@@ -11,7 +11,8 @@ import { AbstractTMSSource } from '../tms_source';
 import { VectorTileLayer } from '../../vector_tile_layer';
 
 import { getEMSClient } from '../../../meta';
-import { EMSTMSCreateSourceEditor } from './create_source_editor';
+import { TileServiceSelect } from './tile_service_select';
+import { UpdateSourceEditor } from './update_source_editor';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { EMS_TMS } from '../../../../common/constants';
@@ -41,7 +42,7 @@ export class EMSTMSSource extends AbstractTMSSource {
       onPreviewSource(source);
     };
 
-    return <EMSTMSCreateSourceEditor onSourceConfigChange={onSourceConfigChange} />;
+    return <TileServiceSelect onTileSelect={onSourceConfigChange} />;
   }
 
   constructor(descriptor, inspectorAdapters) {
@@ -55,6 +56,10 @@ export class EMSTMSSource extends AbstractTMSSource {
     );
   }
 
+  renderSourceSettingsEditor({ onChange }) {
+    return <UpdateSourceEditor onChange={onChange} config={this._descriptor} />;
+  }
+
   async getImmutableProperties() {
     const displayName = await this.getDisplayName();
     const autoSelectMsg = i18n.translate('xpack.maps.source.emsTile.isAutoSelectLabel', {
@@ -78,7 +83,7 @@ export class EMSTMSSource extends AbstractTMSSource {
   async _getEMSTMSService() {
     const emsClient = getEMSClient();
     const emsTMSServices = await emsClient.getTMSServices();
-    const emsTileLayerId = this._getEmsTileLayerId();
+    const emsTileLayerId = this.getTileLayerId();
     const tmsService = emsTMSServices.find(tmsService => tmsService.getId() === emsTileLayerId);
     if (!tmsService) {
       throw new Error(
@@ -110,7 +115,7 @@ export class EMSTMSSource extends AbstractTMSSource {
       const emsTMSService = await this._getEMSTMSService();
       return emsTMSService.getDisplayName();
     } catch (error) {
-      return this._getEmsTileLayerId();
+      return this.getTileLayerId();
     }
   }
 
@@ -129,7 +134,7 @@ export class EMSTMSSource extends AbstractTMSSource {
   }
 
   getSpriteNamespacePrefix() {
-    return 'ems/' + this._getEmsTileLayerId();
+    return 'ems/' + this.getTileLayerId();
   }
 
   async getVectorStyleSheetAndSpriteMeta(isRetina) {
@@ -142,7 +147,7 @@ export class EMSTMSSource extends AbstractTMSSource {
     };
   }
 
-  _getEmsTileLayerId() {
+  getTileLayerId() {
     if (!this._descriptor.isAutoSelect) {
       return this._descriptor.id;
     }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/create_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js
similarity index 52%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/create_source_editor.js
rename to x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js
index 65986d5bc93dfd..337fc7aa466931 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/create_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js
@@ -13,74 +13,80 @@ import { i18n } from '@kbn/i18n';
 
 export const AUTO_SELECT = 'auto_select';
 
-export class EMSTMSCreateSourceEditor extends React.Component {
+export class TileServiceSelect extends React.Component {
   state = {
-    emsTmsOptionsRaw: null,
+    emsTmsOptions: [],
+    hasLoaded: false,
   };
 
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  componentDidMount() {
+    this._isMounted = true;
+    this._loadTmsOptions();
+  }
+
   _loadTmsOptions = async () => {
     const emsClient = getEMSClient();
     const emsTMSServices = await emsClient.getTMSServices();
-    const options = emsTMSServices.map(tmsService => {
+
+    if (!this._isMounted) {
+      return;
+    }
+
+    const emsTmsOptions = emsTMSServices.map(tmsService => {
       return {
-        id: tmsService.getId(),
-        name: tmsService.getDisplayName(),
+        value: tmsService.getId(),
+        text: tmsService.getDisplayName() ? tmsService.getDisplayName() : tmsService.getId(),
       };
     });
-    options.unshift({
-      id: AUTO_SELECT,
-      name: i18n.translate('xpack.maps.source.emsTile.autoLabel', {
+    emsTmsOptions.unshift({
+      value: AUTO_SELECT,
+      text: i18n.translate('xpack.maps.source.emsTile.autoLabel', {
         defaultMessage: 'Autoselect based on Kibana theme',
       }),
     });
-    if (this._isMounted) {
-      this.setState({
-        emsTmsOptionsRaw: options,
-      });
-    }
+    this.setState({ emsTmsOptions, hasLoaded: true });
   };
 
-  _onEmsTileServiceChange = e => {
+  _onChange = e => {
     const value = e.target.value;
     const isAutoSelect = value === AUTO_SELECT;
-    this.props.onSourceConfigChange({
+    this.props.onTileSelect({
       id: isAutoSelect ? null : value,
       isAutoSelect,
     });
   };
 
-  componentWillUnmount() {
-    this._isMounted = false;
-  }
-
-  componentDidMount() {
-    this._isMounted = true;
-    this._loadTmsOptions();
-  }
-
   render() {
-    if (!this.state.emsTmsOptionsRaw) {
-      // TODO display loading message
-      return null;
-    }
+    const helpText =
+      this.state.hasLoaded && this.state.emsTmsOptions.length === 0
+        ? getEmsUnavailableMessage()
+        : null;
 
-    const emsTileOptions = this.state.emsTmsOptionsRaw.map(service => ({
-      value: service.id,
-      text: service.name || service.id,
-    }));
+    let selectedId;
+    if (this.props.config) {
+      selectedId = this.props.config.isAutoSelect ? AUTO_SELECT : this.props.config.id;
+    }
 
     return (
       <EuiFormRow
         label={i18n.translate('xpack.maps.source.emsTile.label', {
           defaultMessage: 'Tile service',
         })}
-        helpText={this.state.emsTmsOptionsRaw.length === 0 ? getEmsUnavailableMessage() : null}
+        helpText={helpText}
+        display="columnCompressed"
       >
         <EuiSelect
-          hasNoInitialSelection
-          options={emsTileOptions}
-          onChange={this._onEmsTileServiceChange}
-          disabled={this.state.emsTmsOptionsRaw.length === 0}
+          hasNoInitialSelection={!selectedId}
+          value={selectedId}
+          options={this.state.emsTmsOptions}
+          onChange={this._onChange}
+          isLoading={!this.state.hasLoaded}
+          disabled={this.state.hasLoaded && this.state.emsTmsOptions.length === 0}
+          compressed
         />
       </EuiFormRow>
     );
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js
new file mode 100644
index 00000000000000..4d567b8dbb32a9
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js
@@ -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 React, { Fragment } from 'react';
+import { EuiTitle, EuiPanel, EuiSpacer } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { TileServiceSelect } from './tile_service_select';
+
+export function UpdateSourceEditor({ onChange, config }) {
+  const _onTileSelect = ({ id, isAutoSelect }) => {
+    onChange({ propName: 'id', value: id });
+    onChange({ propName: 'isAutoSelect', value: isAutoSelect });
+  };
+
+  return (
+    <Fragment>
+      <EuiPanel>
+        <EuiTitle size="xs">
+          <h5>
+            <FormattedMessage
+              id="xpack.maps.source.emsTile.settingsTitle"
+              defaultMessage="Basemap"
+            />
+          </h5>
+        </EuiTitle>
+
+        <EuiSpacer size="m" />
+
+        <TileServiceSelect onTileSelect={_onTileSelect} config={config} />
+      </EuiPanel>
+
+      <EuiSpacer size="s" />
+    </Fragment>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
new file mode 100644
index 00000000000000..5e0f7434b04d08
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
@@ -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 _ from 'lodash';
+import React, { Fragment } from 'react';
+import { FieldSelect } from '../field_select';
+import { ColorRampSelect } from './color_ramp_select';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+
+export function DynamicColorForm({
+  fields,
+  onDynamicStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+}) {
+  const styleOptions = styleProperty.getOptions();
+
+  const onFieldChange = ({ field }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), { ...styleOptions, field });
+  };
+
+  const onColorChange = colorOptions => {
+    onDynamicStyleChange(styleProperty.getStyleName(), {
+      ...styleOptions,
+      ...colorOptions,
+    });
+  };
+
+  let colorRampSelect;
+  if (styleOptions.field && styleOptions.field.name) {
+    colorRampSelect = (
+      <ColorRampSelect
+        onChange={onColorChange}
+        color={styleOptions.color}
+        customColorRamp={styleOptions.customColorRamp}
+        useCustomColorRamp={_.get(styleOptions, 'useCustomColorRamp', false)}
+        compressed
+      />
+    );
+  }
+
+  return (
+    <Fragment>
+      <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+        <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+        <EuiFlexItem>
+          <FieldSelect
+            fields={fields}
+            selectedFieldName={_.get(styleOptions, 'field.name')}
+            onChange={onFieldChange}
+            compressed
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      {colorRampSelect}
+    </Fragment>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_selection.js
deleted file mode 100644
index 84327635f2b65a..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_selection.js
+++ /dev/null
@@ -1,48 +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, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { dynamicColorShape } from '../style_option_shapes';
-import { FieldSelect, fieldShape } from '../field_select';
-import { ColorRampSelect } from './color_ramp_select';
-import { EuiSpacer } from '@elastic/eui';
-
-export function DynamicColorSelection({ fields, onChange, styleOptions }) {
-  const onFieldChange = ({ field }) => {
-    onChange({ ...styleOptions, field });
-  };
-
-  const onColorChange = colorOptions => {
-    onChange({ ...styleOptions, ...colorOptions });
-  };
-
-  return (
-    <Fragment>
-      <ColorRampSelect
-        onChange={onColorChange}
-        color={styleOptions.color}
-        customColorRamp={styleOptions.customColorRamp}
-        useCustomColorRamp={_.get(styleOptions, 'useCustomColorRamp', false)}
-        compressed
-      />
-      <EuiSpacer size="s" />
-      <FieldSelect
-        fields={fields}
-        selectedFieldName={_.get(styleOptions, 'field.name')}
-        onChange={onFieldChange}
-        compressed
-      />
-    </Fragment>
-  );
-}
-
-DynamicColorSelection.propTypes = {
-  fields: PropTypes.arrayOf(fieldShape).isRequired,
-  styleOptions: dynamicColorShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js
new file mode 100644
index 00000000000000..48befa1ca74c0e
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiColorPicker, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function StaticColorForm({
+  onStaticStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+  swatches,
+}) {
+  const onColorChange = color => {
+    onStaticStyleChange(styleProperty.getStyleName(), { color });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <EuiColorPicker
+          onChange={onColorChange}
+          color={styleProperty.getOptions().color}
+          swatches={swatches}
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_selection.js
deleted file mode 100644
index e42b582dc39297..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_selection.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.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { EuiColorPicker } from '@elastic/eui';
-import { staticColorShape } from '../style_option_shapes';
-
-export function StaticColorSelection({ onChange, styleOptions, swatches }) {
-  const onColorChange = color => {
-    onChange({ color });
-  };
-
-  return (
-    <EuiColorPicker
-      onChange={onColorChange}
-      color={styleOptions.color}
-      swatches={swatches}
-      compressed
-    />
-  );
-}
-
-StaticColorSelection.propTypes = {
-  styleOptions: staticColorShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
index c7745fa69a82f8..43e7050b3d1d23 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
@@ -6,21 +6,29 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../static_dynamic_style_row';
-import { DynamicColorSelection } from './dynamic_color_selection';
-import { StaticColorSelection } from './static_color_selection';
+import { StylePropEditor } from '../style_prop_editor';
+import { DynamicColorForm } from './dynamic_color_form';
+import { StaticColorForm } from './static_color_form';
+import { i18n } from '@kbn/i18n';
 
 export function VectorStyleColorEditor(props) {
+  const colorForm = props.styleProperty.isDynamic() ? (
+    <DynamicColorForm {...props} />
+  ) : (
+    <StaticColorForm {...props} />
+  );
+
   return (
-    <StaticDynamicStyleRow
-      fields={props.fields}
-      styleProperty={props.styleProperty}
-      handlePropertyChange={props.handlePropertyChange}
-      swatches={props.swatches}
-      DynamicSelector={DynamicColorSelection}
-      StaticSelector={StaticColorSelection}
-      defaultDynamicStyleOptions={props.defaultDynamicStyleOptions}
-      defaultStaticStyleOptions={props.defaultStaticStyleOptions}
-    />
+    <StylePropEditor
+      {...props}
+      customStaticOptionLabel={i18n.translate(
+        'xpack.maps.styles.color.staticDynamicSelect.staticLabel',
+        {
+          defaultMessage: 'Solid',
+        }
+      )}
+    >
+      {colorForm}
+    </StylePropEditor>
   );
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js
new file mode 100644
index 00000000000000..bad13b487cc295
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import React from 'react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { FieldSelect } from '../field_select';
+
+export function DynamicLabelForm({
+  fields,
+  onDynamicStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+}) {
+  const styleOptions = styleProperty.getOptions();
+
+  const onFieldChange = ({ field }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), { ...styleOptions, field });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <FieldSelect
+          fields={fields}
+          selectedFieldName={_.get(styleOptions, 'field.name')}
+          onChange={onFieldChange}
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_selector.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_selector.js
deleted file mode 100644
index e393341b906960..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_selector.js
+++ /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 _ from 'lodash';
-import React from 'react';
-import { FieldSelect } from '../field_select';
-
-export function DynamicLabelSelector({ fields, styleOptions, onChange }) {
-  const onFieldChange = ({ field }) => {
-    onChange({ ...styleOptions, field });
-  };
-
-  return (
-    <FieldSelect
-      fields={fields}
-      selectedFieldName={_.get(styleOptions, 'field.name')}
-      onChange={onFieldChange}
-      compressed
-    />
-  );
-}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js
new file mode 100644
index 00000000000000..721487b5d8ff09
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js
@@ -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.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiFieldText, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function StaticLabelForm({ onStaticStyleChange, staticDynamicSelect, styleProperty }) {
+  const onValueChange = event => {
+    onStaticStyleChange(styleProperty.getStyleName(), { value: event.target.value });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <EuiFieldText
+          placeholder={i18n.translate('xpack.maps.styles.staticLabel.valuePlaceholder', {
+            defaultMessage: 'symbol label',
+          })}
+          value={styleProperty.getOptions().value}
+          onChange={onValueChange}
+          aria-label={i18n.translate('xpack.maps.styles.staticLabel.valueAriaLabel', {
+            defaultMessage: 'symbol label',
+          })}
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_selector.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_selector.js
deleted file mode 100644
index ea296a3312799e..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_selector.js
+++ /dev/null
@@ -1,28 +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 { i18n } from '@kbn/i18n';
-import { EuiFieldText } from '@elastic/eui';
-
-export function StaticLabelSelector({ onChange, styleOptions }) {
-  const onValueChange = event => {
-    onChange({ value: event.target.value });
-  };
-
-  return (
-    <EuiFieldText
-      placeholder={i18n.translate('xpack.maps.styles.staticLabel.valuePlaceholder', {
-        defaultMessage: 'symbol label',
-      })}
-      value={styleOptions.value}
-      onChange={onValueChange}
-      aria-label={i18n.translate('xpack.maps.styles.staticLabel.valueAriaLabel', {
-        defaultMessage: 'symbol label',
-      })}
-    />
-  );
-}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js
index 6bca56425d38d5..aaa21ea315f36c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js
@@ -6,16 +6,16 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../static_dynamic_style_row';
-import { DynamicLabelSelector } from './dynamic_label_selector';
-import { StaticLabelSelector } from './static_label_selector';
+import { StylePropEditor } from '../style_prop_editor';
+import { DynamicLabelForm } from './dynamic_label_form';
+import { StaticLabelForm } from './static_label_form';
 
 export function VectorStyleLabelEditor(props) {
-  return (
-    <StaticDynamicStyleRow
-      {...props}
-      DynamicSelector={DynamicLabelSelector}
-      StaticSelector={StaticLabelSelector}
-    />
+  const labelForm = props.styleProperty.isDynamic() ? (
+    <DynamicLabelForm {...props} />
+  ) : (
+    <StaticLabelForm {...props} />
   );
+
+  return <StylePropEditor {...props}>{labelForm}</StylePropEditor>;
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js
new file mode 100644
index 00000000000000..e0b7e7b2865a27
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import React from 'react';
+import { FieldSelect } from '../field_select';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function DynamicOrientationForm({
+  fields,
+  onDynamicStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+}) {
+  const styleOptions = styleProperty.getOptions();
+
+  const onFieldChange = ({ field }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), {
+      ...styleOptions,
+      field,
+    });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <FieldSelect
+          fields={fields}
+          selectedFieldName={_.get(styleOptions, 'field.name')}
+          onChange={onFieldChange}
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_selection.js
deleted file mode 100644
index 8ad3916ac65093..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_selection.js
+++ /dev/null
@@ -1,32 +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 PropTypes from 'prop-types';
-import { dynamicOrientationShape } from '../style_option_shapes';
-import { FieldSelect, fieldShape } from '../field_select';
-
-export function DynamicOrientationSelection({ fields, styleOptions, onChange }) {
-  const onFieldChange = ({ field }) => {
-    onChange({ ...styleOptions, field });
-  };
-
-  return (
-    <FieldSelect
-      fields={fields}
-      selectedFieldName={_.get(styleOptions, 'field.name')}
-      onChange={onFieldChange}
-      compressed
-    />
-  );
-}
-
-DynamicOrientationSelection.propTypes = {
-  fields: PropTypes.arrayOf(fieldShape).isRequired,
-  styleOptions: dynamicOrientationShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
index e97252a5e79da4..915fc92c9fb381 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
@@ -6,20 +6,16 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../static_dynamic_style_row';
-import { DynamicOrientationSelection } from './dynamic_orientation_selection';
-import { StaticOrientationSelection } from './static_orientation_selection';
+import { StylePropEditor } from '../style_prop_editor';
+import { DynamicOrientationForm } from './dynamic_orientation_form';
+import { StaticOrientationForm } from './static_orientation_form';
 
 export function OrientationEditor(props) {
-  return (
-    <StaticDynamicStyleRow
-      fields={props.fields}
-      styleProperty={props.styleProperty}
-      handlePropertyChange={props.handlePropertyChange}
-      DynamicSelector={DynamicOrientationSelection}
-      StaticSelector={StaticOrientationSelection}
-      defaultDynamicStyleOptions={props.defaultDynamicStyleOptions}
-      defaultStaticStyleOptions={props.defaultStaticStyleOptions}
-    />
+  const orientationForm = props.styleProperty.isDynamic() ? (
+    <DynamicOrientationForm {...props} />
+  ) : (
+    <StaticOrientationForm {...props} />
   );
+
+  return <StylePropEditor {...props}>{orientationForm}</StylePropEditor>;
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js
new file mode 100644
index 00000000000000..8c4418f95e1d25
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ValidatedRange } from '../../../../../components/validated_range';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function StaticOrientationForm({ onStaticStyleChange, staticDynamicSelect, styleProperty }) {
+  const onOrientationChange = orientation => {
+    onStaticStyleChange(styleProperty.getStyleName(), { orientation });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <ValidatedRange
+          min={0}
+          max={360}
+          value={styleProperty.getOptions().orientation}
+          onChange={onOrientationChange}
+          showInput="inputWithPopover"
+          showLabels
+          compressed
+          append="°"
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_selection.js
deleted file mode 100644
index b5529c69874598..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_selection.js
+++ /dev/null
@@ -1,34 +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 PropTypes from 'prop-types';
-import { staticOrientationShape } from '../style_option_shapes';
-import { ValidatedRange } from '../../../../../components/validated_range';
-
-export function StaticOrientationSelection({ onChange, styleOptions }) {
-  const onOrientationChange = orientation => {
-    onChange({ orientation });
-  };
-
-  return (
-    <ValidatedRange
-      min={0}
-      max={360}
-      value={styleOptions.orientation}
-      onChange={onOrientationChange}
-      showInput
-      showLabels
-      compressed
-      append="°"
-    />
-  );
-}
-
-StaticOrientationSelection.propTypes = {
-  styleOptions: staticOrientationShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js
new file mode 100644
index 00000000000000..8b069cd53b731a
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import React, { Fragment } from 'react';
+import { FieldSelect } from '../field_select';
+import { SizeRangeSelector } from './size_range_selector';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+
+export function DynamicSizeForm({
+  fields,
+  onDynamicStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+}) {
+  const styleOptions = styleProperty.getOptions();
+
+  const onFieldChange = ({ field }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), { ...styleOptions, field });
+  };
+
+  const onSizeRangeChange = ({ minSize, maxSize }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), {
+      ...styleOptions,
+      minSize,
+      maxSize,
+    });
+  };
+
+  let sizeRange;
+  if (styleOptions.field && styleOptions.field.name) {
+    sizeRange = (
+      <SizeRangeSelector
+        onChange={onSizeRangeChange}
+        minSize={styleOptions.minSize}
+        maxSize={styleOptions.maxSize}
+        showLabels
+        compressed
+      />
+    );
+  }
+
+  return (
+    <Fragment>
+      <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+        <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+        <EuiFlexItem>
+          <FieldSelect
+            fields={fields}
+            selectedFieldName={_.get(styleOptions, 'field.name')}
+            onChange={onFieldChange}
+            compressed
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      {sizeRange}
+    </Fragment>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_selection.js
deleted file mode 100644
index 76c5b97976bbcd..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_selection.js
+++ /dev/null
@@ -1,48 +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, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { dynamicSizeShape } from '../style_option_shapes';
-import { FieldSelect, fieldShape } from '../field_select';
-import { SizeRangeSelector } from './size_range_selector';
-import { EuiSpacer } from '@elastic/eui';
-
-export function DynamicSizeSelection({ fields, styleOptions, onChange }) {
-  const onFieldChange = ({ field }) => {
-    onChange({ ...styleOptions, field });
-  };
-
-  const onSizeRangeChange = ({ minSize, maxSize }) => {
-    onChange({ ...styleOptions, minSize, maxSize });
-  };
-
-  return (
-    <Fragment>
-      <SizeRangeSelector
-        onChange={onSizeRangeChange}
-        minSize={styleOptions.minSize}
-        maxSize={styleOptions.maxSize}
-        showLabels
-        compressed
-      />
-      <EuiSpacer size="s" />
-      <FieldSelect
-        fields={fields}
-        selectedFieldName={_.get(styleOptions, 'field.name')}
-        onChange={onFieldChange}
-        compressed
-      />
-    </Fragment>
-  );
-}
-
-DynamicSizeSelection.propTypes = {
-  fields: PropTypes.arrayOf(fieldShape).isRequired,
-  styleOptions: dynamicSizeShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js
new file mode 100644
index 00000000000000..d8fe1322db3e36
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ValidatedRange } from '../../../../../components/validated_range';
+import { i18n } from '@kbn/i18n';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function StaticSizeForm({ onStaticStyleChange, staticDynamicSelect, styleProperty }) {
+  const onSizeChange = size => {
+    onStaticStyleChange(styleProperty.getStyleName(), { size });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <ValidatedRange
+          min={0}
+          max={100}
+          value={styleProperty.getOptions().size}
+          onChange={onSizeChange}
+          showInput="inputWithPopover"
+          showLabels
+          compressed
+          append={i18n.translate('xpack.maps.vector.size.unitLabel', {
+            defaultMessage: 'px',
+            description: 'Shorthand for pixel',
+          })}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_selection.js
deleted file mode 100644
index 38f8fe53d17488..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_selection.js
+++ /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 PropTypes from 'prop-types';
-import { staticSizeShape } from '../style_option_shapes';
-import { ValidatedRange } from '../../../../../components/validated_range';
-import { i18n } from '@kbn/i18n';
-
-export function StaticSizeSelection({ onChange, styleOptions }) {
-  const onSizeChange = size => {
-    onChange({ size });
-  };
-
-  return (
-    <ValidatedRange
-      min={0}
-      max={100}
-      value={styleOptions.size}
-      onChange={onSizeChange}
-      showInput
-      showLabels
-      compressed
-      append={i18n.translate('xpack.maps.vector.size.unitLabel', {
-        defaultMessage: 'px',
-        description: 'Shorthand for pixel',
-      })}
-    />
-  );
-}
-
-StaticSizeSelection.propTypes = {
-  styleOptions: staticSizeShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
index 6580bfc00e0ad9..e344f72bd429ad 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
@@ -6,20 +6,16 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../static_dynamic_style_row';
-import { DynamicSizeSelection } from './dynamic_size_selection';
-import { StaticSizeSelection } from './static_size_selection';
+import { StylePropEditor } from '../style_prop_editor';
+import { DynamicSizeForm } from './dynamic_size_form';
+import { StaticSizeForm } from './static_size_form';
 
 export function VectorStyleSizeEditor(props) {
-  return (
-    <StaticDynamicStyleRow
-      fields={props.fields}
-      styleProperty={props.styleProperty}
-      handlePropertyChange={props.handlePropertyChange}
-      DynamicSelector={DynamicSizeSelection}
-      StaticSelector={StaticSizeSelection}
-      defaultDynamicStyleOptions={props.defaultDynamicStyleOptions}
-      defaultStaticStyleOptions={props.defaultStaticStyleOptions}
-    />
+  const sizeForm = props.styleProperty.isDynamic() ? (
+    <DynamicSizeForm {...props} />
+  ) : (
+    <StaticSizeForm {...props} />
   );
+
+  return <StylePropEditor {...props}>{sizeForm}</StylePropEditor>;
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/static_dynamic_style_row.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/static_dynamic_style_row.js
deleted file mode 100644
index 311406731801aa..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/static_dynamic_style_row.js
+++ /dev/null
@@ -1,145 +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, { Component, Fragment } from 'react';
-import { VectorStyle } from '../vector_style';
-import { i18n } from '@kbn/i18n';
-import { FieldMetaOptionsPopover } from './field_meta_options_popover';
-import { getVectorStyleLabel } from './get_vector_style_label';
-
-import { EuiFlexGroup, EuiFlexItem, EuiToolTip, EuiFormRow, EuiButtonToggle } from '@elastic/eui';
-
-export class StaticDynamicStyleRow extends Component {
-  // Store previous options locally so when type is toggled,
-  // previous style options can be used.
-  prevStaticStyleOptions = this.props.defaultStaticStyleOptions;
-  prevDynamicStyleOptions = this.props.defaultDynamicStyleOptions;
-
-  _canBeDynamic() {
-    return this.props.fields.length > 0;
-  }
-
-  _isDynamic() {
-    return this.props.styleProperty.isDynamic();
-  }
-
-  _getStyleOptions() {
-    return this.props.styleProperty.getOptions();
-  }
-
-  _onFieldMetaOptionsChange = fieldMetaOptions => {
-    const styleDescriptor = {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
-      options: {
-        ...this._getStyleOptions(),
-        fieldMetaOptions,
-      },
-    };
-    this.props.handlePropertyChange(this.props.styleProperty.getStyleName(), styleDescriptor);
-  };
-
-  _onStaticStyleChange = options => {
-    const styleDescriptor = {
-      type: VectorStyle.STYLE_TYPE.STATIC,
-      options,
-    };
-    this.props.handlePropertyChange(this.props.styleProperty.getStyleName(), styleDescriptor);
-  };
-
-  _onDynamicStyleChange = options => {
-    const styleDescriptor = {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
-      options,
-    };
-    this.props.handlePropertyChange(this.props.styleProperty.getStyleName(), styleDescriptor);
-  };
-
-  _onTypeToggle = () => {
-    if (this._isDynamic()) {
-      // preserve current dynmaic style
-      this.prevDynamicStyleOptions = this._getStyleOptions();
-      // toggle to static style
-      this._onStaticStyleChange(this.prevStaticStyleOptions);
-      return;
-    }
-
-    // preserve current static style
-    this.prevStaticStyleOptions = this._getStyleOptions();
-    // toggle to dynamic style
-    this._onDynamicStyleChange(this.prevDynamicStyleOptions);
-  };
-
-  _renderStyleSelector() {
-    if (this._isDynamic()) {
-      const DynamicSelector = this.props.DynamicSelector;
-      return (
-        <Fragment>
-          <DynamicSelector
-            fields={this.props.fields}
-            onChange={this._onDynamicStyleChange}
-            styleOptions={this._getStyleOptions()}
-          />
-          <FieldMetaOptionsPopover
-            styleProperty={this.props.styleProperty}
-            onChange={this._onFieldMetaOptionsChange}
-          />
-        </Fragment>
-      );
-    }
-
-    const StaticSelector = this.props.StaticSelector;
-    return (
-      <StaticSelector
-        onChange={this._onStaticStyleChange}
-        styleOptions={this._getStyleOptions()}
-        swatches={this.props.swatches}
-      />
-    );
-  }
-
-  render() {
-    const isDynamic = this._isDynamic();
-    const dynamicTooltipContent = isDynamic
-      ? i18n.translate('xpack.maps.styles.staticDynamic.staticDescription', {
-          defaultMessage: 'Use static styling properties to symbolize features.',
-        })
-      : i18n.translate('xpack.maps.styles.staticDynamic.dynamicDescription', {
-          defaultMessage: 'Use property values to symbolize features.',
-        });
-
-    return (
-      <EuiFlexGroup gutterSize="xs">
-        <EuiFlexItem
-          className={isDynamic ? 'mapStaticDynamicSylingOption__dynamicSizeHack' : undefined}
-        >
-          <EuiFormRow
-            label={getVectorStyleLabel(this.props.styleProperty.getStyleName())}
-            display="rowCompressed"
-          >
-            {this._renderStyleSelector()}
-          </EuiFormRow>
-        </EuiFlexItem>
-        {this._canBeDynamic() && (
-          <EuiFlexItem grow={false}>
-            <EuiFormRow hasEmptyLabelSpace display="centerCompressed">
-              <EuiToolTip content={dynamicTooltipContent} delay="long">
-                <EuiButtonToggle
-                  size="s"
-                  label={dynamicTooltipContent}
-                  iconType="link"
-                  onChange={this._onTypeToggle}
-                  isEmpty={!isDynamic}
-                  fill={isDynamic}
-                  isIconOnly
-                />
-              </EuiToolTip>
-            </EuiFormRow>
-          </EuiFlexItem>
-        )}
-      </EuiFlexGroup>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
new file mode 100644
index 00000000000000..1ac8edfb2cc694
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Component, Fragment } from 'react';
+import { FieldMetaOptionsPopover } from './field_meta_options_popover';
+import { getVectorStyleLabel } from './get_vector_style_label';
+import { EuiFormRow, EuiSelect } from '@elastic/eui';
+import { VectorStyle } from '../vector_style';
+import { i18n } from '@kbn/i18n';
+
+export class StylePropEditor extends Component {
+  _prevStaticStyleOptions = this.props.defaultStaticStyleOptions;
+  _prevDynamicStyleOptions = this.props.defaultDynamicStyleOptions;
+
+  _onTypeToggle = () => {
+    if (this.props.styleProperty.isDynamic()) {
+      // preserve current dynmaic style
+      this._prevDynamicStyleOptions = this.props.styleProperty.getOptions();
+      // toggle to static style
+      this.props.onStaticStyleChange(
+        this.props.styleProperty.getStyleName(),
+        this._prevStaticStyleOptions
+      );
+    } else {
+      // preserve current static style
+      this._prevStaticStyleOptions = this.props.styleProperty.getOptions();
+      // toggle to dynamic style
+      this.props.onDynamicStyleChange(
+        this.props.styleProperty.getStyleName(),
+        this._prevDynamicStyleOptions
+      );
+    }
+  };
+
+  _onFieldMetaOptionsChange = fieldMetaOptions => {
+    const options = {
+      ...this.props.styleProperty.getOptions(),
+      fieldMetaOptions,
+    };
+    this.props.onDynamicStyleChange(this.props.styleProperty.getStyleName(), options);
+  };
+
+  renderStaticDynamicSelect() {
+    const options = [
+      {
+        value: VectorStyle.STYLE_TYPE.STATIC,
+        text: this.props.customStaticOptionLabel
+          ? this.props.customStaticOptionLabel
+          : i18n.translate('xpack.maps.styles.staticDynamicSelect.staticLabel', {
+              defaultMessage: 'Fixed',
+            }),
+      },
+      {
+        value: VectorStyle.STYLE_TYPE.DYNAMIC,
+        text: i18n.translate('xpack.maps.styles.staticDynamicSelect.dynamicLabel', {
+          defaultMessage: 'By value',
+        }),
+      },
+    ];
+
+    return (
+      <EuiSelect
+        options={options}
+        value={
+          this.props.styleProperty.isDynamic()
+            ? VectorStyle.STYLE_TYPE.DYNAMIC
+            : VectorStyle.STYLE_TYPE.STATIC
+        }
+        onChange={this._onTypeToggle}
+        disabled={this.props.fields.length === 0}
+        aria-label={i18n.translate('xpack.maps.styles.staticDynamicSelect.ariaLabel', {
+          defaultMessage: 'Select to style by fixed value or by data value',
+        })}
+        compressed
+      />
+    );
+  }
+
+  render() {
+    const fieldMetaOptionsPopover = this.props.styleProperty.isDynamic() ? (
+      <FieldMetaOptionsPopover
+        styleProperty={this.props.styleProperty}
+        onChange={this._onFieldMetaOptionsChange}
+      />
+    ) : null;
+
+    return (
+      <EuiFormRow
+        label={getVectorStyleLabel(this.props.styleProperty.getStyleName())}
+        display="rowCompressed"
+      >
+        <Fragment>
+          {React.cloneElement(this.props.children, {
+            staticDynamicSelect: this.renderStaticDynamicSelect(),
+          })}
+          {fieldMetaOptionsPopover}
+        </Fragment>
+      </EuiFormRow>
+    );
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
index 44f630db9d890e..8e80e036dbb8bc 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
@@ -12,8 +12,13 @@ import { VectorStyleColorEditor } from './color/vector_style_color_editor';
 import { VectorStyleSizeEditor } from './size/vector_style_size_editor';
 import { VectorStyleSymbolEditor } from './vector_style_symbol_editor';
 import { VectorStyleLabelEditor } from './label/vector_style_label_editor';
+import { VectorStyle } from '../vector_style';
 import { OrientationEditor } from './orientation/orientation_editor';
-import { getDefaultDynamicProperties, getDefaultStaticProperties } from '../vector_style_defaults';
+import {
+  getDefaultDynamicProperties,
+  getDefaultStaticProperties,
+  VECTOR_STYLES,
+} from '../vector_style_defaults';
 import { DEFAULT_FILL_COLORS, DEFAULT_LINE_COLORS } from '../../color_utils';
 import { VECTOR_SHAPE_TYPES } from '../../../sources/vector_feature_types';
 import { SYMBOLIZE_AS_ICON } from '../vector_constants';
@@ -128,15 +133,36 @@ export class VectorStyleEditor extends Component {
     this.props.onIsTimeAwareChange(event.target.checked);
   };
 
+  _onStaticStyleChange = (propertyName, options) => {
+    const styleDescriptor = {
+      type: VectorStyle.STYLE_TYPE.STATIC,
+      options,
+    };
+    this.props.handlePropertyChange(propertyName, styleDescriptor);
+  };
+
+  _onDynamicStyleChange = (propertyName, options) => {
+    const styleDescriptor = {
+      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      options,
+    };
+    this.props.handlePropertyChange(propertyName, styleDescriptor);
+  };
+
   _renderFillColor() {
     return (
       <VectorStyleColorEditor
         swatches={DEFAULT_FILL_COLORS}
-        handlePropertyChange={this.props.handlePropertyChange}
-        styleProperty={this.props.styleProperties.fillColor}
+        onStaticStyleChange={this._onStaticStyleChange}
+        onDynamicStyleChange={this._onDynamicStyleChange}
+        styleProperty={this.props.styleProperties[VECTOR_STYLES.FILL_COLOR]}
         fields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={this.state.defaultStaticProperties.fillColor.options}
-        defaultDynamicStyleOptions={this.state.defaultDynamicProperties.fillColor.options}
+        defaultStaticStyleOptions={
+          this.state.defaultStaticProperties[VECTOR_STYLES.FILL_COLOR].options
+        }
+        defaultDynamicStyleOptions={
+          this.state.defaultDynamicProperties[VECTOR_STYLES.FILL_COLOR].options
+        }
       />
     );
   }
@@ -145,11 +171,16 @@ export class VectorStyleEditor extends Component {
     return (
       <VectorStyleColorEditor
         swatches={DEFAULT_LINE_COLORS}
-        handlePropertyChange={this.props.handlePropertyChange}
-        styleProperty={this.props.styleProperties.lineColor}
+        onStaticStyleChange={this._onStaticStyleChange}
+        onDynamicStyleChange={this._onDynamicStyleChange}
+        styleProperty={this.props.styleProperties[VECTOR_STYLES.LINE_COLOR]}
         fields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={this.state.defaultStaticProperties.lineColor.options}
-        defaultDynamicStyleOptions={this.state.defaultDynamicProperties.lineColor.options}
+        defaultStaticStyleOptions={
+          this.state.defaultStaticProperties[VECTOR_STYLES.LINE_COLOR].options
+        }
+        defaultDynamicStyleOptions={
+          this.state.defaultDynamicProperties[VECTOR_STYLES.LINE_COLOR].options
+        }
       />
     );
   }
@@ -157,11 +188,16 @@ export class VectorStyleEditor extends Component {
   _renderLineWidth() {
     return (
       <VectorStyleSizeEditor
-        handlePropertyChange={this.props.handlePropertyChange}
-        styleProperty={this.props.styleProperties.lineWidth}
+        onStaticStyleChange={this._onStaticStyleChange}
+        onDynamicStyleChange={this._onDynamicStyleChange}
+        styleProperty={this.props.styleProperties[VECTOR_STYLES.LINE_WIDTH]}
         fields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={this.state.defaultStaticProperties.lineWidth.options}
-        defaultDynamicStyleOptions={this.state.defaultDynamicProperties.lineWidth.options}
+        defaultStaticStyleOptions={
+          this.state.defaultStaticProperties[VECTOR_STYLES.LINE_WIDTH].options
+        }
+        defaultDynamicStyleOptions={
+          this.state.defaultDynamicProperties[VECTOR_STYLES.LINE_WIDTH].options
+        }
       />
     );
   }
@@ -169,11 +205,16 @@ export class VectorStyleEditor extends Component {
   _renderSymbolSize() {
     return (
       <VectorStyleSizeEditor
-        handlePropertyChange={this.props.handlePropertyChange}
-        styleProperty={this.props.styleProperties.iconSize}
+        onStaticStyleChange={this._onStaticStyleChange}
+        onDynamicStyleChange={this._onDynamicStyleChange}
+        styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON_SIZE]}
         fields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={this.state.defaultStaticProperties.iconSize.options}
-        defaultDynamicStyleOptions={this.state.defaultDynamicProperties.iconSize.options}
+        defaultStaticStyleOptions={
+          this.state.defaultStaticProperties[VECTOR_STYLES.ICON_SIZE].options
+        }
+        defaultDynamicStyleOptions={
+          this.state.defaultDynamicProperties[VECTOR_STYLES.ICON_SIZE].options
+        }
       />
     );
   }
@@ -182,30 +223,45 @@ export class VectorStyleEditor extends Component {
     return (
       <Fragment>
         <VectorStyleLabelEditor
-          handlePropertyChange={this.props.handlePropertyChange}
-          styleProperty={this.props.styleProperties.labelText}
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.LABEL_TEXT]}
           fields={this.state.fields}
-          defaultStaticStyleOptions={this.state.defaultStaticProperties.labelText.options}
-          defaultDynamicStyleOptions={this.state.defaultDynamicProperties.labelText.options}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_TEXT].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.LABEL_TEXT].options
+          }
         />
         <EuiSpacer size="m" />
 
         <VectorStyleColorEditor
           swatches={DEFAULT_LINE_COLORS}
-          handlePropertyChange={this.props.handlePropertyChange}
-          styleProperty={this.props.styleProperties.labelColor}
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.LABEL_COLOR]}
           fields={this._getOrdinalFields()}
-          defaultStaticStyleOptions={this.state.defaultStaticProperties.labelColor.options}
-          defaultDynamicStyleOptions={this.state.defaultDynamicProperties.labelColor.options}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_COLOR].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.LABEL_COLOR].options
+          }
         />
         <EuiSpacer size="m" />
 
         <VectorStyleSizeEditor
-          handlePropertyChange={this.props.handlePropertyChange}
-          styleProperty={this.props.styleProperties.labelSize}
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.LABEL_SIZE]}
           fields={this._getOrdinalFields()}
-          defaultStaticStyleOptions={this.state.defaultStaticProperties.labelSize.options}
-          defaultDynamicStyleOptions={this.state.defaultDynamicProperties.labelSize.options}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_SIZE].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.LABEL_SIZE].options
+          }
         />
         <EuiSpacer size="m" />
       </Fragment>
@@ -217,11 +273,16 @@ export class VectorStyleEditor extends Component {
     if (this.props.symbolDescriptor.options.symbolizeAs === SYMBOLIZE_AS_ICON) {
       iconOrientation = (
         <OrientationEditor
-          handlePropertyChange={this.props.handlePropertyChange}
-          styleProperty={this.props.styleProperties.iconOrientation}
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON_ORIENTATION]}
           fields={this.state.numberFields}
-          defaultStaticStyleOptions={this.state.defaultStaticProperties.iconOrientation.options}
-          defaultDynamicStyleOptions={this.state.defaultDynamicProperties.iconOrientation.options}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.ICON_ORIENTATION].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.ICON_ORIENTATION].options
+          }
         />
       );
     }
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js b/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js
index c1b590f56ae526..b09ccdc3af8bae 100644
--- a/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js
+++ b/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js
@@ -31,32 +31,58 @@ export class VectorTileLayer extends TileLayer {
     return tileLayerDescriptor;
   }
 
+  _canSkipSync({ prevDataRequest, nextMeta }) {
+    if (!prevDataRequest) {
+      return false;
+    }
+    const prevMeta = prevDataRequest.getMeta();
+    if (!prevMeta) {
+      return false;
+    }
+
+    return prevMeta.tileLayerId === nextMeta.tileLayerId;
+  }
+
   async syncData({ startLoading, stopLoading, onLoadError, dataFilters }) {
     if (!this.isVisible() || !this.showAtZoomLevel(dataFilters.zoom)) {
       return;
     }
-    const sourceDataRequest = this.getSourceDataRequest();
-    if (sourceDataRequest) {
-      //data is immmutable
+
+    const nextMeta = { tileLayerId: this._source.getTileLayerId() };
+    const canSkipSync = this._canSkipSync({
+      prevDataRequest: this.getSourceDataRequest(),
+      nextMeta,
+    });
+    if (canSkipSync) {
       return;
     }
+
     const requestToken = Symbol(`layer-source-refresh:${this.getId()} - source`);
-    startLoading(SOURCE_DATA_ID_ORIGIN, requestToken, dataFilters);
     try {
+      startLoading(SOURCE_DATA_ID_ORIGIN, requestToken, dataFilters);
       const styleAndSprites = await this._source.getVectorStyleSheetAndSpriteMeta(isRetina());
       const spriteSheetImageData = await loadSpriteSheetImageData(styleAndSprites.spriteMeta.png);
       const data = {
         ...styleAndSprites,
         spriteSheetImageData,
       };
-      stopLoading(SOURCE_DATA_ID_ORIGIN, requestToken, data, {});
+      stopLoading(SOURCE_DATA_ID_ORIGIN, requestToken, data, nextMeta);
     } catch (error) {
       onLoadError(SOURCE_DATA_ID_ORIGIN, requestToken, error.message);
     }
   }
 
   _generateMbId(name) {
-    return this.getId() + '_' + name;
+    return `${this.getId()}_${name}`;
+  }
+
+  _generateMbSourceIdPrefix() {
+    const DELIMITTER = '___';
+    return `${this.getId()}${DELIMITTER}${this._source.getTileLayerId()}${DELIMITTER}`;
+  }
+
+  _generateMbSourceId(name) {
+    return `${this._generateMbSourceIdPrefix()}${name}`;
   }
 
   _getVectorStyle() {
@@ -103,19 +129,15 @@ export class VectorTileLayer extends TileLayer {
       return [];
     }
     const sourceIds = Object.keys(vectorStyle.sources);
-    return sourceIds.map(sourceId => this._generateMbId(sourceId));
+    return sourceIds.map(sourceId => this._generateMbSourceId(sourceId));
   }
 
   ownsMbLayerId(mbLayerId) {
-    //todo optimize: do not create temp array
-    const mbLayerIds = this.getMbLayerIds();
-    return mbLayerIds.indexOf(mbLayerId) >= 0;
+    return mbLayerId.startsWith(this.getId());
   }
 
   ownsMbSourceId(mbSourceId) {
-    //todo optimize: do not create temp array
-    const mbSourceIds = this.getMbSourceIds();
-    return mbSourceIds.indexOf(mbSourceId) >= 0;
+    return mbSourceId.startsWith(this.getId());
   }
 
   _makeNamespacedImageId(imageId) {
@@ -123,19 +145,43 @@ export class VectorTileLayer extends TileLayer {
     return prefix + imageId;
   }
 
+  _requiresPrevSourceCleanup(mbMap) {
+    const sourceIdPrefix = this._generateMbSourceIdPrefix();
+    const mbStyle = mbMap.getStyle();
+    return Object.keys(mbStyle.sources).some(mbSourceId => {
+      const doesMbSourceBelongToLayer = this.ownsMbSourceId(mbSourceId);
+      const doesMbSourceBelongToSource = mbSourceId.startsWith(sourceIdPrefix);
+      return doesMbSourceBelongToLayer && !doesMbSourceBelongToSource;
+    });
+  }
+
   syncLayerWithMB(mbMap) {
     const vectorStyle = this._getVectorStyle();
     if (!vectorStyle) {
       return;
     }
 
+    if (this._requiresPrevSourceCleanup(mbMap)) {
+      const mbStyle = mbMap.getStyle();
+      mbStyle.layers.forEach(mbLayer => {
+        if (this.ownsMbLayerId(mbLayer.id)) {
+          mbMap.removeLayer(mbLayer.id);
+        }
+      });
+      Object.keys(mbStyle.sources).some(mbSourceId => {
+        if (this.ownsMbSourceId(mbSourceId)) {
+          mbMap.removeSource(mbSourceId);
+        }
+      });
+    }
+
     let initialBootstrapCompleted = false;
     const sourceIds = Object.keys(vectorStyle.sources);
     sourceIds.forEach(sourceId => {
       if (initialBootstrapCompleted) {
         return;
       }
-      const mbSourceId = this._generateMbId(sourceId);
+      const mbSourceId = this._generateMbSourceId(sourceId);
       const mbSource = mbMap.getSource(mbSourceId);
       if (mbSource) {
         //if a single source is present, the layer already has bootstrapped with the mbMap
@@ -174,7 +220,7 @@ export class VectorTileLayer extends TileLayer {
         }
         const newLayerObject = {
           ...layer,
-          source: this._generateMbId(layer.source),
+          source: this._generateMbSourceId(layer.source),
           id: mbLayerId,
         };
 
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js
index 6d078ae35ef850..848c964f4b6d4a 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js
@@ -5,10 +5,16 @@
  */
 
 import _ from 'lodash';
-import { EMS_FILE, ES_GEO_FIELD_TYPE, MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
+import {
+  EMS_FILE,
+  ES_GEO_FIELD_TYPE,
+  MAP_SAVED_OBJECT_TYPE,
+  TELEMETRY_TYPE,
+} from '../../common/constants';
 
-function getSavedObjectsClient(server, callCluster) {
+function getSavedObjectsClient(server) {
   const { SavedObjectsClient, getSavedObjectsRepository } = server.savedObjects;
+  const callCluster = server.plugins.elasticsearch.getCluster('admin').callWithInternalUser;
   const internalRepository = getSavedObjectsRepository(callCluster);
   return new SavedObjectsClient(internalRepository);
 }
@@ -79,7 +85,7 @@ export function buildMapsTelemetry({ mapSavedObjects, indexPatternSavedObjects,
     // Total count of maps
     mapsTotalCount: mapsCount,
     // Time of capture
-    timeCaptured: new Date(),
+    timeCaptured: new Date().toISOString(),
     attributesPerMap: {
       // Count of data sources per map
       dataSourcesCount: {
@@ -115,16 +121,16 @@ async function getIndexPatternSavedObjects(savedObjectsClient) {
   return _.get(indexPatternSavedObjects, 'saved_objects', []);
 }
 
-export async function getMapsTelemetry(server, callCluster) {
-  const savedObjectsClient = getSavedObjectsClient(server, callCluster);
+export async function getMapsTelemetry(server) {
+  const savedObjectsClient = getSavedObjectsClient(server);
   const mapSavedObjects = await getMapSavedObjects(savedObjectsClient);
   const indexPatternSavedObjects = await getIndexPatternSavedObjects(savedObjectsClient);
   const settings = {
     showMapVisualizationTypes: server.config().get('xpack.maps.showMapVisualizationTypes'),
   };
   const mapsTelemetry = buildMapsTelemetry({ mapSavedObjects, indexPatternSavedObjects, settings });
-  return await savedObjectsClient.create('maps-telemetry', mapsTelemetry, {
-    id: 'maps-telemetry',
+  return await savedObjectsClient.create(TELEMETRY_TYPE, mapsTelemetry, {
+    id: TELEMETRY_TYPE,
     overwrite: true,
   });
 }
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 d1011736e77f8d..9c575e66f75567 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
@@ -4,85 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import _ from 'lodash';
-import { TASK_ID, scheduleTask, registerMapsTelemetryTask } from './telemetry_task';
+import { getMapsTelemetry } from './maps_telemetry';
+import { TELEMETRY_TYPE } from '../../common/constants';
 
 export function initTelemetryCollection(usageCollection, server) {
-  registerMapsTelemetryTask(server);
-  scheduleTask(server);
-  registerMapsUsageCollector(usageCollection, server);
-}
-
-async function isTaskManagerReady(server) {
-  const result = await fetch(server);
-  return result !== null;
-}
-
-async function fetch(server) {
-  let docs;
-  const taskManager = server.plugins.task_manager;
-
-  if (!taskManager) {
-    return null;
-  }
-
-  try {
-    ({ docs } = await taskManager.fetch({
-      query: {
-        bool: {
-          filter: {
-            term: {
-              _id: `task:${TASK_ID}`,
-            },
-          },
-        },
-      },
-    }));
-  } catch (err) {
-    const errMessage = err && err.message ? err.message : err.toString();
-    /*
-     * The usage service WILL to try to fetch from this collector before the task manager has been initialized, because the task manager
-     * has to wait for all plugins to initialize first.
-     * It's fine to ignore it as next time around it will be initialized (or it will throw a different type of error)
-     */
-    if (errMessage.indexOf('NotInitialized') >= 0) {
-      return null;
-    } else {
-      throw err;
-    }
+  if (!usageCollection) {
+    return;
   }
 
-  return docs;
-}
-
-export function buildCollectorObj(server) {
-  let isCollectorReady = false;
-  async function determineIfTaskManagerIsReady() {
-    let isReady = false;
-    try {
-      isReady = await isTaskManagerReady(server);
-    } catch (err) {} // eslint-disable-line
-
-    if (isReady) {
-      isCollectorReady = true;
-    } else {
-      setTimeout(determineIfTaskManagerIsReady, 500);
-    }
-  }
-  determineIfTaskManagerIsReady();
-
-  return {
-    type: 'maps',
-    isReady: () => isCollectorReady,
-    fetch: async () => {
-      const docs = await fetch(server);
-      return _.get(docs, '[0].state.stats');
-    },
-  };
-}
+  const mapsUsageCollector = usageCollection.makeUsageCollector({
+    type: TELEMETRY_TYPE,
+    isReady: () => true,
+    fetch: async () => await getMapsTelemetry(server),
+  });
 
-export function registerMapsUsageCollector(usageCollection, server) {
-  const collectorObj = buildCollectorObj(server);
-  const mapsUsageCollector = usageCollection.makeUsageCollector(collectorObj);
   usageCollection.registerCollector(mapsUsageCollector);
 }
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.test.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.test.js
index 727d60b5088aaf..c5a3fca89b5608 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.test.js
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.test.js
@@ -4,60 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import sinon from 'sinon';
-import { getMockCallWithInternal, getMockKbnServer, getMockTaskFetch } from '../test_utils';
-import { buildCollectorObj } from './maps_usage_collector';
+import { initTelemetryCollection } from './maps_usage_collector';
 
 describe('buildCollectorObj#fetch', () => {
-  let mockKbnServer;
+  let makeUsageCollectorStub;
+  let registerStub;
+  let usageCollection;
 
   beforeEach(() => {
-    mockKbnServer = getMockKbnServer();
+    makeUsageCollectorStub = jest.fn();
+    registerStub = jest.fn();
+    usageCollection = {
+      makeUsageCollector: makeUsageCollectorStub,
+      registerCollector: registerStub,
+    };
   });
 
-  test('can return empty stats', async () => {
-    const { type, fetch } = buildCollectorObj(mockKbnServer);
-    expect(type).toBe('maps');
-    const fetchResult = await fetch();
-    expect(fetchResult).toEqual({});
-  });
-
-  test('provides known stats', async () => {
-    const mockTaskFetch = getMockTaskFetch([
-      {
-        state: {
-          runs: 2,
-          stats: { wombat_sightings: { total: 712, max: 84, min: 7, avg: 63 } },
-        },
-      },
-    ]);
-    mockKbnServer = getMockKbnServer(getMockCallWithInternal(), mockTaskFetch);
-
-    const { type, fetch } = buildCollectorObj(mockKbnServer);
-    expect(type).toBe('maps');
-    const fetchResult = await fetch();
-    expect(fetchResult).toEqual({ wombat_sightings: { total: 712, max: 84, min: 7, avg: 63 } });
-  });
-
-  describe('Error handling', () => {
-    test('Silently handles Task Manager NotInitialized', async () => {
-      const mockTaskFetch = sinon.stub();
-      mockTaskFetch.rejects(
-        new Error('NotInitialized taskManager is still waiting for plugins to load')
-      );
-      mockKbnServer = getMockKbnServer(getMockCallWithInternal(), mockTaskFetch);
-
-      const { fetch } = buildCollectorObj(mockKbnServer);
-      await expect(fetch()).resolves.toBe(undefined);
-    });
-    // In real life, the CollectorSet calls fetch and handles errors
-    test('defers the errors', async () => {
-      const mockTaskFetch = sinon.stub();
-      mockTaskFetch.rejects(new Error('Sad violin'));
-      mockKbnServer = getMockKbnServer(getMockCallWithInternal(), mockTaskFetch);
+  test('makes and registers maps usage collector', async () => {
+    const serverPlaceholder = {};
+    initTelemetryCollection(usageCollection, serverPlaceholder);
 
-      const { fetch } = buildCollectorObj(mockKbnServer);
-      await expect(fetch()).rejects.toMatchObject(new Error('Sad violin'));
+    expect(registerStub).toHaveBeenCalledTimes(1);
+    expect(makeUsageCollectorStub).toHaveBeenCalledTimes(1);
+    expect(makeUsageCollectorStub).toHaveBeenCalledWith({
+      type: expect.any(String),
+      isReady: expect.any(Function),
+      fetch: expect.any(Function),
     });
   });
 });
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.js
deleted file mode 100644
index db5df358abc39f..00000000000000
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.js
+++ /dev/null
@@ -1,125 +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 { getMapsTelemetry } from './maps_telemetry';
-
-const TELEMETRY_TASK_TYPE = 'maps_telemetry';
-
-export const TASK_ID = `Maps-${TELEMETRY_TASK_TYPE}`;
-
-export function scheduleTask(server) {
-  const taskManager = server.plugins.task_manager;
-
-  if (!taskManager) {
-    server.log(['debug', 'telemetry'], `Task manager is not available`);
-    return;
-  }
-
-  const { kbnServer } = server.plugins.xpack_main.status.plugin;
-
-  kbnServer.afterPluginsInit(() => {
-    // The code block below can't await directly within "afterPluginsInit"
-    // callback due to circular dependency. The server isn't "ready" until
-    // this code block finishes. Migrations wait for server to be ready before
-    // executing. Saved objects repository waits for migrations to finish before
-    // finishing the request. To avoid this, we'll await within a separate
-    // function block.
-    (async () => {
-      try {
-        await taskManager.ensureScheduled({
-          id: TASK_ID,
-          taskType: TELEMETRY_TASK_TYPE,
-          state: { stats: {}, runs: 0 },
-        });
-      } catch (e) {
-        server.log(['warning', 'maps'], `Error scheduling telemetry task, received ${e.message}`);
-      }
-    })();
-  });
-}
-
-export function registerMapsTelemetryTask(server) {
-  const taskManager = server.plugins.task_manager;
-
-  if (!taskManager) {
-    server.log(['debug', 'telemetry'], `Task manager is not available`);
-    return;
-  }
-
-  taskManager.registerTaskDefinitions({
-    [TELEMETRY_TASK_TYPE]: {
-      title: 'Maps telemetry fetch task',
-      type: TELEMETRY_TASK_TYPE,
-      timeout: '1m',
-      createTaskRunner: telemetryTaskRunner(server),
-    },
-  });
-}
-
-export function telemetryTaskRunner(server) {
-  return ({ taskInstance }) => {
-    const { state } = taskInstance;
-    const prevState = state;
-
-    const callCluster = server.plugins.elasticsearch.getCluster('admin').callWithInternalUser;
-
-    let mapsTelemetryTask;
-
-    return {
-      async run({ taskCanceled = false } = {}) {
-        try {
-          mapsTelemetryTask = makeCancelable(getMapsTelemetry(server, callCluster), taskCanceled);
-        } catch (err) {
-          server.log(['warning'], `Error loading maps telemetry: ${err}`);
-        } finally {
-          return mapsTelemetryTask.promise
-            .then((mapsTelemetry = {}) => {
-              return {
-                state: {
-                  runs: state.runs || 0 + 1,
-                  stats: mapsTelemetry.attributes || prevState.stats || {},
-                },
-                runAt: getNextMidnight(),
-              };
-            })
-            .catch(errMsg =>
-              server.log(['warning'], `Error executing maps telemetry task: ${errMsg}`)
-            );
-        }
-      },
-      async cancel() {
-        if (mapsTelemetryTask) {
-          mapsTelemetryTask.cancel();
-        } else {
-          server.log(['warning'], `Can not cancel "mapsTelemetryTask", it has not been defined`);
-        }
-      },
-    };
-  };
-}
-
-function makeCancelable(promise, isCanceled) {
-  const logMsg = 'Maps telemetry task has been cancelled';
-  const wrappedPromise = new Promise((resolve, reject) => {
-    promise
-      .then(val => (isCanceled ? reject(logMsg) : resolve(val)))
-      .catch(err => (isCanceled ? reject(logMsg) : reject(err.message)));
-  });
-
-  return {
-    promise: wrappedPromise,
-    cancel() {
-      isCanceled = true;
-    },
-  };
-}
-
-function getNextMidnight() {
-  const nextMidnight = new Date();
-  nextMidnight.setHours(0, 0, 0, 0);
-  nextMidnight.setDate(nextMidnight.getDate() + 1);
-  return nextMidnight;
-}
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.test.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.test.js
deleted file mode 100644
index ad23ed16342040..00000000000000
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.test.js
+++ /dev/null
@@ -1,68 +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 { getMockKbnServer, getMockTaskInstance } from '../test_utils';
-import { telemetryTaskRunner } from './telemetry_task';
-import * as mapsTelemetry from './maps_telemetry';
-jest.mock('./maps_telemetry');
-
-const expectedAttributes = {
-  expect: 'values',
-  toBe: 'populated',
-};
-
-const generateTelemetry = ({ includeAttributes = true } = {}) => {
-  mapsTelemetry.getMapsTelemetry = async () => ({ // eslint-disable-line
-    attributes: includeAttributes ? expectedAttributes : {},
-  });
-};
-
-describe('telemetryTaskRunner', () => {
-  let mockTaskInstance;
-  let mockKbnServer;
-  let taskRunner;
-
-  beforeEach(() => {
-    mockTaskInstance = getMockTaskInstance();
-    mockKbnServer = getMockKbnServer();
-    taskRunner = telemetryTaskRunner(mockKbnServer)({ taskInstance: mockTaskInstance });
-  });
-
-  test('returns empty stats as default', async () => {
-    generateTelemetry({ includeAttributes: false });
-
-    const runResult = await taskRunner.run();
-
-    expect(runResult).toMatchObject({
-      state: {
-        runs: 1,
-        stats: {},
-      },
-    });
-  });
-
-  // Return stats when run normally
-  test('returns stats normally', async () => {
-    generateTelemetry();
-
-    const runResult = await taskRunner.run();
-
-    expect(runResult).toMatchObject({
-      state: {
-        runs: 1,
-        stats: expectedAttributes,
-      },
-    });
-  });
-
-  test('cancels when cancel flag set to "true", returns undefined', async () => {
-    generateTelemetry();
-
-    const runResult = await taskRunner.run({ taskCanceled: true });
-
-    expect(runResult).toBe(undefined);
-  });
-});
diff --git a/x-pack/legacy/plugins/ml/common/util/job_utils.js b/x-pack/legacy/plugins/ml/common/util/job_utils.js
index 757dfbd7a9a771..8982cebed522e8 100644
--- a/x-pack/legacy/plugins/ml/common/util/job_utils.js
+++ b/x-pack/legacy/plugins/ml/common/util/job_utils.js
@@ -521,7 +521,7 @@ export function validateModelMemoryLimitUnits(modelMemoryLimit) {
   let valid = true;
 
   if (modelMemoryLimit !== undefined) {
-    const mml = modelMemoryLimit.toUpperCase();
+    const mml = String(modelMemoryLimit).toUpperCase();
     const mmlSplit = mml.match(/\d+(\w+)$/);
     const unit = mmlSplit && mmlSplit.length === 2 ? mmlSplit[1] : null;
 
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
index cadc1f01c6dda3..3dd98395ef701d 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
@@ -58,6 +58,23 @@ export enum INDEX_STATUS {
   ERROR,
 }
 
+export interface FieldSelectionItem {
+  name: string;
+  mappings_types: string[];
+  is_included: boolean;
+  is_required: boolean;
+  feature_type?: string;
+  reason?: string;
+}
+
+export interface DfAnalyticsExplainResponse {
+  field_selection: FieldSelectionItem[];
+  memory_estimation: {
+    expected_memory_without_disk: string;
+    expected_memory_with_disk: string;
+  };
+}
+
 export interface Eval {
   meanSquaredError: number | string;
   rSquared: number | string;
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.test.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.test.tsx
index 0d4daee373b137..d01bae96167084 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.test.tsx
@@ -40,7 +40,7 @@ describe('Data Frame Analytics: <CreateAnalyticsForm />', () => {
     );
 
     const euiFormRows = wrapper.find('EuiFormRow');
-    expect(euiFormRows.length).toBe(8);
+    expect(euiFormRows.length).toBe(9);
 
     const row1 = euiFormRows.at(0);
     expect(row1.find('label').text()).toBe('Job type');
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
index 0815b8dbd8d3de..e68523733254e7 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
@@ -8,6 +8,7 @@ import React, { Fragment, FC, useEffect } from 'react';
 
 import {
   EuiComboBox,
+  EuiComboBoxOptionProps,
   EuiForm,
   EuiFieldText,
   EuiFormRow,
@@ -22,8 +23,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { metadata } from 'ui/metadata';
 import { ml } from '../../../../../services/ml_api_service';
-import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
-
+import { Field } from '../../../../../../../common/types/fields';
 import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
 import { useKibanaContext } from '../../../../../contexts/kibana';
 import { CreateAnalyticsFormProps } from '../../hooks/use_create_analytics_form';
@@ -41,22 +41,8 @@ import {
   IndexPattern,
   indexPatterns,
 } from '../../../../../../../../../../../src/plugins/data/public';
-
-const NUMERICAL_FIELD_TYPES = new Set([
-  'long',
-  'integer',
-  'short',
-  'byte',
-  'double',
-  'float',
-  'half_float',
-  'scaled_float',
-]);
-
-const SUPPORTED_CLASSIFICATION_FIELD_TYPES = new Set(['boolean', 'text', 'keyword', 'ip']);
-
-// List of system fields we want to ignore for the numeric field check.
-const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
+import { DfAnalyticsExplainResponse, FieldSelectionItem } from '../../../../common/analytics';
+import { shouldAddAsDepVarOption, OMIT_FIELDS } from './form_options_validation';
 
 export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, state }) => {
   const { setFormState } = actions;
@@ -74,15 +60,22 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
     destinationIndexNameExists,
     destinationIndexNameValid,
     destinationIndexPatternTitleExists,
+    excludes,
+    excludesOptions,
+    fieldOptionsFetchFail,
     jobId,
     jobIdEmpty,
     jobIdExists,
     jobIdValid,
     jobIdInvalidMaxLength,
     jobType,
-    loadingDepFieldOptions,
+    loadingDepVarOptions,
+    loadingFieldOptions,
+    maxDistinctValuesError,
     modelMemoryLimit,
     modelMemoryLimitUnitValid,
+    previousJobType,
+    previousSourceIndex,
     sourceIndex,
     sourceIndexNameEmpty,
     sourceIndexNameValid,
@@ -92,6 +85,9 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
   } = form;
   const characterList = indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.join(', ');
 
+  const isJobTypeWithDepVar =
+    jobType === JOB_TYPES.REGRESSION || jobType === JOB_TYPES.CLASSIFICATION;
+
   // Find out if index pattern contain numeric fields. Provides a hint in the form
   // that an analytics jobs is not able to identify outliers if there are no numeric fields present.
   const validateSourceIndexFields = async () => {
@@ -114,42 +110,99 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
     }
   };
 
-  // Regression supports numeric fields. Classification supports numeric, boolean, text, keyword and ip.
-  const shouldAddFieldOption = (field: Field) => {
-    if (field.id === EVENT_RATE_FIELD_ID) return false;
+  const onCreateOption = (searchValue: string, flattenedOptions: EuiComboBoxOptionProps[]) => {
+    const normalizedSearchValue = searchValue.trim().toLowerCase();
+
+    if (!normalizedSearchValue) {
+      return;
+    }
 
-    const isNumerical = NUMERICAL_FIELD_TYPES.has(field.type);
-    const isSupportedByClassification =
-      isNumerical || SUPPORTED_CLASSIFICATION_FIELD_TYPES.has(field.type);
+    const newOption = {
+      label: searchValue,
+    };
 
-    if (jobType === JOB_TYPES.REGRESSION) return isNumerical;
-    if (jobType === JOB_TYPES.CLASSIFICATION) return isNumerical || isSupportedByClassification;
+    // Create the option if it doesn't exist.
+    if (
+      !flattenedOptions.some(
+        (option: EuiComboBoxOptionProps) =>
+          option.label.trim().toLowerCase() === normalizedSearchValue
+      )
+    ) {
+      excludesOptions.push(newOption);
+      setFormState({ excludes: [...excludes, newOption.label] });
+    }
   };
 
-  const debouncedMmlEstimateLoad = debounce(async () => {
+  const debouncedGetExplainData = debounce(async () => {
+    // Reset if sourceIndex or jobType changes (jobType requires dependent_variable to be set -
+    // which won't be the case if switching from outlier detection)
+    if (previousSourceIndex !== sourceIndex || previousJobType !== jobType) {
+      setFormState({
+        loadingFieldOptions: true,
+      });
+    }
+
     try {
       const jobConfig = getJobConfigFromFormState(form);
       delete jobConfig.dest;
       delete jobConfig.model_memory_limit;
-      const resp = await ml.dataFrameAnalytics.estimateDataFrameAnalyticsMemoryUsage(jobConfig);
-      setFormState({
-        modelMemoryLimit: resp.memory_estimation?.expected_memory_without_disk,
-      });
+      delete jobConfig.analyzed_fields;
+      const resp: DfAnalyticsExplainResponse = await ml.dataFrameAnalytics.explainDataFrameAnalytics(
+        jobConfig
+      );
+
+      // If sourceIndex has changed load analysis field options again
+      if (previousSourceIndex !== sourceIndex || previousJobType !== jobType) {
+        const analyzedFieldsOptions: EuiComboBoxOptionProps[] = [];
+
+        if (resp.field_selection) {
+          resp.field_selection.forEach((selectedField: FieldSelectionItem) => {
+            if (selectedField.is_included === true && selectedField.name !== dependentVariable) {
+              analyzedFieldsOptions.push({ label: selectedField.name });
+            }
+          });
+        }
+
+        setFormState({
+          modelMemoryLimit: resp.memory_estimation?.expected_memory_without_disk,
+          excludesOptions: analyzedFieldsOptions,
+          loadingFieldOptions: false,
+          fieldOptionsFetchFail: false,
+          maxDistinctValuesError: undefined,
+        });
+      } else {
+        setFormState({
+          modelMemoryLimit: resp.memory_estimation?.expected_memory_without_disk,
+        });
+      }
     } catch (e) {
+      let errorMessage;
+      if (
+        jobType === JOB_TYPES.CLASSIFICATION &&
+        e.message !== undefined &&
+        e.message.includes('status_exception') &&
+        e.message.includes('must have at most')
+      ) {
+        errorMessage = e.message;
+      }
       setFormState({
+        fieldOptionsFetchFail: true,
+        maxDistinctValuesError: errorMessage,
+        loadingFieldOptions: false,
         modelMemoryLimit:
           jobType !== undefined
             ? DEFAULT_MODEL_MEMORY_LIMIT[jobType]
             : DEFAULT_MODEL_MEMORY_LIMIT.outlier_detection,
       });
     }
-  }, 500);
+  }, 400);
 
-  const loadDependentFieldOptions = async () => {
+  const loadDepVarOptions = async () => {
     setFormState({
-      loadingDepFieldOptions: true,
+      loadingDepVarOptions: true,
+      // clear when the source index changes
       dependentVariable: '',
-      // Reset outlier detection sourceIndex checks to default values if we've switched to regression
+      maxDistinctValuesError: undefined,
       sourceIndexFieldsCheckFailed: false,
       sourceIndexContainsNumericalFields: true,
     });
@@ -162,22 +215,23 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
         await newJobCapsService.initializeFromIndexPattern(indexPattern);
         // Get fields and filter for supported types for job type
         const { fields } = newJobCapsService;
-        const options: Array<{ label: string }> = [];
+
+        const depVarOptions: EuiComboBoxOptionProps[] = [];
 
         fields.forEach((field: Field) => {
-          if (shouldAddFieldOption(field)) {
-            options.push({ label: field.id });
+          if (shouldAddAsDepVarOption(field, jobType)) {
+            depVarOptions.push({ label: field.id });
           }
         });
 
         setFormState({
-          dependentVariableOptions: options,
-          loadingDepFieldOptions: false,
+          dependentVariableOptions: depVarOptions,
+          loadingDepVarOptions: false,
           dependentVariableFetchFail: false,
         });
       }
     } catch (e) {
-      setFormState({ loadingDepFieldOptions: false, dependentVariableFetchFail: true });
+      setFormState({ loadingDepVarOptions: false, dependentVariableFetchFail: true });
     }
   };
 
@@ -209,13 +263,21 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
     return errors;
   };
 
+  const onSourceIndexChange = (selectedOptions: EuiComboBoxOptionProps[]) => {
+    setFormState({
+      excludes: [],
+      excludesOptions: [],
+      previousSourceIndex: sourceIndex,
+      sourceIndex: selectedOptions[0].label || '',
+    });
+  };
+
   useEffect(() => {
-    if (
-      (jobType === JOB_TYPES.REGRESSION || jobType === JOB_TYPES.CLASSIFICATION) &&
-      sourceIndexNameEmpty === false
-    ) {
-      loadDependentFieldOptions();
-    } else if (jobType === JOB_TYPES.OUTLIER_DETECTION && sourceIndexNameEmpty === false) {
+    if (isJobTypeWithDepVar && sourceIndexNameEmpty === false) {
+      loadDepVarOptions();
+    }
+
+    if (jobType === JOB_TYPES.OUTLIER_DETECTION && sourceIndexNameEmpty === false) {
       validateSourceIndexFields();
     }
   }, [sourceIndex, jobType, sourceIndexNameEmpty]);
@@ -223,21 +285,18 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
   useEffect(() => {
     const hasBasicRequiredFields =
       jobType !== undefined && sourceIndex !== '' && sourceIndexNameValid === true;
-    const jobTypesWithDepVar =
-      jobType === JOB_TYPES.REGRESSION || jobType === JOB_TYPES.CLASSIFICATION;
 
     const hasRequiredAnalysisFields =
-      (jobTypesWithDepVar && dependentVariable !== '' && trainingPercent !== undefined) ||
-      jobType === JOB_TYPES.OUTLIER_DETECTION;
+      (isJobTypeWithDepVar && dependentVariable !== '') || jobType === JOB_TYPES.OUTLIER_DETECTION;
 
     if (hasBasicRequiredFields && hasRequiredAnalysisFields) {
-      debouncedMmlEstimateLoad();
+      debouncedGetExplainData();
     }
 
     return () => {
-      debouncedMmlEstimateLoad.cancel();
+      debouncedGetExplainData.cancel();
     };
-  }, [jobType, sourceIndex, dependentVariable, trainingPercent]);
+  }, [jobType, sourceIndex, sourceIndexNameEmpty, dependentVariable, trainingPercent]);
 
   return (
     <EuiForm className="mlDataFrameAnalyticsCreateForm">
@@ -354,9 +413,7 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
                   selectedOptions={
                     indexPatternsMap[sourceIndex] !== undefined ? [{ label: sourceIndex }] : []
                   }
-                  onChange={selectedOptions =>
-                    setFormState({ sourceIndex: selectedOptions[0].label || '' })
-                  }
+                  onChange={onSourceIndexChange}
                   isClearable={false}
                   data-test-subj="mlAnalyticsCreateJobFlyoutSourceIndexSelect"
                 />
@@ -430,6 +487,27 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
           </EuiFormRow>
           {(jobType === JOB_TYPES.REGRESSION || jobType === JOB_TYPES.CLASSIFICATION) && (
             <Fragment>
+              <EuiFormRow
+                fullWidth
+                isInvalid={maxDistinctValuesError !== undefined}
+                error={[
+                  ...(fieldOptionsFetchFail === true && maxDistinctValuesError !== undefined
+                    ? [
+                        <Fragment>
+                          {i18n.translate(
+                            'xpack.ml.dataframe.analytics.create.dependentVariableMaxDistictValuesError',
+                            {
+                              defaultMessage: 'Invalid. {message}',
+                              values: { message: maxDistinctValuesError },
+                            }
+                          )}
+                        </Fragment>,
+                      ]
+                    : []),
+                ]}
+              >
+                <Fragment />
+              </EuiFormRow>
               <EuiFormRow
                 label={i18n.translate(
                   'xpack.ml.dataframe.analytics.create.dependentVariableLabel',
@@ -448,19 +526,22 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
                     }
                   )
                 }
-                error={
-                  dependentVariableFetchFail === true && [
-                    <Fragment>
-                      {i18n.translate(
-                        'xpack.ml.dataframe.analytics.create.dependentVariableOptionsFetchError',
-                        {
-                          defaultMessage:
-                            'There was a problem fetching fields. Please refresh the page and try again.',
-                        }
-                      )}
-                    </Fragment>,
-                  ]
-                }
+                isInvalid={maxDistinctValuesError !== undefined}
+                error={[
+                  ...(dependentVariableFetchFail === true
+                    ? [
+                        <Fragment>
+                          {i18n.translate(
+                            'xpack.ml.dataframe.analytics.create.dependentVariableOptionsFetchError',
+                            {
+                              defaultMessage:
+                                'There was a problem fetching fields. Please refresh the page and try again.',
+                            }
+                          )}
+                        </Fragment>,
+                      ]
+                    : []),
+                ]}
               >
                 <EuiComboBox
                   aria-label={i18n.translate(
@@ -476,12 +557,14 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
                     }
                   )}
                   isDisabled={isJobCreated}
-                  isLoading={loadingDepFieldOptions}
+                  isLoading={loadingDepVarOptions}
                   singleSelection={true}
                   options={dependentVariableOptions}
                   selectedOptions={dependentVariable ? [{ label: dependentVariable }] : []}
                   onChange={selectedOptions =>
-                    setFormState({ dependentVariable: selectedOptions[0].label || '' })
+                    setFormState({
+                      dependentVariable: selectedOptions[0].label || '',
+                    })
                   }
                   isClearable={false}
                   isInvalid={dependentVariable === ''}
@@ -508,6 +591,49 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
               </EuiFormRow>
             </Fragment>
           )}
+          <EuiFormRow
+            label={i18n.translate('xpack.ml.dataframe.analytics.create.excludedFieldsLabel', {
+              defaultMessage: 'Excluded fields',
+            })}
+            helpText={i18n.translate('xpack.ml.dataframe.analytics.create.excludedFieldsHelpText', {
+              defaultMessage:
+                'Optionally select fields to be excluded from analysis. All other supported fields will be included',
+            })}
+            error={
+              excludesOptions.length === 0 &&
+              fieldOptionsFetchFail === false &&
+              !sourceIndexNameEmpty && [
+                i18n.translate(
+                  'xpack.ml.dataframe.analytics.create.excludesOptionsNoSupportedFields',
+                  {
+                    defaultMessage:
+                      'No supported analysis fields were found for this index pattern.',
+                  }
+                ),
+              ]
+            }
+          >
+            <EuiComboBox
+              aria-label={i18n.translate(
+                'xpack.ml.dataframe.analytics.create.excludesInputAriaLabel',
+                {
+                  defaultMessage: 'Optional. Enter or select field to be excluded.',
+                }
+              )}
+              isDisabled={isJobCreated}
+              isLoading={loadingFieldOptions}
+              options={excludesOptions}
+              selectedOptions={excludes.map(field => ({
+                label: field,
+              }))}
+              onCreateOption={onCreateOption}
+              onChange={selectedOptions =>
+                setFormState({ excludes: selectedOptions.map(option => option.label) })
+              }
+              isClearable={true}
+              data-test-subj="mlAnalyticsCreateJobFlyoutExcludesSelect"
+            />
+          </EuiFormRow>
           <EuiFormRow
             label={i18n.translate('xpack.ml.dataframe.analytics.create.modelMemoryLimitLabel', {
               defaultMessage: 'Model memory limit',
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/form_options_validation.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/form_options_validation.ts
new file mode 100644
index 00000000000000..337d3768f24088
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/form_options_validation.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ES_FIELD_TYPES } from '../../../../../../../../../../../src/plugins/data/public';
+import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
+import { JOB_TYPES, AnalyticsJobType } from '../../hooks/use_create_analytics_form/state';
+
+const BASIC_NUMERICAL_TYPES = new Set([
+  ES_FIELD_TYPES.LONG,
+  ES_FIELD_TYPES.INTEGER,
+  ES_FIELD_TYPES.SHORT,
+  ES_FIELD_TYPES.BYTE,
+]);
+
+const EXTENDED_NUMERICAL_TYPES = new Set([
+  ES_FIELD_TYPES.DOUBLE,
+  ES_FIELD_TYPES.FLOAT,
+  ES_FIELD_TYPES.HALF_FLOAT,
+  ES_FIELD_TYPES.SCALED_FLOAT,
+]);
+
+const CATEGORICAL_TYPES = new Set(['ip', 'keyword', 'text']);
+
+// List of system fields we want to ignore for the numeric field check.
+export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
+
+// Regression supports numeric fields. Classification supports categorical, numeric, and boolean.
+export const shouldAddAsDepVarOption = (field: Field, jobType: AnalyticsJobType) => {
+  if (field.id === EVENT_RATE_FIELD_ID) return false;
+
+  const isBasicNumerical = BASIC_NUMERICAL_TYPES.has(field.type);
+
+  const isSupportedByClassification =
+    isBasicNumerical || CATEGORICAL_TYPES.has(field.type) || field.type === ES_FIELD_TYPES.BOOLEAN;
+
+  if (jobType === JOB_TYPES.REGRESSION) {
+    return isBasicNumerical || EXTENDED_NUMERICAL_TYPES.has(field.type);
+  }
+  if (jobType === JOB_TYPES.CLASSIFICATION) return isSupportedByClassification;
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/job_type.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/job_type.tsx
index 5d8a74bd10ab61..988daac528fd77 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/job_type.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/job_type.tsx
@@ -64,7 +64,11 @@ export const JobType: FC<Props> = ({ type, setFormState }) => {
           hasNoInitialSelection={true}
           onChange={e => {
             const value = e.target.value as AnalyticsJobType;
-            setFormState({ jobType: value });
+            setFormState({
+              previousJobType: type,
+              jobType: value,
+              excludes: [],
+            });
           }}
           data-test-subj="mlAnalyticsCreateJobFlyoutJobTypeSelect"
         />
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts
index fcb99ea83548dd..7ea2f74908e0e2 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts
@@ -138,5 +138,11 @@ describe('useCreateAnalyticsForm', () => {
       validateAdvancedEditor(getMockState({ index: 'the-source-index', modelMemoryLimit: '' }))
         .isValid
     ).toBe(false);
+    // can still run validation check on model_memory_limit if number type
+    expect(
+      // @ts-ignore number is not assignable to type string - mml gets converted to string prior to creation
+      validateAdvancedEditor(getMockState({ index: 'the-source-index', modelMemoryLimit: 100 }))
+        .isValid
+    ).toBe(false);
   });
 });
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
index 8498b0e5a9e9e1..f35fa6aa2f451c 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
@@ -54,7 +54,15 @@ const getSourceIndexString = (state: State) => {
 };
 
 export const validateAdvancedEditor = (state: State): State => {
-  const { jobIdEmpty, jobIdValid, jobIdExists, jobType, createIndexPattern } = state.form;
+  const {
+    jobIdEmpty,
+    jobIdValid,
+    jobIdExists,
+    jobType,
+    createIndexPattern,
+    excludes,
+    maxDistinctValuesError,
+  } = state.form;
   const { jobConfig } = state;
 
   state.advancedEditorMessages = [];
@@ -90,6 +98,7 @@ export const validateAdvancedEditor = (state: State): State => {
   }
 
   let dependentVariableEmpty = false;
+  let excludesValid = true;
 
   if (
     jobConfig.analysis === undefined &&
@@ -104,6 +113,20 @@ export const validateAdvancedEditor = (state: State): State => {
   ) {
     const dependentVariableName = getDependentVar(jobConfig.analysis) || '';
     dependentVariableEmpty = dependentVariableName === '';
+
+    if (!dependentVariableEmpty && excludes.includes(dependentVariableName)) {
+      excludesValid = false;
+
+      state.advancedEditorMessages.push({
+        error: i18n.translate(
+          'xpack.ml.dataframe.analytics.create.advancedEditorMessage.excludesInvalid',
+          {
+            defaultMessage: 'The dependent variable cannot be excluded.',
+          }
+        ),
+        message: '',
+      });
+    }
   }
 
   if (sourceIndexNameEmpty) {
@@ -182,6 +205,8 @@ export const validateAdvancedEditor = (state: State): State => {
   }
 
   state.isValid =
+    maxDistinctValuesError === undefined &&
+    excludesValid &&
     state.form.modelMemoryLimitUnitValid &&
     !jobIdEmpty &&
     jobIdValid &&
@@ -210,6 +235,7 @@ const validateForm = (state: State): State => {
     destinationIndexPatternTitleExists,
     createIndexPattern,
     dependentVariable,
+    maxDistinctValuesError,
     modelMemoryLimit,
   } = state.form;
 
@@ -225,6 +251,7 @@ const validateForm = (state: State): State => {
   }
 
   state.isValid =
+    maxDistinctValuesError === undefined &&
     !jobTypeEmpty &&
     state.form.modelMemoryLimitUnitValid &&
     !jobIdEmpty &&
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
index d29291f8795afd..282f9ff45d0ee0 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiComboBoxOptionProps } from '@elastic/eui';
 import { DeepPartial } from '../../../../../../../common/types/common';
 import { checkPermission } from '../../../../../privilege/check_privilege';
 import { mlNodesAvailable } from '../../../../../ml_nodes_check/check_ml_nodes';
@@ -45,22 +46,29 @@ export interface State {
     createIndexPattern: boolean;
     dependentVariable: DependentVariable;
     dependentVariableFetchFail: boolean;
-    dependentVariableOptions: Array<{ label: DependentVariable }> | [];
+    dependentVariableOptions: EuiComboBoxOptionProps[] | [];
     description: string;
     destinationIndex: EsIndexName;
     destinationIndexNameExists: boolean;
     destinationIndexNameEmpty: boolean;
     destinationIndexNameValid: boolean;
     destinationIndexPatternTitleExists: boolean;
+    excludes: string[];
+    excludesOptions: EuiComboBoxOptionProps[];
+    fieldOptionsFetchFail: boolean;
     jobId: DataFrameAnalyticsId;
     jobIdExists: boolean;
     jobIdEmpty: boolean;
     jobIdInvalidMaxLength: boolean;
     jobIdValid: boolean;
     jobType: AnalyticsJobType;
-    loadingDepFieldOptions: boolean;
+    loadingDepVarOptions: boolean;
+    loadingFieldOptions: boolean;
+    maxDistinctValuesError: string | undefined;
     modelMemoryLimit: string | undefined;
     modelMemoryLimitUnitValid: boolean;
+    previousJobType: null | AnalyticsJobType;
+    previousSourceIndex: EsIndexName | undefined;
     sourceIndex: EsIndexName;
     sourceIndexNameEmpty: boolean;
     sourceIndexNameValid: boolean;
@@ -96,15 +104,22 @@ export const getInitialState = (): State => ({
     destinationIndexNameEmpty: true,
     destinationIndexNameValid: false,
     destinationIndexPatternTitleExists: false,
+    excludes: [],
+    fieldOptionsFetchFail: false,
+    excludesOptions: [],
     jobId: '',
     jobIdExists: false,
     jobIdEmpty: true,
     jobIdInvalidMaxLength: false,
     jobIdValid: false,
     jobType: undefined,
-    loadingDepFieldOptions: false,
+    loadingDepVarOptions: false,
+    loadingFieldOptions: false,
+    maxDistinctValuesError: undefined,
     modelMemoryLimit: undefined,
     modelMemoryLimitUnitValid: true,
+    previousJobType: null,
+    previousSourceIndex: undefined,
     sourceIndex: '',
     sourceIndexNameEmpty: true,
     sourceIndexNameValid: false,
@@ -146,7 +161,7 @@ export const getJobConfigFromFormState = (
       index: formState.destinationIndex,
     },
     analyzed_fields: {
-      excludes: [],
+      excludes: formState.excludes,
     },
     analysis: {
       outlier_detection: {},
diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js
index 2645e0e3f9c420..6ff0b45454abf6 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js
+++ b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js
@@ -45,7 +45,7 @@ export const dataFrameAnalytics = {
       data: evaluateConfig,
     });
   },
-  estimateDataFrameAnalyticsMemoryUsage(jobConfig) {
+  explainDataFrameAnalytics(jobConfig) {
     return http({
       url: `${basePath}/data_frame/analytics/_explain`,
       method: 'POST',
diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts
index ad600ad2cbd710..58692754d95d70 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts
@@ -16,9 +16,10 @@ import { DataFrameAnalyticsStats } from '../../data_frame_analytics/pages/analyt
 import { JobMessage } from '../../../../common/types/audit_message';
 import { DataFrameAnalyticsConfig } from '../../data_frame_analytics/common/analytics';
 import { DeepPartial } from '../../../../common/types/common';
+import { PartitionFieldsDefinition } from '../results_service/result_service_rx';
 import { annotations } from './annotations';
 import { Calendar, CalendarId, UpdateCalendar } from '../../../../common/types/calendars';
-import { CombinedJob } from '../../jobs/new_job/common/job_creator/configs';
+import { CombinedJob, JobId } from '../../jobs/new_job/common/job_creator/configs';
 
 // TODO This is not a complete representation of all methods of `ml.*`.
 // It just satisfies needs for other parts of the code area which use
@@ -89,9 +90,7 @@ declare interface Ml {
     getDataFrameAnalyticsStats(analyticsId?: string): Promise<GetDataFrameAnalyticsStatsResponse>;
     createDataFrameAnalytics(analyticsId: string, analyticsConfig: any): Promise<any>;
     evaluateDataFrameAnalytics(evaluateConfig: any): Promise<any>;
-    estimateDataFrameAnalyticsMemoryUsage(
-      jobConfig: DeepPartial<DataFrameAnalyticsConfig>
-    ): Promise<any>;
+    explainDataFrameAnalytics(jobConfig: DeepPartial<DataFrameAnalyticsConfig>): Promise<any>;
     deleteDataFrameAnalytics(analyticsId: string): Promise<any>;
     startDataFrameAnalytics(analyticsId: string): Promise<any>;
     stopDataFrameAnalytics(
@@ -124,6 +123,13 @@ declare interface Ml {
 
   results: {
     getMaxAnomalyScore: (jobIds: string[], earliestMs: number, latestMs: number) => Promise<any>;
+    fetchPartitionFieldsValues: (
+      jobId: JobId,
+      searchTerm: Record<string, string>,
+      criteriaFields: Array<{ fieldName: string; fieldValue: any }>,
+      earliestMs: number,
+      latestMs: number
+    ) => Observable<PartitionFieldsDefinition>;
   };
 
   jobs: {
diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js
index ed01fa268500f2..38ae777106680b 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js
+++ b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js
@@ -75,4 +75,17 @@ export const results = {
       },
     });
   },
+
+  fetchPartitionFieldsValues(jobId, searchTerm, criteriaFields, earliestMs, latestMs) {
+    return http$(`${basePath}/results/partition_fields_values`, {
+      method: 'POST',
+      body: {
+        jobId,
+        searchTerm,
+        criteriaFields,
+        earliestMs,
+        latestMs,
+      },
+    });
+  },
 };
diff --git a/x-pack/legacy/plugins/ml/public/application/services/results_service/index.ts b/x-pack/legacy/plugins/ml/public/application/services/results_service/index.ts
index 9ab14aa7495a70..9d21cbc76ba3a4 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/results_service/index.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/results_service/index.ts
@@ -9,6 +9,7 @@ import {
   getModelPlotOutput,
   getRecordsForCriteria,
   getScheduledEventsByBucket,
+  fetchPartitionFieldsValues,
 } from './result_service_rx';
 import {
   getEventDistributionData,
@@ -42,6 +43,7 @@ export const mlResultsService = {
   getEventDistributionData,
   getModelPlotOutput,
   getRecordMaxScoreByTime,
+  fetchPartitionFieldsValues,
 };
 
 type time = string;
diff --git a/x-pack/legacy/plugins/ml/public/application/services/results_service/result_service_rx.ts b/x-pack/legacy/plugins/ml/public/application/services/results_service/result_service_rx.ts
index 2341ae15a3378c..299dfe01676947 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/results_service/result_service_rx.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/results_service/result_service_rx.ts
@@ -14,7 +14,9 @@
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import _ from 'lodash';
+import { Dictionary } from '../../../../common/types/common';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
+import { JobId } from '../../jobs/new_job/common/job_creator/configs';
 import { ml } from '../ml_api_service';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../../common/constants/index_patterns';
 import { CriteriaField } from './index';
@@ -27,6 +29,23 @@ export interface MetricData extends ResultResponse {
   results: Record<string, any>;
 }
 
+export interface FieldDefinition {
+  /**
+   * Partition field name.
+   */
+  name: string | number;
+  /**
+   * Partitions field distinct values.
+   */
+  values: any[];
+}
+
+type FieldTypes = 'partition_field' | 'over_field' | 'by_field';
+
+export type PartitionFieldsDefinition = {
+  [field in FieldTypes]: FieldDefinition;
+};
+
 export function getMetricData(
   index: string,
   entityFields: any[],
@@ -532,3 +551,19 @@ export function getScheduledEventsByBucket(
       })
     );
 }
+
+export function fetchPartitionFieldsValues(
+  jobId: JobId,
+  searchTerm: Dictionary<string>,
+  criteriaFields: Array<{ fieldName: string; fieldValue: any }>,
+  earliestMs: number,
+  latestMs: number
+) {
+  return ml.results.fetchPartitionFieldsValues(
+    jobId,
+    searchTerm,
+    criteriaFields,
+    earliestMs,
+    latestMs
+  );
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.js b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.js
deleted file mode 100644
index 97d6e417927874..00000000000000
--- a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.js
+++ /dev/null
@@ -1,120 +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 PropTypes from 'prop-types';
-import React from 'react';
-import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
-
-import { EuiComboBox, EuiFlexItem, EuiFormRow, EuiToolTip } from '@elastic/eui';
-
-function getEntityControlOptions(entity) {
-  if (!Array.isArray(entity.fieldValues)) {
-    return [];
-  }
-
-  return entity.fieldValues.map(value => {
-    return { label: value };
-  });
-}
-
-export const EntityControl = injectI18n(
-  class EntityControl extends React.Component {
-    static propTypes = {
-      entity: PropTypes.object.isRequired,
-      entityFieldValueChanged: PropTypes.func.isRequired,
-      forceSelection: PropTypes.bool.isRequired,
-    };
-
-    state = {
-      selectedOptions: undefined,
-    };
-
-    constructor(props) {
-      super(props);
-    }
-
-    componentDidUpdate() {
-      const { entity, forceSelection } = this.props;
-      const { selectedOptions } = this.state;
-
-      const fieldValue = entity.fieldValue;
-
-      if (
-        (selectedOptions === undefined && fieldValue.length > 0) ||
-        (Array.isArray(selectedOptions) &&
-          fieldValue.length > 0 &&
-          selectedOptions[0].label !== fieldValue)
-      ) {
-        this.setState({
-          selectedOptions: [{ label: fieldValue }],
-        });
-      } else if (Array.isArray(selectedOptions) && fieldValue.length === 0) {
-        this.setState({
-          selectedOptions: undefined,
-        });
-      }
-
-      if (forceSelection && this.inputRef) {
-        this.inputRef.focus();
-      }
-    }
-
-    onChange = selectedOptions => {
-      const options = selectedOptions.length > 0 ? selectedOptions : undefined;
-      this.setState({
-        selectedOptions: options,
-      });
-
-      const fieldValue =
-        Array.isArray(options) && options[0].label.length > 0 ? options[0].label : '';
-      this.props.entityFieldValueChanged(this.props.entity, fieldValue);
-    };
-
-    render() {
-      const { entity, intl, forceSelection } = this.props;
-      const { selectedOptions } = this.state;
-      const options = getEntityControlOptions(entity);
-
-      const control = (
-        <EuiComboBox
-          inputRef={input => {
-            if (input) {
-              this.inputRef = input;
-            }
-          }}
-          style={{ minWidth: '300px' }}
-          placeholder={intl.formatMessage({
-            id: 'xpack.ml.timeSeriesExplorer.enterValuePlaceholder',
-            defaultMessage: 'Enter value',
-          })}
-          singleSelection={{ asPlainText: true }}
-          options={options}
-          selectedOptions={selectedOptions}
-          onChange={this.onChange}
-          isClearable={false}
-        />
-      );
-
-      const selectMessage = (
-        <FormattedMessage
-          id="xpack.ml.timeSeriesExplorer.selectFieldMessage"
-          defaultMessage="Select {fieldName}"
-          values={{ fieldName: entity.fieldName }}
-        />
-      );
-
-      return (
-        <EuiFlexItem grow={false}>
-          <EuiFormRow label={entity.fieldName} helpText={forceSelection ? selectMessage : null}>
-            <EuiToolTip position="right" content={forceSelection ? selectMessage : null}>
-              {control}
-            </EuiToolTip>
-          </EuiFormRow>
-        </EuiFlexItem>
-      );
-    }
-  }
-);
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx
new file mode 100644
index 00000000000000..bc6896a1a66ba0
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx
@@ -0,0 +1,156 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Component } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
+import {
+  EuiComboBox,
+  EuiComboBoxOptionProps,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiToolTip,
+} from '@elastic/eui';
+
+export interface Entity {
+  fieldName: string;
+  fieldValue: any;
+  fieldValues: any;
+}
+
+function getEntityControlOptions(entity: Entity): EuiComboBoxOptionProps[] {
+  if (!Array.isArray(entity.fieldValues)) {
+    return [];
+  }
+
+  return entity.fieldValues.map(value => {
+    return { label: value };
+  });
+}
+
+interface EntityControlProps {
+  entity: Entity;
+  entityFieldValueChanged: (entity: Entity, fieldValue: any) => void;
+  onSearchChange: (entity: Entity, queryTerm: string) => void;
+  forceSelection: boolean;
+}
+
+interface EntityControlState {
+  selectedOptions: EuiComboBoxOptionProps[] | undefined;
+  isLoading: boolean;
+  options: EuiComboBoxOptionProps[] | undefined;
+}
+
+export class EntityControl extends Component<EntityControlProps, EntityControlState> {
+  inputRef: any;
+
+  state = {
+    selectedOptions: undefined,
+    options: undefined,
+    isLoading: false,
+  };
+
+  componentDidUpdate(prevProps: EntityControlProps) {
+    const { entity, forceSelection } = this.props;
+    const { selectedOptions } = this.state;
+
+    if (prevProps.entity === entity) {
+      return;
+    }
+
+    const { fieldValue } = entity;
+
+    const options = getEntityControlOptions(entity);
+
+    let selectedOptionsUpdate: EuiComboBoxOptionProps[] | undefined = selectedOptions;
+    if (
+      (selectedOptions === undefined && fieldValue.length > 0) ||
+      (Array.isArray(selectedOptions) &&
+        // @ts-ignore
+        selectedOptions[0].label !== fieldValue &&
+        fieldValue.length > 0)
+    ) {
+      selectedOptionsUpdate = [{ label: fieldValue }];
+    } else if (Array.isArray(selectedOptions) && fieldValue.length === 0) {
+      selectedOptionsUpdate = undefined;
+    }
+
+    this.setState({
+      options,
+      isLoading: false,
+      selectedOptions: selectedOptionsUpdate,
+    });
+
+    if (forceSelection && this.inputRef) {
+      this.inputRef.focus();
+    }
+  }
+
+  onChange = (selectedOptions: EuiComboBoxOptionProps[]) => {
+    const options = selectedOptions.length > 0 ? selectedOptions : undefined;
+    this.setState({
+      selectedOptions: options,
+    });
+
+    const fieldValue =
+      Array.isArray(options) && options[0].label.length > 0 ? options[0].label : '';
+    this.props.entityFieldValueChanged(this.props.entity, fieldValue);
+  };
+
+  onSearchChange = (searchValue: string) => {
+    this.setState({
+      isLoading: true,
+      options: [],
+    });
+    this.props.onSearchChange(this.props.entity, searchValue);
+  };
+
+  render() {
+    const { entity, forceSelection } = this.props;
+    const { selectedOptions, isLoading, options } = this.state;
+
+    const control = (
+      <EuiComboBox
+        async
+        isLoading={isLoading}
+        inputRef={input => {
+          if (input) {
+            this.inputRef = input;
+          }
+        }}
+        style={{ minWidth: '300px' }}
+        placeholder={i18n.translate('xpack.ml.timeSeriesExplorer.enterValuePlaceholder', {
+          defaultMessage: 'Enter value',
+        })}
+        singleSelection={{ asPlainText: true }}
+        options={options}
+        selectedOptions={selectedOptions}
+        onChange={this.onChange}
+        onSearchChange={this.onSearchChange}
+        isClearable={false}
+      />
+    );
+
+    const selectMessage = (
+      <FormattedMessage
+        id="xpack.ml.timeSeriesExplorer.selectFieldMessage"
+        defaultMessage="Select {fieldName}"
+        values={{ fieldName: entity.fieldName }}
+      />
+    );
+
+    return (
+      <EuiFlexItem grow={false}>
+        <EuiFormRow label={entity.fieldName} helpText={forceSelection ? selectMessage : null}>
+          <EuiToolTip position="right" content={forceSelection ? selectMessage : null}>
+            {control}
+          </EuiToolTip>
+        </EuiFormRow>
+      </EuiFlexItem>
+    );
+  }
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/index.js b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/index.js
rename to x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/index.ts
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
index 2e0fc44a158ead..9db6f8f0a1c35b 100644
--- a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
+++ b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
@@ -445,8 +445,6 @@ const TimeseriesChartIntl = injectI18n(
         };
         this.selectedBounds = newSelectedBounds;
       } else {
-        // Don't set the brush if the selection is the full context chart domain.
-        this.setBrushVisibility(false);
         const contextXScaleDomain = this.contextXScale.domain();
         const newSelectedBounds = {
           min: moment(new Date(contextXScaleDomain[0])),
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index 0f9ef2b54fdc23..202448340f526d 100644
--- a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -8,7 +8,7 @@
  * React component for rendering Single Metric Viewer.
  */
 
-import { chain, difference, each, find, first, get, has, isEqual, without } from 'lodash';
+import { debounce, difference, each, find, first, get, has, isEqual, without } from 'lodash';
 import moment from 'moment-timezone';
 import { Subject, Subscription, forkJoin } from 'rxjs';
 import { map, debounceTime, switchMap, tap, withLatestFrom } from 'rxjs/operators';
@@ -362,6 +362,12 @@ export class TimeSeriesExplorer extends React.Component {
     });
   };
 
+  entityFieldSearchChanged = debounce((entity, queryTerm) => {
+    this.loadEntityValues({
+      [entity.fieldType]: queryTerm,
+    });
+  }, 500);
+
   loadAnomaliesTableData = (earliestMs, latestMs) => {
     const { dateFormatTz } = this.props;
     const { selectedJob } = this.state;
@@ -419,58 +425,56 @@ export class TimeSeriesExplorer extends React.Component {
       );
   };
 
-  loadEntityValues = (callback = () => {}) => {
+  /**
+   * Loads available entity values.
+   * @param {Object} searchTerm - Search term for partition, e.g. { partition_field: 'partition' }
+   * @param callback - Callback to execute after component state update.
+   */
+  loadEntityValues = async (searchTerm = {}, callback = () => {}) => {
     const { timefilter } = this.props;
     const { detectorId, entities, selectedJob } = this.state;
 
-    // Populate the entity input datalists with the values from the top records by score
-    // for the selected detector across the full time range. No need to pass through finish().
+    // Populate the entity input datalists with aggregated values. No need to pass through finish().
     const bounds = timefilter.getActiveBounds();
     const detectorIndex = +detectorId;
 
-    mlResultsService
-      .getRecordsForCriteria(
-        [selectedJob.job_id],
-        [{ fieldName: 'detector_index', fieldValue: detectorIndex }],
-        0,
+    const {
+      partition_field: partitionField,
+      over_field: overField,
+      by_field: byField,
+    } = await mlResultsService
+      .fetchPartitionFieldsValues(
+        selectedJob.job_id,
+        searchTerm,
+        [
+          {
+            fieldName: 'detector_index',
+            fieldValue: detectorIndex,
+          },
+        ],
         bounds.min.valueOf(),
-        bounds.max.valueOf(),
-        ANOMALIES_TABLE_DEFAULT_QUERY_SIZE
+        bounds.max.valueOf()
       )
-      .toPromise()
-      .then(resp => {
-        if (resp.records && resp.records.length > 0) {
-          const firstRec = resp.records[0];
+      .toPromise();
 
-          this.setState(
-            {
-              entities: entities.map(entity => {
-                const newEntity = { ...entity };
-                if (firstRec.partition_field_name === newEntity.fieldName) {
-                  newEntity.fieldValues = chain(resp.records)
-                    .pluck('partition_field_value')
-                    .uniq()
-                    .value();
-                }
-                if (firstRec.over_field_name === newEntity.fieldName) {
-                  newEntity.fieldValues = chain(resp.records)
-                    .pluck('over_field_value')
-                    .uniq()
-                    .value();
-                }
-                if (firstRec.by_field_name === newEntity.fieldName) {
-                  newEntity.fieldValues = chain(resp.records)
-                    .pluck('by_field_value')
-                    .uniq()
-                    .value();
-                }
-                return newEntity;
-              }),
-            },
-            callback
-          );
-        }
-      });
+    this.setState(
+      {
+        entities: entities.map(entity => {
+          const newEntity = { ...entity };
+          if (partitionField?.name === entity.fieldName) {
+            newEntity.fieldValues = partitionField.values;
+          }
+          if (overField?.name === entity.fieldName) {
+            newEntity.fieldValues = overField.values;
+          }
+          if (byField?.name === entity.fieldName) {
+            newEntity.fieldValues = byField.values;
+          }
+          return newEntity;
+        }),
+      },
+      callback
+    );
   };
 
   loadForForecastId = forecastId => {
@@ -796,11 +800,19 @@ export class TimeSeriesExplorer extends React.Component {
     const byFieldName = get(detector, 'by_field_name');
     if (partitionFieldName !== undefined) {
       const partitionFieldValue = get(entitiesState, partitionFieldName, '');
-      entities.push({ fieldName: partitionFieldName, fieldValue: partitionFieldValue });
+      entities.push({
+        fieldType: 'partition_field',
+        fieldName: partitionFieldName,
+        fieldValue: partitionFieldValue,
+      });
     }
     if (overFieldName !== undefined) {
       const overFieldValue = get(entitiesState, overFieldName, '');
-      entities.push({ fieldName: overFieldName, fieldValue: overFieldValue });
+      entities.push({
+        fieldType: 'over_field',
+        fieldName: overFieldName,
+        fieldValue: overFieldValue,
+      });
     }
 
     // For jobs with by and over fields, don't add the 'by' field as this
@@ -810,7 +822,7 @@ export class TimeSeriesExplorer extends React.Component {
     // from filter for the anomaly records.
     if (byFieldName !== undefined && overFieldName === undefined) {
       const byFieldValue = get(entitiesState, byFieldName, '');
-      entities.push({ fieldName: byFieldName, fieldValue: byFieldValue });
+      entities.push({ fieldType: 'by_field', fieldName: byFieldName, fieldValue: byFieldValue });
     }
 
     this.updateCriteriaFields(detectorIndex, entities);
@@ -1338,6 +1350,7 @@ export class TimeSeriesExplorer extends React.Component {
                 <EntityControl
                   entity={entity}
                   entityFieldValueChanged={this.entityFieldValueChanged}
+                  onSearchChange={this.entityFieldSearchChanged}
                   forceSelection={forceSelection}
                   key={entityKey}
                 />
diff --git a/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js b/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js
index 5d38de4a6ba87c..2ca21efb0bd6ae 100644
--- a/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js
+++ b/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js
@@ -168,7 +168,7 @@ export const elasticsearchJsPlugin = (Client, config, components) => {
     method: 'POST',
   });
 
-  ml.estimateDataFrameAnalyticsMemoryUsage = ca({
+  ml.explainDataFrameAnalytics = ca({
     urls: [
       {
         fmt: '/_ml/data_frame/analytics/_explain',
diff --git a/x-pack/legacy/plugins/ml/server/models/results_service/get_partition_fields_values.ts b/x-pack/legacy/plugins/ml/server/models/results_service/get_partition_fields_values.ts
new file mode 100644
index 00000000000000..00e3002a7fc71e
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/models/results_service/get_partition_fields_values.ts
@@ -0,0 +1,161 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Boom from 'boom';
+import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
+import { callWithRequestType } from '../../../common/types/kibana';
+
+interface CriteriaField {
+  fieldName: string;
+  fieldValue: any;
+}
+
+const PARTITION_FIELDS = ['partition_field', 'over_field', 'by_field'] as const;
+
+type PartitionFieldsType = typeof PARTITION_FIELDS[number];
+
+type SearchTerm =
+  | {
+      [key in PartitionFieldsType]?: string;
+    }
+  | undefined;
+
+/**
+ * Gets an object for aggregation query to retrieve field name and values.
+ * @param fieldType - Field type
+ * @param query - Optional query string for partition value
+ * @returns {Object}
+ */
+function getFieldAgg(fieldType: PartitionFieldsType, query?: string) {
+  const AGG_SIZE = 100;
+
+  const fieldNameKey = `${fieldType}_name`;
+  const fieldValueKey = `${fieldType}_value`;
+
+  return {
+    [fieldNameKey]: {
+      terms: {
+        field: fieldNameKey,
+      },
+    },
+    [fieldValueKey]: {
+      filter: {
+        wildcard: {
+          [fieldValueKey]: {
+            value: query ? `*${query}*` : '*',
+          },
+        },
+      },
+      aggs: {
+        values: {
+          terms: {
+            size: AGG_SIZE,
+            field: fieldValueKey,
+          },
+        },
+      },
+    },
+  };
+}
+
+/**
+ * Gets formatted result for particular field from aggregation response.
+ * @param fieldType - Field type
+ * @param aggs - Aggregation response
+ */
+function getFieldObject(fieldType: PartitionFieldsType, aggs: any) {
+  const fieldNameKey = `${fieldType}_name`;
+  const fieldValueKey = `${fieldType}_value`;
+
+  return aggs[fieldNameKey].buckets.length > 0
+    ? {
+        [fieldType]: {
+          name: aggs[fieldNameKey].buckets[0].key,
+          values: aggs[fieldValueKey].values.buckets.map(({ key }: any) => key),
+        },
+      }
+    : {};
+}
+
+export const getPartitionFieldsValuesFactory = (callWithRequest: callWithRequestType) =>
+  /**
+   * Gets the record of partition fields with possible values that fit the provided queries.
+   * @param jobId - Job ID
+   * @param searchTerm - object of queries for partition fields, e.g. { partition_field: 'query' }
+   * @param criteriaFields - key - value pairs of the term field, e.g. { detector_index: 0 }
+   * @param earliestMs
+   * @param latestMs
+   */
+  async function getPartitionFieldsValues(
+    jobId: string,
+    searchTerm: SearchTerm = {},
+    criteriaFields: CriteriaField[],
+    earliestMs: number,
+    latestMs: number
+  ) {
+    const jobsResponse = await callWithRequest('ml.jobs', { jobId: [jobId] });
+    if (jobsResponse.count === 0 || jobsResponse.jobs === undefined) {
+      throw Boom.notFound(`Job with the id "${jobId}" not found`);
+    }
+
+    const job = jobsResponse.jobs[0];
+
+    const isModelPlotEnabled = job?.model_plot_config?.enabled;
+
+    const resp = await callWithRequest('search', {
+      index: ML_RESULTS_INDEX_PATTERN,
+      size: 0,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              ...criteriaFields.map(({ fieldName, fieldValue }) => {
+                return {
+                  term: {
+                    [fieldName]: fieldValue,
+                  },
+                };
+              }),
+              {
+                term: {
+                  job_id: jobId,
+                },
+              },
+              {
+                range: {
+                  timestamp: {
+                    gte: earliestMs,
+                    lte: latestMs,
+                    format: 'epoch_millis',
+                  },
+                },
+              },
+              {
+                term: {
+                  result_type: isModelPlotEnabled ? 'model_plot' : 'record',
+                },
+              },
+            ],
+          },
+        },
+        aggs: {
+          ...PARTITION_FIELDS.reduce((acc, key) => {
+            return {
+              ...acc,
+              ...getFieldAgg(key, searchTerm[key]),
+            };
+          }, {}),
+        },
+      },
+    });
+
+    return PARTITION_FIELDS.reduce((acc, key) => {
+      return {
+        ...acc,
+        ...getFieldObject(key, resp.aggregations),
+      };
+    }, {});
+  };
diff --git a/x-pack/legacy/plugins/ml/server/models/results_service/results_service.js b/x-pack/legacy/plugins/ml/server/models/results_service/results_service.js
index c779664978f630..3ee5d04186ff10 100644
--- a/x-pack/legacy/plugins/ml/server/models/results_service/results_service.js
+++ b/x-pack/legacy/plugins/ml/server/models/results_service/results_service.js
@@ -10,6 +10,7 @@ import moment from 'moment';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
+import { getPartitionFieldsValuesFactory } from './get_partition_fields_values';
 
 // Service for carrying out Elasticsearch queries to obtain data for the
 // ML Results dashboards.
@@ -408,5 +409,6 @@ export function resultsServiceProvider(callWithRequest) {
     getCategoryExamples,
     getLatestBucketTimestampByJob,
     getMaxAnomalyScore,
+    getPartitionFieldsValues: getPartitionFieldsValuesFactory(callWithRequest),
   };
 }
diff --git a/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts
index 2f8db45d9739e4..7b855e5f87cbf6 100644
--- a/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts
@@ -164,7 +164,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
         const results = await context.ml!.mlClient.callAsCurrentUser(
-          'ml.estimateDataFrameAnalyticsMemoryUsage',
+          'ml.explainDataFrameAnalytics',
           {
             body: request.body,
           }
diff --git a/x-pack/legacy/plugins/ml/server/routes/results_service.js b/x-pack/legacy/plugins/ml/server/routes/results_service.js
index 6d456e6a0412ea..a658729e850831 100644
--- a/x-pack/legacy/plugins/ml/server/routes/results_service.js
+++ b/x-pack/legacy/plugins/ml/server/routes/results_service.js
@@ -55,6 +55,12 @@ function getMaxAnomalyScore(callWithRequest, payload) {
   return rs.getMaxAnomalyScore(jobIds, earliestMs, latestMs);
 }
 
+function getPartitionFieldsValues(callWithRequest, payload) {
+  const rs = resultsServiceProvider(callWithRequest);
+  const { jobId, searchTerm, criteriaFields, earliestMs, latestMs } = payload;
+  return rs.getPartitionFieldsValues(jobId, searchTerm, criteriaFields, earliestMs, latestMs);
+}
+
 export function resultsServiceRoutes({ commonRouteConfig, elasticsearchPlugin, route }) {
   route({
     method: 'POST',
@@ -103,4 +109,18 @@ export function resultsServiceRoutes({ commonRouteConfig, elasticsearchPlugin, r
       ...commonRouteConfig,
     },
   });
+
+  route({
+    method: 'POST',
+    path: '/api/ml/results/partition_fields_values',
+    handler(request) {
+      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
+      return getPartitionFieldsValues(callWithRequest, request.payload).catch(resp =>
+        wrapError(resp)
+      );
+    },
+    config: {
+      ...commonRouteConfig,
+    },
+  });
 }
diff --git a/x-pack/legacy/plugins/monitoring/index.js b/x-pack/legacy/plugins/monitoring/index.js
index 3d98b11c2045b1..8e0201bea710bc 100644
--- a/x-pack/legacy/plugins/monitoring/index.js
+++ b/x-pack/legacy/plugins/monitoring/index.js
@@ -22,7 +22,7 @@ export const monitoring = kibana =>
     id: 'monitoring',
     configPrefix: 'xpack.monitoring',
     publicDir: resolve(__dirname, 'public'),
-    init(server, _options) {
+    init(server) {
       const configs = [
         'xpack.monitoring.ui.enabled',
         'xpack.monitoring.kibana.collection.enabled',
diff --git a/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.js b/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.js
index c3ca241c73cc02..5c9cddf9c29022 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.js
@@ -46,7 +46,7 @@ export class ChartTarget extends React.Component {
         return seriesToShow.some(id => id.toLowerCase() === metric.id.toLowerCase());
       };
     }
-    return _metric => true;
+    return () => true;
   }
 
   UNSAFE_componentWillReceiveProps(newProps) {
diff --git a/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.test.js b/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.test.js
index bf0d5fdd248792..56eb52fa862350 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.test.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.test.js
@@ -38,8 +38,8 @@ const props = {
     max: 1562962539851,
   },
   hasLegend: true,
-  onBrush: _ => void 0,
-  tickFormatter: _ => void 0,
+  onBrush: () => void 0,
+  tickFormatter: () => void 0,
   updateLegend: () => void 0,
 };
 
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
index 012bc81135e341..897c20edc3f74a 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
@@ -46,6 +46,8 @@ export class Assigned extends React.Component {
 
     // TODO: redesign for shard allocation, possibly giving shard display the
     // ability to use the euiLink CSS class (blue link text instead of white link text)
+    // Disabling eslint because EuiKeyboardAccessible does it for us
+    /* eslint-disable jsx-a11y/click-events-have-key-events */
     const name = (
       <EuiKeyboardAccessible>
         <a onClick={changeUrl}>
@@ -53,6 +55,7 @@ export class Assigned extends React.Component {
         </a>
       </EuiKeyboardAccessible>
     );
+    /* eslint-enable jsx-a11y/click-events-have-key-events */
     const master =
       data.node_type === 'master' ? <EuiIcon type="starFilledSpace" color="primary" /> : null;
     const shards = sortBy(data.children, 'shard').map(this.createShard);
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
index cd9fe5229b6408..73faa81af7b55c 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
@@ -164,7 +164,7 @@ function renderPluginBasicStats(vertex, timeseriesTooltipXValueFormatter) {
   );
 }
 
-function renderIfBasicStats(_vertex) {
+function renderIfBasicStats() {
   return (
     <p>
       <FormattedMessage
@@ -175,7 +175,7 @@ function renderIfBasicStats(_vertex) {
   );
 }
 
-function renderQueueBasicStats(_vertex) {
+function renderQueueBasicStats() {
   return (
     <p>
       <FormattedMessage
@@ -253,7 +253,7 @@ function renderIfBasicInfo(vertex) {
   );
 }
 
-function renderQueueBasicInfo(_vertex) {
+function renderQueueBasicInfo() {
   return (
     <p>
       <FormattedMessage
diff --git a/x-pack/legacy/plugins/monitoring/public/services/executor_provider.js b/x-pack/legacy/plugins/monitoring/public/services/executor_provider.js
index cb176917ff025d..b2192496ed272e 100644
--- a/x-pack/legacy/plugins/monitoring/public/services/executor_provider.js
+++ b/x-pack/legacy/plugins/monitoring/public/services/executor_provider.js
@@ -72,7 +72,7 @@ export function executorProvider(Promise, $timeout) {
     ).finally(reset);
   }
 
-  function reFetch(_changes) {
+  function reFetch() {
     cancel();
     run();
   }
diff --git a/x-pack/legacy/plugins/monitoring/public/views/elasticsearch/nodes/index.js b/x-pack/legacy/plugins/monitoring/public/views/elasticsearch/nodes/index.js
index 4b3c961b155831..d201e2cc8b5e9f 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/elasticsearch/nodes/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/views/elasticsearch/nodes/index.js
@@ -39,6 +39,7 @@ uiRoutes.when('/elasticsearch/nodes', {
         }) || {};
 
       const getPageData = ($injector, _api = undefined, routeOptions = {}) => {
+        _api; // to fix eslint
         const $http = $injector.get('$http');
         const globalState = $injector.get('globalState');
         const timeBounds = timefilter.getBounds();
diff --git a/x-pack/legacy/plugins/monitoring/public/views/logstash/node/pipelines/index.js b/x-pack/legacy/plugins/monitoring/public/views/logstash/node/pipelines/index.js
index bc5ac75931fce5..7bfcddf8f283a6 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/logstash/node/pipelines/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/views/logstash/node/pipelines/index.js
@@ -23,6 +23,7 @@ import { DetailStatus } from '../../../../components/logstash/detail_status';
 import { CODE_PATH_LOGSTASH } from '../../../../../common/constants';
 
 const getPageData = ($injector, _api = undefined, routeOptions = {}) => {
+  _api; // fixing eslint
   const $route = $injector.get('$route');
   const $http = $injector.get('$http');
   const globalState = $injector.get('globalState');
diff --git a/x-pack/legacy/plugins/monitoring/public/views/logstash/pipelines/index.js b/x-pack/legacy/plugins/monitoring/public/views/logstash/pipelines/index.js
index ce49fc2fac97bf..03cf7383d1d023 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/logstash/pipelines/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/views/logstash/pipelines/index.js
@@ -23,6 +23,7 @@ import { CODE_PATH_LOGSTASH } from '../../../../common/constants';
  */
 
 const getPageData = ($injector, _api = undefined, routeOptions = {}) => {
+  _api; // to fix eslint
   const $http = $injector.get('$http');
   const globalState = $injector.get('globalState');
   const Private = $injector.get('Private');
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js b/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js
index dcc8ad8fc8b64d..2a408f5295aef8 100644
--- a/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js
+++ b/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js
@@ -48,7 +48,7 @@ export class CloudService {
    * @param {Object} _request 'request' HTTP handler.
    * @return {Promise} Never {@code null} {@code CloudServiceResponse}.
    */
-  _checkIfService(_request) {
+  _checkIfService() {
     return Promise.reject(new Error('not implemented'));
   }
 
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
index 755b89a0409d02..d3a43ed6518278 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
@@ -116,7 +116,7 @@ export class LatencyMetric extends ElasticsearchMetric {
       },
     };
 
-    this.calculation = (bucket, _key, _metric, _bucketSizeInSeconds) => {
+    this.calculation = bucket => {
       const timeInMillisDeriv = _.get(bucket, 'event_time_in_millis_deriv.normalized_value', null);
       const totalEventsDeriv = _.get(bucket, 'event_total_deriv.normalized_value', null);
 
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js
index c76edf90613963..eddcfabe83b1be 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js
@@ -90,7 +90,7 @@ export class LogstashEventsLatencyClusterMetric extends LogstashClusterMetric {
       },
     };
 
-    this.calculation = (bucket, _key, _metric, _bucketSizeInSeconds) => {
+    this.calculation = bucket => {
       const timeInMillisDeriv = _.get(bucket, 'events_time_in_millis_deriv.normalized_value', null);
       const totalEventsDeriv = _.get(bucket, 'events_total_deriv.normalized_value', null);
 
@@ -189,7 +189,7 @@ export class LogstashEventsLatencyMetric extends LogstashMetric {
       },
     };
 
-    this.calculation = (bucket, _key, _metric, _bucketSizeInSeconds) => {
+    this.calculation = bucket => {
       const timeInMillisDeriv = _.get(bucket, 'events_time_in_millis_deriv.normalized_value', null);
       const totalEventsDeriv = _.get(bucket, 'events_total_deriv.normalized_value', null);
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
index 9ba7cfbcac1d89..1b7ba3c90bab1b 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
@@ -43,7 +43,7 @@ describe('headers', () => {
     };
 
     const encryptedHeaders = await encryptHeaders(headers);
-    const { decryptedHeaders } = await decryptJobHeaders({
+    const decryptedHeaders = await decryptJobHeaders({
       job: {
         title: 'cool-job-bro',
         type: 'csv',
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
index 486181117bbfbd..436b2c2dab1ad5 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
@@ -17,22 +17,18 @@ export const decryptJobHeaders = async <
   JobParamsType,
   JobDocPayloadType extends HasEncryptedHeaders
 >({
-  job,
   server,
+  job,
   logger,
 }: {
-  job: JobDocPayloadType;
   server: ServerFacade;
-  logger: Logger;
-}): Promise<{
   job: JobDocPayloadType;
-  server: ServerFacade;
-  decryptedHeaders: Record<string, string>;
-}> => {
+  logger: Logger;
+}): Promise<Record<string, string>> => {
   const crypto: CryptoFactory = cryptoFactory(server);
   try {
     const decryptedHeaders: Record<string, string> = await crypto.decrypt(job.headers);
-    return { job, decryptedHeaders, server };
+    return decryptedHeaders;
   } catch (err) {
     logger.error(err);
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
index 66990c1f37df4f..070bdb4314af9c 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
@@ -27,7 +27,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -44,7 +44,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -65,7 +65,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -82,7 +82,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -97,7 +97,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -120,7 +120,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -137,7 +137,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -153,7 +153,7 @@ test('uses basePath from job when creating saved object service', async () => {
     baz: 'quix',
   };
 
-  const { conditionalHeaders } = await getConditionalHeaders({
+  const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayload<any>,
     filteredHeaders: permittedHeaders,
     server: mockServer,
@@ -180,7 +180,7 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
     baz: 'quix',
   };
 
-  const { conditionalHeaders } = await getConditionalHeaders({
+  const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayload<any>,
     filteredHeaders: permittedHeaders,
     server: mockServer,
@@ -203,7 +203,7 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
 describe('config formatting', () => {
   test(`lowercases server.host`, async () => {
     mockServer = createMockServer({ settings: { 'server.host': 'COOL-HOSTNAME' } });
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: {},
       server: mockServer,
@@ -215,7 +215,7 @@ describe('config formatting', () => {
     mockServer = createMockServer({
       settings: { 'xpack.reporting.kibanaServer.hostname': 'GREAT-HOSTNAME' },
     });
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {
         title: 'cool-job-bro',
         type: 'csv',
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
index 14c092ccfb4a68..975060a8052f07 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
@@ -6,13 +6,13 @@
 import { ConditionalHeaders, ServerFacade } from '../../../types';
 
 export const getConditionalHeaders = <JobDocPayloadType>({
+  server,
   job,
   filteredHeaders,
-  server,
 }: {
+  server: ServerFacade;
   job: JobDocPayloadType;
   filteredHeaders: Record<string, string>;
-  server: ServerFacade;
 }) => {
   const config = server.config();
   const [hostname, port, basePath, protocol] = [
@@ -32,5 +32,5 @@ export const getConditionalHeaders = <JobDocPayloadType>({
     },
   };
 
-  return { job, conditionalHeaders, server };
+  return conditionalHeaders;
 };
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
index 4fca05337ea0c7..ff2c44026315dc 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
@@ -19,7 +19,7 @@ test(`gets logo from uiSettings`, async () => {
     baz: 'quix',
   };
 
-  const { conditionalHeaders } = await getConditionalHeaders({
+  const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayloadPDF,
     filteredHeaders: permittedHeaders,
     server: mockServer,
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
index 9b64e896dad18d..0059276f6df718 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
@@ -9,13 +9,13 @@ import { ConditionalHeaders, ServerFacade } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types'; // Logo is PDF only
 
 export const getCustomLogo = async ({
+  server,
   job,
   conditionalHeaders,
-  server,
 }: {
+  server: ServerFacade;
   job: JobDocPayloadPDF;
   conditionalHeaders: ConditionalHeaders;
-  server: ServerFacade;
 }) => {
   const serverBasePath: string = server.config().get('server.basePath');
 
@@ -38,12 +38,8 @@ export const getCustomLogo = async ({
   };
 
   const savedObjects = server.savedObjects;
-
   const savedObjectsClient = savedObjects.getScopedSavedObjectsClient(fakeRequest);
-
   const uiSettings = server.uiSettingsServiceFactory({ savedObjectsClient });
-
-  const logo = await uiSettings.get(UI_SETTINGS_CUSTOM_PDF_LOGO);
-
-  return { job, conditionalHeaders, logo, server };
+  const logo: string = await uiSettings.get(UI_SETTINGS_CUSTOM_PDF_LOGO);
+  return { conditionalHeaders, logo };
 };
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
index 60735b4abd4463..9b2a065427f70b 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
@@ -22,29 +22,26 @@ beforeEach(() => {
 });
 
 test(`fails if no URL is passed`, async () => {
-  await expect(
+  const fn = () =>
     getFullUrls({
       job: {},
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: No valid URL fields found in Job Params! Expected \`job.relativeUrl\` or \`job.objects[{ relativeUrl }]\`]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"No valid URL fields found in Job Params! Expected \`job.relativeUrl: string\` or \`job.relativeUrls: string[]\`"`
   );
 });
 
 test(`fails if URLs are file-protocols for PNGs`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const relativeUrl = 'file://etc/passwd/#/something';
-  await expect(
+  const fn = () =>
     getFullUrls({
-      job: {
-        relativeUrl,
-        forceNow,
-      },
+      job: { relativeUrl, forceNow },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: file://etc/passwd/#/something"`
   );
 });
 
@@ -52,36 +49,29 @@ test(`fails if URLs are absolute for PNGs`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const relativeUrl =
     'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something';
-  await expect(
+  const fn = () =>
     getFullUrls({
-      job: {
-        relativeUrl,
-        forceNow,
-      },
+      job: { relativeUrl, forceNow },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something"`
   );
 });
 
 test(`fails if URLs are file-protocols for PDF`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const relativeUrl = 'file://etc/passwd/#/something';
-  await expect(
+  const fn = () =>
     getFullUrls({
       job: {
-        objects: [
-          {
-            relativeUrl,
-          },
-        ],
+        relativeUrls: [relativeUrl],
         forceNow,
       },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: file://etc/passwd/#/something"`
   );
 });
 
@@ -89,70 +79,52 @@ test(`fails if URLs are absolute for PDF`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const relativeUrl =
     'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something';
-  await expect(
+  const fn = () =>
     getFullUrls({
       job: {
-        objects: [
-          {
-            relativeUrl,
-          },
-        ],
+        relativeUrls: [relativeUrl],
         forceNow,
       },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something"`
   );
 });
 
 test(`fails if any URLs are absolute or file's for PDF`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
-  const objects = [
-    {
-      relativeUrl: '/app/kibana#/something_aaa',
-    },
-    {
-      relativeUrl:
-        'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
-    },
-    {
-      relativeUrl: 'file://etc/passwd/#/something',
-    },
+  const relativeUrls = [
+    '/app/kibana#/something_aaa',
+    'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
+    'file://etc/passwd/#/something',
   ];
-  await expect(
+
+  const fn = () =>
     getFullUrls({
-      job: {
-        objects,
-        forceNow,
-      },
+      job: { relativeUrls, forceNow },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${objects[1].relativeUrl} ${objects[2].relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something file://etc/passwd/#/something"`
   );
 });
 
 test(`fails if URL does not route to a visualization`, async () => {
-  await expect(
+  const fn = () =>
     getFullUrls({
-      job: {
-        relativeUrl: '/app/phoney',
-      },
+      job: { relativeUrl: '/app/phoney' },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: No valid hash in the URL! A hash is expected for the application to route to the intended visualization.]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"No valid hash in the URL! A hash is expected for the application to route to the intended visualization."`
   );
 });
 
 test(`adds forceNow to hash's query, if it exists`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
-  const { urls } = await getFullUrls({
-    job: {
-      relativeUrl: '/app/kibana#/something',
-      forceNow,
-    },
+  const urls = await getFullUrls({
+    job: { relativeUrl: '/app/kibana#/something', forceNow },
     server: mockServer,
   } as FullUrlsOpts);
 
@@ -164,11 +136,8 @@ test(`adds forceNow to hash's query, if it exists`, async () => {
 test(`appends forceNow to hash's query, if it exists`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
 
-  const { urls } = await getFullUrls({
-    job: {
-      relativeUrl: '/app/kibana#/something?_g=something',
-      forceNow,
-    },
+  const urls = await getFullUrls({
+    job: { relativeUrl: '/app/kibana#/something?_g=something', forceNow },
     server: mockServer,
   } as FullUrlsOpts);
 
@@ -178,10 +147,8 @@ test(`appends forceNow to hash's query, if it exists`, async () => {
 });
 
 test(`doesn't append forceNow query to url, if it doesn't exists`, async () => {
-  const { urls } = await getFullUrls({
-    job: {
-      relativeUrl: '/app/kibana#/something',
-    },
+  const urls = await getFullUrls({
+    job: { relativeUrl: '/app/kibana#/something' },
     server: mockServer,
   } as FullUrlsOpts);
 
@@ -190,13 +157,13 @@ test(`doesn't append forceNow query to url, if it doesn't exists`, async () => {
 
 test(`adds forceNow to each of multiple urls`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
-  const { urls } = await getFullUrls({
+  const urls = await getFullUrls({
     job: {
-      objects: [
-        { relativeUrl: '/app/kibana#/something_aaa' },
-        { relativeUrl: '/app/kibana#/something_bbb' },
-        { relativeUrl: '/app/kibana#/something_ccc' },
-        { relativeUrl: '/app/kibana#/something_ddd' },
+      relativeUrls: [
+        '/app/kibana#/something_aaa',
+        '/app/kibana#/something_bbb',
+        '/app/kibana#/something_ccc',
+        '/app/kibana#/something_ddd',
       ],
       forceNow,
     },
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
index 59c748aba96627..ca64d8632dbfeb 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
@@ -12,7 +12,7 @@ import {
 } from 'url';
 import { getAbsoluteUrlFactory } from '../../../common/get_absolute_url';
 import { validateUrls } from '../../../common/validate_urls';
-import { ServerFacade, ConditionalHeaders } from '../../../types';
+import { ServerFacade } from '../../../types';
 import { JobDocPayloadPNG } from '../../png/types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 
@@ -20,18 +20,15 @@ function isPngJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloa
   return (job as JobDocPayloadPNG).relativeUrl !== undefined;
 }
 function isPdfJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloadPDF {
-  return (job as JobDocPayloadPDF).objects !== undefined;
+  return (job as JobDocPayloadPDF).relativeUrls !== undefined;
 }
 
-export async function getFullUrls<JobDocPayloadType>({
-  job,
+export function getFullUrls<JobDocPayloadType>({
   server,
-  ...mergeValues // pass-throughs
+  job,
 }: {
-  job: JobDocPayloadPDF | JobDocPayloadPNG;
   server: ServerFacade;
-  conditionalHeaders: ConditionalHeaders;
-  logo?: string;
+  job: JobDocPayloadPDF | JobDocPayloadPNG;
 }) {
   const config = server.config();
 
@@ -48,10 +45,10 @@ export async function getFullUrls<JobDocPayloadType>({
   if (isPngJob(job)) {
     relativeUrls = [job.relativeUrl];
   } else if (isPdfJob(job)) {
-    relativeUrls = job.objects.map(obj => obj.relativeUrl);
+    relativeUrls = job.relativeUrls;
   } else {
     throw new Error(
-      `No valid URL fields found in Job Params! Expected \`job.relativeUrl\` or \`job.objects[{ relativeUrl }]\``
+      `No valid URL fields found in Job Params! Expected \`job.relativeUrl: string\` or \`job.relativeUrls: string[]\``
     );
   }
 
@@ -96,5 +93,5 @@ export async function getFullUrls<JobDocPayloadType>({
     });
   });
 
-  return { job, server, urls, ...mergeValues };
+  return urls;
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.test.ts
index 4d4b0c8ade3f69..f446369fec78ce 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.test.ts
@@ -4,14 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createMockServer } from '../../../test_helpers/create_mock_server';
 import { omitBlacklistedHeaders } from './index';
 
-let mockServer: any;
-beforeEach(() => {
-  mockServer = createMockServer('');
-});
-
 test(`omits blacklisted headers`, async () => {
   const permittedHeaders = {
     foo: 'bar',
@@ -27,7 +21,7 @@ test(`omits blacklisted headers`, async () => {
     'transfer-encoding': '',
   };
 
-  const { filteredHeaders } = await omitBlacklistedHeaders({
+  const filteredHeaders = await omitBlacklistedHeaders({
     job: {
       title: 'cool-job-bro',
       type: 'csv',
@@ -41,7 +35,6 @@ test(`omits blacklisted headers`, async () => {
       ...permittedHeaders,
       ...blacklistedHeaders,
     },
-    server: mockServer,
   });
 
   expect(filteredHeaders).toEqual(permittedHeaders);
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.ts
index 1bd52a0f1b2d2a..cbebd6bc21b0e6 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.ts
@@ -5,20 +5,17 @@
  */
 import { omit } from 'lodash';
 import { KBN_SCREENSHOT_HEADER_BLACKLIST } from '../../../common/constants';
-import { ServerFacade } from '../../../types';
 
 export const omitBlacklistedHeaders = <JobDocPayloadType>({
   job,
   decryptedHeaders,
-  server,
 }: {
   job: JobDocPayloadType;
   decryptedHeaders: Record<string, string>;
-  server: ServerFacade;
 }) => {
   const filteredHeaders: Record<string, string> = omit(
     decryptedHeaders,
     KBN_SCREENSHOT_HEADER_BLACKLIST
   );
-  return { job, filteredHeaders, server };
+  return filteredHeaders;
 };
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts
index 152ef32e331b98..b83021d5e38dd8 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts
@@ -5,21 +5,9 @@
  */
 
 import * as Rx from 'rxjs';
-import { first, mergeMap } from 'rxjs/operators';
-import {
-  ServerFacade,
-  CaptureConfig,
-  HeadlessChromiumDriverFactory,
-  HeadlessChromiumDriver as HeadlessBrowser,
-} from '../../../../types';
-import {
-  ElementsPositionAndAttribute,
-  ScreenshotResults,
-  ScreenshotObservableOpts,
-  TimeRange,
-} from './types';
-
-import { checkForToastMessage } from './check_for_toast';
+import { first, mergeMap, toArray } from 'rxjs/operators';
+import { ServerFacade, CaptureConfig, HeadlessChromiumDriverFactory } from '../../../../types';
+import { ScreenshotResults, ScreenshotObservableOpts } from './types';
 import { injectCustomCss } from './inject_css';
 import { openUrl } from './open_url';
 import { waitForRenderComplete } from './wait_for_render';
@@ -28,6 +16,7 @@ import { waitForElementsToBeInDOM } from './wait_for_dom_elements';
 import { getTimeRange } from './get_time_range';
 import { getElementPositionAndAttributes } from './get_element_position_data';
 import { getScreenshots } from './get_screenshots';
+import { scanPage } from './scan_page';
 import { skipTelemetry } from './skip_telemetry';
 
 export function screenshotsObservableFactory(
@@ -39,108 +28,68 @@ export function screenshotsObservableFactory(
 
   return function screenshotsObservable({
     logger,
-    url,
+    urls,
     conditionalHeaders,
     layout,
     browserTimezone,
-  }: ScreenshotObservableOpts): Rx.Observable<ScreenshotResults> {
-    const create$ = browserDriverFactory.create({
-      viewport: layout.getBrowserViewport(),
-      browserTimezone,
-    });
+  }: ScreenshotObservableOpts): Rx.Observable<ScreenshotResults[]> {
+    const create$ = browserDriverFactory.createPage(
+      { viewport: layout.getBrowserViewport(), browserTimezone },
+      logger
+    );
 
-    // @ts-ignore this needs to be refactored to use less random type declaration and instead rely on structures that work with inference TODO
-    return create$.pipe(
-      mergeMap(({ driver$, exit$ }) => {
-        const screenshot$ = driver$.pipe(
-          mergeMap(
-            (browser: HeadlessBrowser) => openUrl(browser, url, conditionalHeaders, logger),
-            browser => browser
-          ),
-          mergeMap(
-            (browser: HeadlessBrowser) => skipTelemetry(browser, logger),
-            browser => browser
-          ),
-          mergeMap(
-            (browser: HeadlessBrowser) => {
-              logger.debug(
-                'waiting for elements or items count attribute; or not found to interrupt'
-              );
+    return Rx.from(urls).pipe(
+      mergeMap(url => {
+        return create$.pipe(
+          mergeMap(({ driver, exit$ }) => {
+            const screenshot$ = Rx.of(driver).pipe(
+              mergeMap(() => openUrl(driver, url, conditionalHeaders, logger)),
+              mergeMap(() => skipTelemetry(driver, logger)),
+              mergeMap(() => scanPage(driver, layout, logger)),
+              mergeMap(() => getNumberOfItems(driver, layout, logger)),
+              mergeMap(async itemsCount => {
+                const viewport = layout.getViewport(itemsCount);
+                await Promise.all([
+                  driver.setViewport(viewport, logger),
+                  waitForElementsToBeInDOM(driver, itemsCount, layout, logger),
+                ]);
+              }),
+              mergeMap(async () => {
+                // Waiting till _after_ elements have rendered before injecting our CSS
+                // allows for them to be displayed properly in many cases
+                await injectCustomCss(driver, layout, logger);
 
-              // 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
-              const renderSuccess = browser.waitForSelector(
-                `${layout.selectors.renderComplete},[${layout.selectors.itemsCountAttribute}]`,
-                {},
-                logger
-              );
-              const renderError = checkForToastMessage(browser, layout, logger);
-              return Rx.race(Rx.from(renderSuccess), Rx.from(renderError));
-            },
-            browser => browser
-          ),
-          mergeMap(
-            (browser: HeadlessBrowser) => getNumberOfItems(browser, layout, logger),
-            (browser, itemsCount: number) => ({ browser, itemsCount })
-          ),
-          mergeMap(
-            async ({ browser, itemsCount }) => {
-              logger.debug('setting viewport');
-              const viewport = layout.getViewport(itemsCount);
-              return await browser.setViewport(viewport, logger);
-            },
-            ({ browser, itemsCount }) => ({ browser, itemsCount })
-          ),
-          mergeMap(
-            ({ browser, itemsCount }) =>
-              waitForElementsToBeInDOM(browser, itemsCount, layout, logger),
-            ({ browser }) => browser
-          ),
-          mergeMap(
-            browser => {
-              // Waiting till _after_ elements have rendered before injecting our CSS
-              // allows for them to be displayed properly in many cases
-              return injectCustomCss(browser, layout, logger);
-            },
-            browser => browser
-          ),
-          mergeMap(
-            async browser => {
-              if (layout.positionElements) {
-                // position panel elements for print layout
-                return await layout.positionElements(browser, logger);
-              }
-            },
-            browser => browser
-          ),
-          mergeMap(
-            (browser: HeadlessBrowser) => {
-              return waitForRenderComplete(captureConfig, browser, layout, logger);
-            },
-            browser => browser
-          ),
-          mergeMap(
-            browser => getTimeRange(browser, layout, logger),
-            (browser, timeRange: TimeRange | null) => ({ browser, timeRange })
-          ),
-          mergeMap(
-            ({ browser }) => getElementPositionAndAttributes(browser, layout),
-            ({ browser, timeRange }, elementsPositionAndAttributes: ElementsPositionAndAttribute[]) => {
-              return { browser, timeRange, elementsPositionAndAttributes };
-            } // prettier-ignore
-          ),
-          mergeMap(
-            ({ browser, elementsPositionAndAttributes }) => {
-              return getScreenshots({ browser, elementsPositionAndAttributes, logger });
-            },
-            ({ timeRange }, screenshots) => ({ timeRange, screenshots })
-          )
-        );
+                if (layout.positionElements) {
+                  // position panel elements for print layout
+                  await layout.positionElements(driver, logger);
+                }
 
-        return Rx.race(screenshot$, exit$);
+                await waitForRenderComplete(captureConfig, driver, layout, logger);
+              }),
+              mergeMap(() => getTimeRange(driver, layout, logger)),
+              mergeMap(
+                async (timeRange): Promise<ScreenshotResults> => {
+                  const elementsPositionAndAttributes = await getElementPositionAndAttributes(
+                    driver,
+                    layout
+                  );
+                  const screenshots = await getScreenshots({
+                    browser: driver,
+                    elementsPositionAndAttributes,
+                    logger,
+                  });
+
+                  return { timeRange, screenshots };
+                }
+              )
+            );
+
+            return Rx.race(screenshot$, exit$);
+          })
+        );
       }),
-      first()
+      first(),
+      toArray()
     );
   };
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/scan_page.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/scan_page.ts
new file mode 100644
index 00000000000000..81ff01bb204b86
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/scan_page.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as Rx from 'rxjs';
+import { HeadlessChromiumDriver } from '../../../../server/browsers/chromium/driver';
+import { LevelLogger } from '../../../../server/lib';
+import { LayoutInstance } from '../../layouts/layout';
+import { checkForToastMessage } from './check_for_toast';
+
+export function scanPage(
+  browser: HeadlessChromiumDriver,
+  layout: LayoutInstance,
+  logger: LevelLogger
+) {
+  logger.debug('waiting for elements or items count attribute; or not found to interrupt');
+
+  // 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
+  const renderSuccess = browser.waitForSelector(
+    `${layout.selectors.renderComplete},[${layout.selectors.itemsCountAttribute}]`,
+    {},
+    logger
+  );
+  const renderError = checkForToastMessage(browser, layout, logger);
+  return Rx.race(Rx.from(renderSuccess), Rx.from(renderError));
+}
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
index 4f461ef4ec5f98..78cd42f0cae2fd 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
@@ -10,7 +10,7 @@ import { LayoutInstance } from '../../layouts/layout';
 
 export interface ScreenshotObservableOpts {
   logger: LevelLogger;
-  url: string;
+  urls: string[];
   conditionalHeaders: ConditionalHeaders;
   layout: LayoutInstance;
   browserTimezone: string;
@@ -36,6 +36,6 @@ export interface Screenshot {
 }
 
 export interface ScreenshotResults {
-  timeRange: TimeRange;
+  timeRange: TimeRange | null;
   screenshots: Screenshot[];
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
index 0888d287af07c6..1be65722fa668b 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
@@ -27,7 +27,7 @@ beforeEach(() => {
     'server.port': 5601,
   };
   mockServer = {
-    expose: () => {},
+    expose: () => {}, // NOTE: this is for oncePerServer
     config: memoize(() => ({ get: jest.fn() })),
     info: {
       protocol: 'http',
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
index b289ae45dde678..c2fda05fbe3e93 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
@@ -5,7 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap, catchError, map, takeUntil } from 'rxjs/operators';
+import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PLUGIN_ID, PNG_JOB_TYPE } from '../../../../common/constants';
 import {
   ServerFacade,
@@ -32,18 +32,14 @@ export const executeJobFactory: QueuedPngExecutorFactory = function executeJobFa
   const generatePngObservable = generatePngObservableFactory(server, browserDriverFactory);
   const logger = LevelLogger.createForServer(server, [PLUGIN_ID, PNG_JOB_TYPE, 'execute']);
 
-  return function executeJob(
-    jobId: string,
-    jobToExecute: JobDocPayloadPNG,
-    cancellationToken: any
-  ) {
+  return function executeJob(jobId: string, job: JobDocPayloadPNG, cancellationToken: any) {
     const jobLogger = logger.clone([jobId]);
-    const process$ = Rx.of({ job: jobToExecute, server, logger }).pipe(
-      mergeMap(decryptJobHeaders),
-      map(omitBlacklistedHeaders),
-      map(getConditionalHeaders),
-      mergeMap(getFullUrls),
-      mergeMap(({ job, conditionalHeaders, urls }) => {
+    const process$ = Rx.of(1).pipe(
+      mergeMap(() => decryptJobHeaders({ server, job, logger })),
+      map(decryptedHeaders => omitBlacklistedHeaders({ job, decryptedHeaders })),
+      map(filteredHeaders => getConditionalHeaders({ server, job, filteredHeaders })),
+      mergeMap(conditionalHeaders => {
+        const urls = getFullUrls({ server, job });
         const hashUrl = urls[0];
         return generatePngObservable(
           jobLogger,
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
index e2b1474515786e..600762c451a791 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
@@ -32,19 +32,17 @@ export function generatePngObservableFactory(
     const layout = new PreserveLayout(layoutParams.dimensions);
     const screenshots$ = screenshotsObservable({
       logger,
-      url,
+      urls: [url],
       conditionalHeaders,
       layout,
       browserTimezone,
     }).pipe(
-      map(urlScreenshots => {
-        if (urlScreenshots.screenshots.length !== 1) {
-          throw new Error(
-            `Expected there to be 1 screenshot, but there are ${urlScreenshots.screenshots.length}`
-          );
+      map(([{ screenshots }]) => {
+        if (screenshots.length !== 1) {
+          throw new Error(`Expected there to be 1 screenshot, but there are ${screenshots.length}`);
         }
 
-        return urlScreenshots.screenshots[0].base64EncodedData;
+        return screenshots[0].base64EncodedData;
       })
     );
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js
deleted file mode 100644
index a3afd070603b0f..00000000000000
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { uriEncode } from '../lib/uri_encode';
-
-/*
- * TODO: Kibana 8.0:
- * Remove support for parsing Saved Object details from objectType / savedObjectId
- * Including support for determining the Report title from objectType / savedObjectId
- *
- * - `objectType` is optional, but helps differentiate the type of report in the job listing
- * - `title` must be explicitly passed
- * - `relativeUrls` array OR `relativeUrl` string must be passed
- */
-
-const getSavedObjectTitle = async (objectType, savedObjectId, savedObjectsClient) => {
-  const savedObject = await savedObjectsClient.get(objectType, savedObjectId);
-  return savedObject.attributes.title;
-};
-
-const getSavedObjectRelativeUrl = (objectType, savedObjectId, queryString) => {
-  const appPrefixes = {
-    dashboard: '/dashboard/',
-    visualization: '/visualize/edit/',
-    search: '/discover/',
-  };
-
-  const appPrefix = appPrefixes[objectType];
-  if (!appPrefix) throw new Error('Unexpected app type: ' + objectType);
-
-  const hash = appPrefix + uriEncode.string(savedObjectId, true);
-
-  return `/app/kibana#${hash}?${queryString || ''}`;
-};
-
-export function compatibilityShimFactory(server, logger) {
-  return function compatibilityShimFactory(createJobFn) {
-    return async function(
-      {
-        savedObjectId, // deprecating
-        queryString, // deprecating
-        browserTimezone,
-        objectType,
-        title,
-        relativeUrls,
-        layout,
-      },
-      headers,
-      request
-    ) {
-      // input validation and deprecation logging
-      if (savedObjectId) {
-        if (typeof savedObjectId !== 'string') {
-          throw new Error('Invalid savedObjectId (deprecated). String is expected.');
-        }
-        if (relativeUrls) {
-          throw new Error(`savedObjectId should not be provided if relativeUrls are provided`);
-        }
-      } else {
-        if (!relativeUrls) {
-          throw new Error(`Either relativeUrls or savedObjectId must be provided`);
-        }
-        if (!Array.isArray(relativeUrls)) {
-          throw new Error('Invalid relativeUrls. String[] is expected.');
-        }
-        relativeUrls.forEach(url => {
-          if (typeof url !== 'string') {
-            throw new Error('Invalid Relative URL in relativeUrls. String is expected.');
-          }
-        });
-      }
-
-      let kibanaRelativeUrls;
-      if (relativeUrls) {
-        kibanaRelativeUrls = relativeUrls;
-      } else {
-        kibanaRelativeUrls = [getSavedObjectRelativeUrl(objectType, savedObjectId, queryString)];
-        logger.warning(
-          `The relativeUrls have been derived from saved object parameters. ` +
-            `This functionality will be removed with the next major version.`
-        );
-      }
-
-      let reportTitle;
-      try {
-        if (title) {
-          reportTitle = title;
-        } else {
-          if (objectType && savedObjectId) {
-            reportTitle = await getSavedObjectTitle(
-              objectType,
-              savedObjectId,
-              request.getSavedObjectsClient()
-            );
-            logger.warning(
-              `The title has been derived from saved object parameters. This ` +
-                `functionality will be removed with the next major version.`
-            );
-          } else {
-            logger.warning(
-              `A title parameter should be provided with the job generation ` +
-                `request. Please use Kibana to regenerate your POST URL to have a ` +
-                `title included in the PDF.`
-            );
-          }
-        }
-      } catch (err) {
-        logger.error(err); // 404 for the savedObjectId, etc
-        throw err;
-      }
-
-      const transformedJobParams = {
-        objectType,
-        title: reportTitle,
-        relativeUrls: kibanaRelativeUrls,
-        browserTimezone,
-        layout,
-      };
-
-      return await createJobFn(transformedJobParams, headers, request);
-    };
-  };
-}
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.test.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.test.js
deleted file mode 100644
index b3b8bca1d89555..00000000000000
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.test.js
+++ /dev/null
@@ -1,297 +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 { once } from 'lodash';
-import { compatibilityShimFactory } from './compatibility_shim';
-
-const createMockServer = () => {
-  return {
-    expose: jest.fn(), //fool once_per_server
-    log: jest.fn(),
-  };
-};
-
-const createMockLogger = () => ({
-  warning: jest.fn(),
-  error: jest.fn(),
-});
-
-const createMockRequest = () => {
-  return {
-    getSavedObjectsClient: once(function() {
-      return {
-        get: jest.fn(),
-      };
-    }),
-  };
-};
-
-test(`passes title through if provided`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-  const title = 'test title';
-
-  const createJobMock = jest.fn();
-  await compatibilityShim(createJobMock)(
-    { title, relativeUrls: ['/something'] },
-    null,
-    createMockRequest()
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].title).toBe(title);
-});
-
-test(`gets the title from the savedObject`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-  const title = 'savedTitle';
-  mockRequest.getSavedObjectsClient().get.mockReturnValue({
-    attributes: {
-      title,
-    },
-  });
-
-  await compatibilityShim(createJobMock)(
-    { objectType: 'search', savedObjectId: 'abc' },
-    null,
-    mockRequest
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(2);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].title).toBe(title);
-});
-
-test(`passes the objectType and savedObjectId to the savedObjectsClient`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-  mockRequest.getSavedObjectsClient().get.mockReturnValue({
-    attributes: {
-      title: '',
-    },
-  });
-
-  const objectType = 'search';
-  const savedObjectId = 'abc';
-  await compatibilityShim(createJobMock)({ objectType, savedObjectId }, null, mockRequest);
-
-  expect(mockLogger.warning.mock.calls.length).toBe(2);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.warning.mock.calls[1][0]).toEqual(
-    'The title has been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  const getMock = mockRequest.getSavedObjectsClient().get.mock;
-  expect(getMock.calls.length).toBe(1);
-  expect(getMock.calls[0][0]).toBe(objectType);
-  expect(getMock.calls[0][1]).toBe(savedObjectId);
-});
-
-test(`logs no warnings when title and relativeUrls is passed`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-
-  await compatibilityShim(createJobMock)(
-    { title: 'Phenomenal Dashboard', relativeUrls: ['/abc', '/def'] },
-    null,
-    mockRequest
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-});
-
-test(`logs warning if title can not be provided`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-  await compatibilityShim(createJobMock)({ relativeUrls: ['/abc'] }, null, mockRequest);
-
-  expect(mockLogger.warning.mock.calls.length).toBe(1);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    `A title parameter should be provided with the job generation request. Please ` +
-      `use Kibana to regenerate your POST URL to have a title included in the PDF.`
-  );
-});
-
-test(`logs deprecations when generating the title/relativeUrl using the savedObject`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-  mockRequest.getSavedObjectsClient().get.mockReturnValue({
-    attributes: {
-      title: '',
-    },
-  });
-
-  await compatibilityShim(createJobMock)(
-    { objectType: 'search', savedObjectId: 'abc' },
-    null,
-    mockRequest
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(2);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.warning.mock.calls[1][0]).toEqual(
-    'The title has been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-});
-
-test(`passes objectType through`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-
-  const objectType = 'foo';
-  await compatibilityShim(createJobMock)(
-    { title: 'test', relativeUrls: ['/something'], objectType },
-    null,
-    mockRequest
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].objectType).toBe(objectType);
-});
-
-test(`passes the relativeUrls through`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-
-  const relativeUrls = ['/app/kibana#something', '/app/kibana#something-else'];
-  await compatibilityShim(createJobMock)({ title: 'test', relativeUrls }, null, null);
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].relativeUrls).toBe(relativeUrls);
-});
-
-const testSavedObjectRelativeUrl = (objectType, expectedUrl) => {
-  test(`generates the saved object relativeUrl for ${objectType}`, async () => {
-    const mockLogger = createMockLogger();
-    const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-    const createJobMock = jest.fn();
-
-    await compatibilityShim(createJobMock)(
-      { title: 'test', objectType, savedObjectId: 'abc' },
-      null,
-      null
-    );
-
-    expect(mockLogger.warning.mock.calls.length).toBe(1);
-    expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-      'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-    );
-    expect(mockLogger.error.mock.calls.length).toBe(0);
-
-    expect(createJobMock.mock.calls.length).toBe(1);
-    expect(createJobMock.mock.calls[0][0].relativeUrls).toEqual([expectedUrl]);
-  });
-};
-
-testSavedObjectRelativeUrl('search', '/app/kibana#/discover/abc?');
-testSavedObjectRelativeUrl('visualization', '/app/kibana#/visualize/edit/abc?');
-testSavedObjectRelativeUrl('dashboard', '/app/kibana#/dashboard/abc?');
-
-test(`appends the queryString to the relativeUrl when generating from the savedObject`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-  const createJobMock = jest.fn();
-
-  await compatibilityShim(createJobMock)(
-    { title: 'test', objectType: 'search', savedObjectId: 'abc', queryString: 'foo=bar' },
-    null,
-    null
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(1);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].relativeUrls).toEqual([
-    '/app/kibana#/discover/abc?foo=bar',
-  ]);
-});
-
-test(`throw an Error if the objectType, savedObjectId and relativeUrls are provided`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-  const createJobMock = jest.fn();
-
-  const promise = compatibilityShim(createJobMock)(
-    {
-      title: 'test',
-      objectType: 'something',
-      relativeUrls: ['/something'],
-      savedObjectId: 'abc',
-    },
-    null,
-    null
-  );
-
-  await expect(promise).rejects.toBeDefined();
-});
-
-test(`passes headers and request through`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-
-  const headers = {};
-  const request = createMockRequest();
-
-  await compatibilityShim(createJobMock)(
-    { title: 'test', relativeUrls: ['/something'] },
-    headers,
-    request
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][1]).toBe(headers);
-  expect(createJobMock.mock.calls[0][2]).toBe(request);
-});
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
index d17713057abc1e..a8cc71175cffeb 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PLUGIN_ID, PDF_JOB_TYPE } from '../../../../common/constants';
 import {
   CreateJobFactory,
   ESQueueCreateJobFn,
@@ -13,29 +12,16 @@ import {
   ConditionalHeaders,
 } from '../../../../types';
 import { validateUrls } from '../../../../common/validate_urls';
-import { LevelLogger } from '../../../../server/lib';
 import { cryptoFactory } from '../../../../server/lib/crypto';
 import { JobParamsPDF } from '../../types';
-// @ts-ignore untyped module
-import { compatibilityShimFactory } from './compatibility_shim';
-
-interface CreateJobFnOpts {
-  objectType: any;
-  title: string;
-  relativeUrls: string[];
-  browserTimezone: string;
-  layout: any;
-}
 
 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
   JobParamsPDF
 >> = function createJobFactoryFn(server: ServerFacade) {
-  const logger = LevelLogger.createForServer(server, [PLUGIN_ID, PDF_JOB_TYPE, 'create']);
-  const compatibilityShim = compatibilityShimFactory(server, logger);
   const crypto = cryptoFactory(server);
 
-  return compatibilityShim(async function createJobFn(
-    { objectType, title, relativeUrls, browserTimezone, layout }: CreateJobFnOpts,
+  return async function createJobFn(
+    { title, relativeUrls, browserTimezone, layout, objectType }: JobParamsPDF,
     headers: ConditionalHeaders['headers'],
     request: RequestFacade
   ) {
@@ -44,14 +30,14 @@ export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
     validateUrls(relativeUrls);
 
     return {
-      type: objectType, // Note: this changes the shape of the job params object
-      title,
-      objects: relativeUrls.map(u => ({ relativeUrl: u })),
-      headers: serializedEncryptedHeaders,
-      browserTimezone,
-      layout,
       basePath: request.getBasePath(),
+      browserTimezone,
       forceNow: new Date().toISOString(),
+      headers: serializedEncryptedHeaders,
+      layout,
+      relativeUrls,
+      title,
+      objectType,
     };
-  });
+  };
 };
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
index db7b599a1aaabb..ddbee6e9d54a46 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
@@ -27,7 +27,8 @@ beforeEach(() => {
     'server.port': 5601,
   };
   mockServer = {
-    expose: () => {},
+    expose: jest.fn(),
+    log: jest.fn(),
     config: memoize(() => ({ get: jest.fn() })),
     info: {
       protocol: 'http',
@@ -71,7 +72,7 @@ test(`passes browserTimezone to generatePdf`, async () => {
   const browserTimezone = 'UTC';
   await executeJob(
     'pdfJobId',
-    { objects: [], browserTimezone, headers: encryptedHeaders },
+    { relativeUrls: [], browserTimezone, headers: encryptedHeaders },
     cancellationToken
   );
 
@@ -96,7 +97,7 @@ test(`returns content_type of application/pdf`, async () => {
 
   const { content_type: contentType } = await executeJob(
     'pdfJobId',
-    { objects: [], timeRange: {}, headers: encryptedHeaders },
+    { relativeUrls: [], timeRange: {}, headers: encryptedHeaders },
     cancellationToken
   );
   expect(contentType).toBe('application/pdf');
@@ -112,7 +113,7 @@ test(`returns content of generatePdf getBuffer base64 encoded`, async () => {
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pdfJobId',
-    { objects: [], timeRange: {}, headers: encryptedHeaders },
+    { relativeUrls: [], timeRange: {}, headers: encryptedHeaders },
     cancellationToken
   );
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
index e2b3183464cf24..d85207e6712125 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
@@ -5,7 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap, catchError, map, takeUntil } from 'rxjs/operators';
+import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import {
   ServerFacade,
   ExecuteJobFactory,
@@ -33,33 +33,28 @@ export const executeJobFactory: QueuedPdfExecutorFactory = function executeJobFa
   const generatePdfObservable = generatePdfObservableFactory(server, browserDriverFactory);
   const logger = LevelLogger.createForServer(server, [PLUGIN_ID, PDF_JOB_TYPE, 'execute']);
 
-  return function executeJob(
-    jobId: string,
-    jobToExecute: JobDocPayloadPDF,
-    cancellationToken: any
-  ) {
+  return function executeJob(jobId: string, job: JobDocPayloadPDF, cancellationToken: any) {
     const jobLogger = logger.clone([jobId]);
 
-    const process$ = Rx.of({ job: jobToExecute, server, logger }).pipe(
-      mergeMap(decryptJobHeaders),
-      map(omitBlacklistedHeaders),
-      map(getConditionalHeaders),
-      mergeMap(getCustomLogo),
-      mergeMap(getFullUrls),
-      mergeMap(
-        ({ job, conditionalHeaders, logo, urls }): Rx.Observable<Buffer> => {
-          const { browserTimezone, layout } = jobToExecute;
-          return generatePdfObservable(
-            jobLogger,
-            job.title,
-            urls,
-            browserTimezone,
-            conditionalHeaders,
-            layout,
-            logo
-          );
-        }
-      ),
+    const process$ = Rx.of(1).pipe(
+      mergeMap(() => decryptJobHeaders({ server, job, logger })),
+      map(decryptedHeaders => omitBlacklistedHeaders({ job, decryptedHeaders })),
+      map(filteredHeaders => getConditionalHeaders({ server, job, filteredHeaders })),
+      mergeMap(conditionalHeaders => getCustomLogo({ server, job, conditionalHeaders })),
+      mergeMap(({ logo, conditionalHeaders }) => {
+        const urls = getFullUrls({ server, job });
+
+        const { browserTimezone, layout, title } = job;
+        return generatePdfObservable(
+          jobLogger,
+          title,
+          urls,
+          browserTimezone,
+          conditionalHeaders,
+          layout,
+          logo
+        );
+      }),
       map((buffer: Buffer) => ({
         content_type: 'application/pdf',
         content: buffer.toString('base64'),
@@ -72,7 +67,6 @@ export const executeJobFactory: QueuedPdfExecutorFactory = function executeJobFa
     );
 
     const stop$ = Rx.fromEventPattern(cancellationToken.on);
-
     return process$.pipe(takeUntil(stop$)).toPromise();
   };
 };
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
index 898a13a2dfe805..9a8db308bea794 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
@@ -5,7 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { toArray, mergeMap } from 'rxjs/operators';
+import { mergeMap } from 'rxjs/operators';
 import { groupBy } from 'lodash';
 import { LevelLogger } from '../../../../server/lib';
 import { ServerFacade, HeadlessChromiumDriverFactory, ConditionalHeaders } from '../../../../types';
@@ -31,7 +31,6 @@ export function generatePdfObservableFactory(
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
   const screenshotsObservable = screenshotsObservableFactory(server, browserDriverFactory);
-  const captureConcurrency = 1;
 
   return function generatePdfObservable(
     logger: LevelLogger,
@@ -41,15 +40,16 @@ export function generatePdfObservableFactory(
     conditionalHeaders: ConditionalHeaders,
     layoutParams: LayoutParams,
     logo?: string
-  ) {
+  ): Rx.Observable<Buffer> {
     const layout = createLayout(server, layoutParams) as LayoutInstance;
-    const screenshots$ = Rx.from(urls).pipe(
-      mergeMap(
-        url => screenshotsObservable({ logger, url, conditionalHeaders, layout, browserTimezone }),
-        captureConcurrency
-      ),
-      toArray(),
-      mergeMap(async (urlScreenshots: ScreenshotResults[]) => {
+    const screenshots$ = screenshotsObservable({
+      logger,
+      urls,
+      conditionalHeaders,
+      layout,
+      browserTimezone,
+    }).pipe(
+      mergeMap(async urlScreenshots => {
         const pdfOutput = pdf.create(layout, logo);
 
         if (title) {
@@ -68,8 +68,7 @@ export function generatePdfObservableFactory(
         });
 
         pdfOutput.generate();
-        const buffer = await pdfOutput.getBuffer();
-        return buffer;
+        return await pdfOutput.getBuffer();
       })
     );
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
index b51a2d4d5711c8..0a9dcfe986ca63 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
@@ -9,7 +9,7 @@ import { JobDocPayload, ServerFacade, RequestFacade } from '../../types';
 
 // Job params: structure of incoming user request data, after being parsed from RISON
 export interface JobParamsPDF {
-  objectType: string;
+  objectType: string; // visualization, dashboard, etc. Used for job info & telemetry
   title: string;
   relativeUrls: string[];
   browserTimezone: string;
@@ -22,7 +22,5 @@ export interface JobDocPayloadPDF extends JobDocPayload<JobParamsPDF> {
   browserTimezone: string;
   forceNow?: string;
   layout: LayoutParams;
-  objects: Array<{
-    relativeUrl: string;
-  }>;
+  relativeUrls: string[];
 }
diff --git a/x-pack/legacy/plugins/reporting/index.ts b/x-pack/legacy/plugins/reporting/index.ts
index c0c9e458132f05..faa27bfb2d6eae 100644
--- a/x-pack/legacy/plugins/reporting/index.ts
+++ b/x-pack/legacy/plugins/reporting/index.ts
@@ -94,7 +94,7 @@ export const reporting = (kibana: any) => {
       const { xpack_main: xpackMainPlugin } = server.plugins;
       mirrorPluginStatus(xpackMainPlugin, this);
       const checkLicense = checkLicenseFactory(exportTypesRegistry);
-      xpackMainPlugin.status.once('green', () => {
+      (xpackMainPlugin as any).status.once('green', () => {
         // Register a function that is called whenever the xpack info changes,
         // to re-compute the license check results for this plugin
         xpackMainPlugin.info.feature(this.id).registerLicenseCheckResultsGenerator(checkLicense);
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 9783372aa29c4b..320f6220aa9968 100644
--- a/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx
+++ b/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx
@@ -425,7 +425,7 @@ class ReportListingUi extends Component<Props, State> {
             return {
               id: job._id,
               type: source.jobtype,
-              object_type: source.payload.type,
+              object_type: source.payload.objectType,
               object_title: source.payload.title,
               created_by: source.created_by,
               created_at: source.created_at,
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 daa7df343f8aa7..6fa46b893de8ce 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
@@ -31,10 +31,11 @@ type queueTimeout = number;
 
 export class HeadlessChromiumDriverFactory {
   private binaryPath: binaryPath;
-  private logger: Logger;
   private browserConfig: BrowserConfig;
   private queueTimeout: queueTimeout;
   private networkPolicy: NetworkPolicy;
+  private userDataDir: string;
+  private getChromiumArgs: (viewport: BrowserConfig['viewport']) => string[];
 
   constructor(
     binaryPath: binaryPath,
@@ -46,23 +47,30 @@ export class HeadlessChromiumDriverFactory {
     this.binaryPath = binaryPath;
     this.browserConfig = browserConfig;
     this.queueTimeout = queueTimeout;
-    this.logger = logger;
     this.networkPolicy = networkPolicy;
+
+    this.userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
+    this.getChromiumArgs = (viewport: BrowserConfig['viewport']) =>
+      args({
+        userDataDir: this.userDataDir,
+        viewport,
+        disableSandbox: this.browserConfig.disableSandbox,
+        proxy: this.browserConfig.proxy,
+      });
   }
 
   type = 'chromium';
 
-  test({ viewport }: { viewport: BrowserConfig['viewport'] }, logger: Logger) {
-    const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
+  test(logger: Logger) {
     const chromiumArgs = args({
-      userDataDir,
-      viewport,
+      userDataDir: this.userDataDir,
+      viewport: { width: 800, height: 600 },
       disableSandbox: this.browserConfig.disableSandbox,
       proxy: this.browserConfig.proxy,
     });
 
     return puppeteerLaunch({
-      userDataDir,
+      userDataDir: this.userDataDir,
       executablePath: this.binaryPath,
       ignoreHTTPSErrors: true,
       args: chromiumArgs,
@@ -76,33 +84,25 @@ export class HeadlessChromiumDriverFactory {
     });
   }
 
-  create({
-    viewport,
-    browserTimezone,
-  }: {
-    viewport: BrowserConfig['viewport'];
-    browserTimezone: string;
-  }): Rx.Observable<{
-    driver$: Rx.Observable<HeadlessChromiumDriver>;
-    exit$: Rx.Observable<never>;
-  }> {
+  /*
+   * Return an observable to objects which will drive screenshot capture for a page
+   */
+  createPage(
+    { viewport, browserTimezone }: { viewport: BrowserConfig['viewport']; browserTimezone: string },
+    pLogger: Logger
+  ): Rx.Observable<{ driver: HeadlessChromiumDriver; exit$: Rx.Observable<never> }> {
     return Rx.Observable.create(async (observer: InnerSubscriber<any, any>) => {
-      this.logger.debug(`Creating browser driver factory`);
+      const logger = pLogger.clone(['browser-driver']);
+      logger.info(`Creating browser page driver`);
 
-      const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
-      const chromiumArgs = args({
-        userDataDir,
-        viewport,
-        disableSandbox: this.browserConfig.disableSandbox,
-        proxy: this.browserConfig.proxy,
-      });
+      const chromiumArgs = this.getChromiumArgs(viewport);
 
       let browser: Browser;
       let page: Page;
       try {
         browser = await puppeteerLaunch({
           pipe: !this.browserConfig.inspect,
-          userDataDir,
+          userDataDir: this.userDataDir,
           executablePath: this.binaryPath,
           ignoreHTTPSErrors: true,
           args: chromiumArgs,
@@ -119,7 +119,7 @@ export class HeadlessChromiumDriverFactory {
         // "TimeoutError: waiting for selector ".application" failed: timeout 30000ms exceeded"
         page.setDefaultTimeout(this.queueTimeout);
 
-        this.logger.debug(`Browser driver factory created`);
+        logger.debug(`Browser page driver created`);
       } catch (err) {
         observer.error(new Error(`Error spawning Chromium browser: [${err}]`));
         throw err;
@@ -130,12 +130,12 @@ export class HeadlessChromiumDriverFactory {
           await browser.close();
         },
       };
-      const { terminate$ } = safeChildProcess(this.logger, childProcess);
+      const { terminate$ } = safeChildProcess(logger, childProcess);
 
       // this is adding unsubscribe logic to our observer
       // so that if our observer unsubscribes, we terminate our child-process
       observer.add(() => {
-        this.logger.debug(`The browser process observer has unsubscribed. Closing the browser...`);
+        logger.debug(`The browser process observer has unsubscribed. Closing the browser...`);
         childProcess.kill(); // ignore async
       });
 
@@ -144,7 +144,7 @@ export class HeadlessChromiumDriverFactory {
         terminate$
           .pipe(
             tap(signal => {
-              this.logger.debug(`Termination signal received: ${signal}`);
+              logger.debug(`Termination signal received: ${signal}`);
             }),
             ignoreElements()
           )
@@ -152,33 +152,40 @@ export class HeadlessChromiumDriverFactory {
       );
 
       // taps the browser log streams and combine them to Kibana logs
-      this.getBrowserLogger(page).subscribe();
-      this.getProcessLogger(browser).subscribe();
+      this.getBrowserLogger(page, logger).subscribe();
+      this.getProcessLogger(browser, logger).subscribe();
+
+      // HeadlessChromiumDriver: object to "drive" a browser page
+      const driver = new HeadlessChromiumDriver(page, {
+        inspect: this.browserConfig.inspect,
+        networkPolicy: this.networkPolicy,
+      });
 
-      const driver$ = Rx.of(new HeadlessChromiumDriver(page, { inspect: this.browserConfig.inspect, networkPolicy: this.networkPolicy })); //  prettier-ignore
+      // Rx.Observable<never>: stream to interrupt page capture
       const exit$ = this.getPageExit(browser, page);
 
-      observer.next({ driver$, exit$ });
+      observer.next({ driver, exit$ });
 
       // unsubscribe logic makes a best-effort attempt to delete the user data directory used by chromium
       observer.add(() => {
-        this.logger.debug(`deleting chromium user data directory at [${userDataDir}]`);
+        const userDataDir = this.userDataDir;
+        logger.debug(`deleting chromium user data directory at [${userDataDir}]`);
         // the unsubscribe function isn't `async` so we're going to make our best effort at
         // deleting the userDataDir and if it fails log an error.
         del(userDataDir).catch(error => {
-          this.logger.error(`error deleting user data directory at [${userDataDir}]: [${error}]`);
+          logger.error(`error deleting user data directory at [${userDataDir}]: [${error}]`);
         });
       });
     });
   }
 
-  getBrowserLogger(page: Page): Rx.Observable<void> {
+  getBrowserLogger(page: Page, logger: Logger): Rx.Observable<void> {
     const consoleMessages$ = Rx.fromEvent<ConsoleMessage>(page, 'console').pipe(
       map(line => {
         if (line.type() === 'error') {
-          this.logger.error(line.text(), ['headless-browser-console']);
+          logger.error(line.text(), ['headless-browser-console']);
         } else {
-          this.logger.debug(line.text(), [`headless-browser-console:${line.type()}`]);
+          logger.debug(line.text(), [`headless-browser-console:${line.type()}`]);
         }
       })
     );
@@ -187,7 +194,7 @@ export class HeadlessChromiumDriverFactory {
       map(req => {
         const failure = req.failure && req.failure();
         if (failure) {
-          this.logger.warning(
+          logger.warning(
             `Request to [${req.url()}] failed! [${failure.errorText}]. This error will be ignored.`
           );
         }
@@ -197,7 +204,7 @@ export class HeadlessChromiumDriverFactory {
     return Rx.merge(consoleMessages$, pageRequestFailed$);
   }
 
-  getProcessLogger(browser: Browser) {
+  getProcessLogger(browser: Browser, logger: Logger): Rx.Observable<void> {
     const childProcess = browser.process();
     // NOTE: The browser driver can not observe stdout and stderr of the child process
     // Puppeteer doesn't give a handle to the original ChildProcess object
@@ -206,7 +213,7 @@ export class HeadlessChromiumDriverFactory {
     // just log closing of the process
     const processClose$ = Rx.fromEvent<void>(childProcess, 'close').pipe(
       tap(() => {
-        this.logger.debug('child process closed', ['headless-browser-process']);
+        logger.debug('child process closed', ['headless-browser-process']);
       })
     );
 
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/index.ts
index a5ecc405bf9c59..402fabea56c842 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/index.ts
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import * as chromiumDefinition from './chromium';
 
 export { ensureAllBrowsersDownloaded } from './download';
diff --git a/x-pack/legacy/plugins/reporting/server/lib/check_license.js b/x-pack/legacy/plugins/reporting/server/lib/check_license.ts
similarity index 69%
rename from x-pack/legacy/plugins/reporting/server/lib/check_license.js
rename to x-pack/legacy/plugins/reporting/server/lib/check_license.ts
index 5a784f9913352c..02e1196f1d00db 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/check_license.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/check_license.ts
@@ -4,19 +4,31 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { XPackInfo } from '../../../xpack_main/server/lib/xpack_info';
+import { XPackInfoLicense } from '../../../xpack_main/server/lib/xpack_info_license';
+import { ExportTypesRegistry, ExportTypeDefinition } from '../../types';
+
+interface LicenseCheckResult {
+  showLinks: boolean;
+  enableLinks: boolean;
+  message?: string;
+}
+
 const messages = {
   getUnavailable: () => {
     return 'You cannot use Reporting because license information is not available at this time.';
   },
-  getExpired: license => {
+  getExpired: (license: XPackInfoLicense) => {
     return `You cannot use Reporting because your ${license.getType()} license has expired.`;
   },
 };
 
-const makeManagementFeature = exportTypes => {
+const makeManagementFeature = (
+  exportTypes: Array<ExportTypeDefinition<unknown, unknown, unknown, unknown>>
+) => {
   return {
     id: 'management',
-    checkLicense: license => {
+    checkLicense: (license: XPackInfoLicense | null) => {
       if (!license) {
         return {
           showLinks: true,
@@ -46,10 +58,12 @@ const makeManagementFeature = exportTypes => {
   };
 };
 
-const makeExportTypeFeature = exportType => {
+const makeExportTypeFeature = (
+  exportType: ExportTypeDefinition<unknown, unknown, unknown, unknown>
+) => {
   return {
     id: exportType.id,
-    checkLicense: license => {
+    checkLicense: (license: XPackInfoLicense | null) => {
       if (!license) {
         return {
           showLinks: true,
@@ -84,13 +98,9 @@ const makeExportTypeFeature = exportType => {
   };
 };
 
-export function checkLicenseFactory(exportTypesRegistry) {
-  return function checkLicense(xpackLicenseInfo) {
-    const license =
-      xpackLicenseInfo === null || !xpackLicenseInfo.isAvailable()
-        ? null
-        : xpackLicenseInfo.license;
-
+export function checkLicenseFactory(exportTypesRegistry: ExportTypesRegistry) {
+  return function checkLicense(xpackInfo: XPackInfo) {
+    const license = xpackInfo === null || !xpackInfo.isAvailable() ? null : xpackInfo.license;
     const exportTypes = Array.from(exportTypesRegistry.getAll());
     const reportingFeatures = [
       ...exportTypes.map(makeExportTypeFeature),
@@ -100,6 +110,6 @@ export function checkLicenseFactory(exportTypesRegistry) {
     return reportingFeatures.reduce((result, feature) => {
       result[feature.id] = feature.checkLicense(license);
       return result;
-    }, {});
+    }, {} as Record<string, LicenseCheckResult>);
   };
 }
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/create_index.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/create_index.js
index 9e00f0447e99e4..670c2907fb8322 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/create_index.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/create_index.js
@@ -15,7 +15,7 @@ const schema = {
     properties: {
       /**
        * Type of object that is triggering this report. Should be either search, visualization or dashboard.
-       * Used for phone home stats only.
+       * Used for job listing and telemetry stats only.
        */
       objectType: {
         type: 'text',
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js
index cded6d2ce89a8c..a7d8f4df3fd541 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js
@@ -57,7 +57,7 @@ export class Job extends events.EventEmitter {
         meta: {
           // We are copying these values out of payload because these fields are indexed and can be aggregated on
           // for tracking stats, while payload contents are not.
-          objectType: payload.type,
+          objectType: payload.objectType,
           layout: payload.layout ? payload.layout.id : 'none',
         },
         payload: this.payload,
diff --git a/x-pack/legacy/plugins/reporting/server/lib/index.ts b/x-pack/legacy/plugins/reporting/server/lib/index.ts
index 50d1a276b6b5d0..0a2db749cb954a 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/index.ts
@@ -5,7 +5,6 @@
  */
 
 export { getExportTypesRegistry } from './export_types_registry';
-// @ts-ignore untyped module
 export { checkLicenseFactory } from './check_license';
 export { LevelLogger } from './level_logger';
 export { cryptoFactory } from './crypto';
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
index 031709c85284cb..89c49123e85bf2 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
@@ -18,14 +18,12 @@ export const validateBrowser = async (
   logger: Logger
 ) => {
   if (browserFactory.type === BROWSER_TYPE) {
-    return browserFactory
-      .test({ viewport: { width: 800, height: 600 } }, logger)
-      .then((browser: Browser | null) => {
-        if (browser && browser.close) {
-          browser.close();
-        } else {
-          throw new Error('Could not close browser client handle!');
-        }
-      });
+    return browserFactory.test(logger).then((browser: Browser | null) => {
+      if (browser && browser.close) {
+        browser.close();
+      } else {
+        throw new Error('Could not close browser client handle!');
+      }
+    });
   }
 };
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generation.ts b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
index 7bed7bc5773e45..73450b7641c8e4 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generation.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
@@ -17,7 +17,6 @@ import {
 import { registerGenerateFromJobParams } from './generate_from_jobparams';
 import { registerGenerateCsvFromSavedObject } from './generate_from_savedobject';
 import { registerGenerateCsvFromSavedObjectImmediate } from './generate_from_savedobject_immediate';
-import { registerLegacy } from './legacy';
 import { createQueueFactory, enqueueJobFactory } from '../lib';
 
 export function registerJobGenerationRoutes(
@@ -73,7 +72,6 @@ export function registerJobGenerationRoutes(
   }
 
   registerGenerateFromJobParams(server, handler, handleError);
-  registerLegacy(server, handler, handleError);
 
   // Register beta panel-action download-related API's
   if (config.get('xpack.reporting.csv.enablePanelActionDownload')) {
diff --git a/x-pack/legacy/plugins/reporting/server/routes/legacy.ts b/x-pack/legacy/plugins/reporting/server/routes/legacy.ts
deleted file mode 100644
index 011ac4a02bbf9e..00000000000000
--- a/x-pack/legacy/plugins/reporting/server/routes/legacy.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 querystring from 'querystring';
-import { API_BASE_URL } from '../../common/constants';
-import { ServerFacade, RequestFacade, ReportingResponseToolkit } from '../../types';
-import {
-  getRouteConfigFactoryReportingPre,
-  GetRouteConfigFactoryFn,
-} from './lib/route_config_factories';
-import { HandlerErrorFunction, HandlerFunction } from './types';
-
-const getStaticFeatureConfig = (getRouteConfig: GetRouteConfigFactoryFn, featureId: string) =>
-  getRouteConfig(() => featureId);
-
-const BASE_GENERATE = `${API_BASE_URL}/generate`;
-
-export function registerLegacy(
-  server: ServerFacade,
-  handler: HandlerFunction,
-  handleError: HandlerErrorFunction
-) {
-  const getRouteConfig = getRouteConfigFactoryReportingPre(server);
-
-  function createLegacyPdfRoute({ path, objectType }: { path: string; objectType: string }) {
-    const exportTypeId = 'printablePdf';
-    server.route({
-      path,
-      method: 'POST',
-      options: getStaticFeatureConfig(getRouteConfig, exportTypeId),
-      handler: async (request: RequestFacade, h: ReportingResponseToolkit) => {
-        const message = `The following URL is deprecated and will stop working in the next major version: ${request.url.path}`;
-        server.log(['warning', 'reporting', 'deprecation'], message);
-
-        try {
-          const savedObjectId = request.params.savedId;
-          const queryString = querystring.stringify(request.query);
-
-          return await handler(
-            exportTypeId,
-            {
-              objectType,
-              savedObjectId,
-              queryString,
-            },
-            request,
-            h
-          );
-        } catch (err) {
-          throw handleError(exportTypeId, err);
-        }
-      },
-    });
-  }
-
-  createLegacyPdfRoute({
-    path: `${BASE_GENERATE}/visualization/{savedId}`,
-    objectType: 'visualization',
-  });
-
-  createLegacyPdfRoute({
-    path: `${BASE_GENERATE}/search/{savedId}`,
-    objectType: 'search',
-  });
-
-  createLegacyPdfRoute({
-    path: `${BASE_GENERATE}/dashboard/{savedId}`,
-    objectType: 'dashboard',
-  });
-}
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
index 92dace65d466c4..962487312c83df 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
@@ -23,7 +23,7 @@ import {
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
-import { SpaceAvatar } from '../../../../../../../../../spaces/public/components';
+import { SpaceAvatar } from '../../../../../../../../../spaces/public/space_avatar';
 import { Feature } from '../../../../../../../../../../../plugins/features/public';
 import { FeaturesPrivileges, Role } from '../../../../../../../../common/model';
 import { CalculatedPrivilege } from '../../../../../../../lib/kibana_privilege_calculator';
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index e54b5ff9c45da7..65a3df9fb47a1a 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -14,7 +14,7 @@ import {
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component } from 'react';
-import { getSpaceColor } from '../../../../../../../../../spaces/public/lib/space_attributes';
+import { getSpaceColor } from '../../../../../../../../../spaces/public/space_avatar';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
 import {
   FeaturesPrivileges,
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
index e6e206e5fc7f46..0eb9cf0b0ee9d7 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
@@ -8,7 +8,7 @@ import { EuiComboBox, EuiComboBoxOptionProps, EuiHealth, EuiHighlight } from '@e
 import { InjectedIntl } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
-import { getSpaceColor } from '../../../../../../../../../spaces/public/lib/space_attributes';
+import { getSpaceColor } from '../../../../../../../../../spaces/public/space_avatar';
 
 const spaceToOption = (space?: Space, currentSelection?: 'global' | 'spaces') => {
   if (!space) {
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
index 1ab2a27220eeea..a99e389044eaad 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
@@ -14,9 +14,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component } from 'react';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../../spaces/common/constants';
-import { Space } from '../../../../../../../spaces/common/model/space';
-import { SpaceAvatar } from '../../../../../../../spaces/public/components';
+import { SpaceAvatar } from '../../../../../../../spaces/public/space_avatar';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../../../../plugins/spaces/common/constants';
+import { Space } from '../../../../../../../../../plugins/spaces/common/model/space';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/index.ts b/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/index.ts
deleted file mode 100644
index 7a6c7f71bc98c2..00000000000000
--- a/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const logout = (): null => {
-  cy.request({
-    method: 'GET',
-    url: `${Cypress.config().baseUrl}/logout`,
-  }).then(response => {
-    expect(response.status).to.eq(200);
-  });
-  return null;
-};
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/selectors.ts b/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/selectors.ts
deleted file mode 100644
index 8cf015619f4c1f..00000000000000
--- a/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/selectors.ts
+++ /dev/null
@@ -1,11 +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.
- */
-
-/** The avatar / button that represents the logged-in Kibana user */
-export const USER_MENU = '[data-test-subj="userMenuButton"]';
-
-/** Clicking this link logs out the currently logged-in Kibana user */
-export const LOGOUT_LINK = '[data-test-subj="logoutLink"]';
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts
index 85878d82256096..79169d3769a781 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts
@@ -10,7 +10,6 @@ import {
   FIELDS_BROWSER_SELECTED_CATEGORY_TITLE,
   FIELDS_BROWSER_TITLE,
 } from '../../lib/fields_browser/selectors';
-import { logout } from '../../lib/logout';
 import { HOSTS_PAGE } from '../../lib/urls';
 import { loginAndWaitForPage, DEFAULT_TIMEOUT } from '../../lib/util/helpers';
 import {
@@ -46,10 +45,6 @@ describe('Events Viewer', () => {
     clickEventsTab();
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('renders the fields browser with the expected title when the Events Viewer Fields Browser button is clicked', () => {
     openEventsViewerFieldsBrowser();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/fields_browser/fields_browser.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/fields_browser/fields_browser.spec.ts
index dfc5e10893ebbc..95df907893fc7b 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/fields_browser/fields_browser.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/fields_browser/fields_browser.spec.ts
@@ -22,7 +22,6 @@ import {
   FIELDS_BROWSER_SYSTEM_CATEGORIES_COUNT,
   FIELDS_BROWSER_TITLE,
 } from '../../lib/fields_browser/selectors';
-import { logout } from '../../lib/logout';
 import { HOSTS_PAGE } from '../../lib/urls';
 import { loginAndWaitForPage, DEFAULT_TIMEOUT } from '../../lib/util/helpers';
 
@@ -42,10 +41,6 @@ describe('Fields Browser', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('renders the fields browser with the expected title when the Fields button is clicked', () => {
     populateTimeline();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/inspect/inspect.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/inspect/inspect.spec.ts
index 54207966fd36f2..ee25705a83989d 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/inspect/inspect.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/inspect/inspect.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import { HOSTS_PAGE } from '../../lib/urls';
 import {
   INSPECT_BUTTON_ICON,
@@ -18,9 +17,6 @@ import { executeKQL, hostExistsQuery, toggleTimelineVisibility } from '../../lib
 
 describe('Inspect', () => {
   describe('Hosts and network stats and tables', () => {
-    afterEach(() => {
-      return logout();
-    });
     INSPECT_BUTTONS_IN_SIEM.map(table =>
       it(`inspects the ${table.title}`, () => {
         loginAndWaitForPage(table.url);
@@ -36,10 +32,6 @@ describe('Inspect', () => {
   });
 
   describe('Timeline', () => {
-    afterEach(() => {
-      return logout();
-    });
-
     it('inspects the timeline', () => {
       loginAndWaitForPage(HOSTS_PAGE);
       toggleTimelineVisibility();
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/ml_conditional_links/ml_conditional_links.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/ml_conditional_links/ml_conditional_links.spec.ts
index 4c29c081b3e69e..afeb8c3c13a4fd 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/ml_conditional_links/ml_conditional_links.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/ml_conditional_links/ml_conditional_links.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   mlNetworkSingleIpNullKqlQuery,
   mlNetworkSingleIpKqlQuery,
@@ -24,10 +23,6 @@ import { loginAndWaitForPage } from '../../lib/util/helpers';
 import { KQL_INPUT } from '../../lib/url_state';
 
 describe('ml conditional links', () => {
-  afterEach(() => {
-    return logout();
-  });
-
   it('sets the KQL from a single IP with a value for the query', () => {
     loginAndWaitForPage(mlNetworkSingleIpKqlQuery);
     cy.get(KQL_INPUT, { timeout: 5000 }).should(
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/navigation/navigation.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/navigation/navigation.spec.ts
index f4beba7cbb72d8..bb1a0379ce0eaf 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/navigation/navigation.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/navigation/navigation.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import { OVERVIEW_PAGE, TIMELINES_PAGE } from '../../lib/urls';
 import {
   NAVIGATION_HOSTS,
@@ -15,10 +14,6 @@ import {
 import { loginAndWaitForPage } from '../../lib/util/helpers';
 
 describe('top-level navigation common to all pages in the SIEM app', () => {
-  afterEach(() => {
-    return logout();
-  });
-
   it('navigates to the Overview page', () => {
     loginAndWaitForPage(TIMELINES_PAGE);
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/overview/overview.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/overview/overview.spec.ts
index 2ea8b5e8bc5ce7..4ef3eb67cafc9c 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/overview/overview.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/overview/overview.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import { OVERVIEW_PAGE } from '../../lib/urls';
 import { clearFetch, stubApi } from '../../lib/fixtures/helpers';
 import { HOST_STATS, NETWORK_STATS, STAT_AUDITD } from '../../lib/overview/selectors';
@@ -17,10 +16,6 @@ describe('Overview Page', () => {
     loginAndWaitForPage(OVERVIEW_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('Host and Network stats render with correct values', () => {
     cy.get(STAT_AUDITD.domId);
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/pagination/pagination.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/pagination/pagination.spec.ts
index ebd0ad0125efb6..73711f1434d5ff 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/pagination/pagination.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/pagination/pagination.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import { HOSTS_PAGE_TAB_URLS } from '../../lib/urls';
 import {
   AUTHENTICATIONS_TABLE,
@@ -19,10 +18,6 @@ import {
 import { DEFAULT_TIMEOUT, loginAndWaitForPage, waitForTableLoad } from '../../lib/util/helpers';
 
 describe('Pagination', () => {
-  afterEach(() => {
-    return logout();
-  });
-
   it('pagination updates results and page number', () => {
     loginAndWaitForPage(HOSTS_PAGE_TAB_URLS.uncommonProcesses);
     waitForTableLoad(UNCOMMON_PROCCESSES_TABLE);
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/data_providers.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/data_providers.spec.ts
index 236d5a53481b7f..824e4031852383 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/data_providers.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/data_providers.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   TIMELINE_DATA_PROVIDERS,
   TIMELINE_DROPPED_DATA_PROVIDERS,
@@ -22,10 +21,6 @@ describe('timeline data providers', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('renders the data provider of a host dragged from the All Hosts widget on the hosts page', () => {
     waitForAllHostsWidget();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/flyout_button.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/flyout_button.spec.ts
index c1c35e497d0815..5b0ac03ae87dc0 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/flyout_button.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/flyout_button.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   TIMELINE_FLYOUT_BODY,
   TIMELINE_NOT_READY_TO_DROP_BUTTON,
@@ -21,10 +20,6 @@ describe('timeline flyout button', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('toggles open the timeline', () => {
     toggleTimelineVisibility();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/search_or_filter.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/search_or_filter.spec.ts
index 0c9aed33d47ad6..9f21b4e3d53a11 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/search_or_filter.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/search_or_filter.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   assertAtLeastOneEventMatchesSearch,
   executeKQL,
@@ -19,10 +18,6 @@ describe('timeline search or filter KQL bar', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('executes a KQL query', () => {
     toggleTimelineVisibility();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/toggle_column.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/toggle_column.spec.ts
index 8197f77db9a081..9a915b0e77d440 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/toggle_column.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/toggle_column.spec.ts
@@ -6,7 +6,6 @@
 
 import { drag, drop } from '../../lib/drag_n_drop/helpers';
 import { populateTimeline } from '../../lib/fields_browser/helpers';
-import { logout } from '../../lib/logout';
 import { toggleFirstTimelineEventDetails } from '../../lib/timeline/helpers';
 import { HOSTS_PAGE } from '../../lib/urls';
 import { loginAndWaitForPage, DEFAULT_TIMEOUT } from '../../lib/util/helpers';
@@ -16,10 +15,6 @@ describe('toggle column in timeline', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   const timestampField = '@timestamp';
   const idField = '_id';
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/url_state/url_state.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/url_state/url_state.spec.ts
index dba5099a93c5a1..33ee2cb1cb302f 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/url_state/url_state.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/url_state/url_state.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   ABSOLUTE_DATE_RANGE,
   DATE_PICKER_ABSOLUTE_INPUT,
@@ -33,10 +32,6 @@ import { waitForAllHostsWidget } from '../../lib/hosts/helpers';
 import { NAVIGATION_HOSTS_ALL_HOSTS, NAVIGATION_HOSTS_ANOMALIES } from '../../lib/hosts/selectors';
 
 describe('url state', () => {
-  afterEach(() => {
-    return logout();
-  });
-
   it('sets the global start and end dates from the url', () => {
     loginAndWaitForPage(ABSOLUTE_DATE_RANGE.url);
     cy.get(DATE_PICKER_START_DATE_POPOVER_BUTTON).should(
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
index 4faf02ead3fe18..9672097713a9b2 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
@@ -13,15 +13,15 @@ import {
   Droppable,
 } from 'react-beautiful-dnd';
 import { connect } from 'react-redux';
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 import { ActionCreator } from 'typescript-fsa';
 
 import { EuiPortal } from '@elastic/eui';
 import { dragAndDropActions } from '../../store/drag_and_drop';
 import { DataProvider } from '../timeline/data_providers/data_provider';
-import { STATEFUL_EVENT_CSS_CLASS_NAME } from '../timeline/helpers';
 import { TruncatableText } from '../truncatable_text';
 import { getDraggableId, getDroppableId } from './helpers';
+import { ProviderContainer } from './provider_container';
 
 // As right now, we do not know what we want there, we will keep it as a placeholder
 export const DragEffects = styled.div``;
@@ -42,143 +42,12 @@ const Wrapper = styled.div`
 
 Wrapper.displayName = 'Wrapper';
 
-const ProviderContainer = styled.div<{ isDragging: boolean }>`
-  &,
-  &::before,
-  &::after {
-    transition: background ${({ theme }) => theme.eui.euiAnimSpeedFast} ease,
-      color ${({ theme }) => theme.eui.euiAnimSpeedFast} ease;
+const ProviderContentWrapper = styled.span`
+  > span.euiToolTipAnchor {
+    display: block; /* allow EuiTooltip content to be truncatable */
   }
-
-  ${({ isDragging }) =>
-    !isDragging &&
-    css`
-      & {
-        border-radius: 2px;
-        padding: 0 4px 0 8px;
-        position: relative;
-        z-index: ${({ theme }) => theme.eui.euiZLevel0} !important;
-
-        &::before {
-          background-image: linear-gradient(
-              135deg,
-              ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              -135deg,
-              ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorMediumShade} 75%
-            ),
-            linear-gradient(
-              -135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorMediumShade} 75%
-            );
-          background-position: 0 0, 1px 0, 1px -1px, 0px 1px;
-          background-size: 2px 2px;
-          bottom: 2px;
-          content: '';
-          display: block;
-          left: 2px;
-          position: absolute;
-          top: 2px;
-          width: 4px;
-        }
-      }
-
-      &:hover {
-        &,
-        & .euiBadge,
-        & .euiBadge__text {
-          cursor: move; /* Fallback for IE11 */
-          cursor: grab;
-        }
-      }
-
-      .${STATEFUL_EVENT_CSS_CLASS_NAME}:hover &,
-      tr:hover & {
-        background-color: ${({ theme }) => theme.eui.euiColorLightShade};
-
-        &::before {
-          background-image: linear-gradient(
-              135deg,
-              ${({ theme }) => theme.eui.euiColorDarkShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              -135deg,
-              ${({ theme }) => theme.eui.euiColorDarkShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorDarkShade} 75%
-            ),
-            linear-gradient(
-              -135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorDarkShade} 75%
-            );
-        }
-      }
-
-      &:hover,
-      &:focus,
-      .${STATEFUL_EVENT_CSS_CLASS_NAME}:hover &:hover,
-      .${STATEFUL_EVENT_CSS_CLASS_NAME}:focus &:focus,
-      tr:hover &:hover,
-      tr:hover &:focus {
-        background-color: ${({ theme }) => theme.eui.euiColorPrimary};
-
-        &,
-        & a,
-        & a:hover {
-          color: ${({ theme }) => theme.eui.euiColorEmptyShade};
-        }
-
-        &::before {
-          background-image: linear-gradient(
-              135deg,
-              ${({ theme }) => theme.eui.euiColorEmptyShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              -135deg,
-              ${({ theme }) => theme.eui.euiColorEmptyShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorEmptyShade} 75%
-            ),
-            linear-gradient(
-              -135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorEmptyShade} 75%
-            );
-        }
-      }
-    `}
-
-  ${({ isDragging }) =>
-    isDragging &&
-    css`
-      & {
-        z-index: 9999 !important;
-      }
-    `}
 `;
 
-ProviderContainer.displayName = 'ProviderContainer';
-
 interface OwnProps {
   dataProvider: DataProvider;
   inline?: boolean;
@@ -244,9 +113,11 @@ const DraggableWrapperComponent = React.memo<Props>(
                           {render(dataProvider, provided, snapshot)}
                         </TruncatableText>
                       ) : (
-                        <span data-test-subj={`draggable-content-${dataProvider.queryMatch.field}`}>
+                        <ProviderContentWrapper
+                          data-test-subj={`draggable-content-${dataProvider.queryMatch.field}`}
+                        >
                           {render(dataProvider, provided, snapshot)}
-                        </span>
+                        </ProviderContentWrapper>
                       )}
                     </ProviderContainer>
                   </ConditionalPortal>
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/provider_container.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/provider_container.tsx
new file mode 100644
index 00000000000000..c1f029086aa350
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/provider_container.tsx
@@ -0,0 +1,154 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import styled, { css } from 'styled-components';
+import { STATEFUL_EVENT_CSS_CLASS_NAME } from '../timeline/helpers';
+
+interface ProviderContainerProps {
+  isDragging: boolean;
+}
+
+const ProviderContainerComponent = styled.div<ProviderContainerProps>`
+  &,
+  &::before,
+  &::after {
+    transition: background ${({ theme }) => theme.eui.euiAnimSpeedFast} ease,
+      color ${({ theme }) => theme.eui.euiAnimSpeedFast} ease;
+  }
+
+  ${({ isDragging }) =>
+    !isDragging &&
+    css`
+      & {
+        border-radius: 2px;
+        padding: 0 4px 0 8px;
+        position: relative;
+        z-index: ${({ theme }) => theme.eui.euiZLevel0} !important;
+
+        &::before {
+          background-image: linear-gradient(
+              135deg,
+              ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              -135deg,
+              ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorMediumShade} 75%
+            ),
+            linear-gradient(
+              -135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorMediumShade} 75%
+            );
+          background-position: 0 0, 1px 0, 1px -1px, 0px 1px;
+          background-size: 2px 2px;
+          bottom: 2px;
+          content: '';
+          display: block;
+          left: 2px;
+          position: absolute;
+          top: 2px;
+          width: 4px;
+        }
+      }
+
+      &:hover {
+        &,
+        & .euiBadge,
+        & .euiBadge__text {
+          cursor: move; /* Fallback for IE11 */
+          cursor: grab;
+        }
+      }
+
+      .${STATEFUL_EVENT_CSS_CLASS_NAME}:hover &,
+      tr:hover & {
+        background-color: ${({ theme }) => theme.eui.euiColorLightShade};
+
+        &::before {
+          background-image: linear-gradient(
+              135deg,
+              ${({ theme }) => theme.eui.euiColorDarkShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              -135deg,
+              ${({ theme }) => theme.eui.euiColorDarkShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorDarkShade} 75%
+            ),
+            linear-gradient(
+              -135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorDarkShade} 75%
+            );
+        }
+      }
+
+      &:hover,
+      &:focus,
+      .${STATEFUL_EVENT_CSS_CLASS_NAME}:hover &:hover,
+      .${STATEFUL_EVENT_CSS_CLASS_NAME}:focus &:focus,
+      tr:hover &:hover,
+      tr:hover &:focus {
+        background-color: ${({ theme }) => theme.eui.euiColorPrimary};
+
+        &,
+        & a,
+        & a:hover {
+          color: ${({ theme }) => theme.eui.euiColorEmptyShade};
+        }
+
+        &::before {
+          background-image: linear-gradient(
+              135deg,
+              ${({ theme }) => theme.eui.euiColorEmptyShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              -135deg,
+              ${({ theme }) => theme.eui.euiColorEmptyShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorEmptyShade} 75%
+            ),
+            linear-gradient(
+              -135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorEmptyShade} 75%
+            );
+        }
+      }
+    `}
+
+  ${({ isDragging }) =>
+    isDragging &&
+    css`
+      & {
+        z-index: 9999 !important;
+      }
+    `}
+`;
+
+ProviderContainerComponent.displayName = 'ProviderContainerComponent';
+
+export const ProviderContainer = React.memo(ProviderContainerComponent);
+
+ProviderContainer.displayName = 'ProviderContainer';
diff --git a/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx b/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx
index 5b219dad9c8412..323dee53f1910f 100644
--- a/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx
@@ -105,12 +105,9 @@ export const DefaultDraggable = React.memo<DefaultDraggableType>(
               <Provider dataProvider={dataProvider} />
             </DragEffects>
           ) : (
-            <Content
-              children={children}
-              field={field}
-              tooltipContent={tooltipContent}
-              value={value}
-            />
+            <Content field={field} tooltipContent={tooltipContent} value={value}>
+              {children}
+            </Content>
           )
         }
       />
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx
index d835d2c6219312..77f03f05554548 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx
@@ -23,16 +23,14 @@ import { WithCopyToClipboard } from '../../lib/clipboard/with_copy_to_clipboard'
 import { DragEffects } from '../drag_and_drop/draggable_wrapper';
 import { DroppableWrapper } from '../drag_and_drop/droppable_wrapper';
 import { getDroppableId, getDraggableFieldId, DRAG_TYPE_FIELD } from '../drag_and_drop/helpers';
-import { DefaultDraggable } from '../draggables';
 import { DraggableFieldBadge } from '../draggables/field_badge';
-import { EVENT_DURATION_FIELD_NAME } from '../duration';
 import { FieldName } from '../fields_browser/field_name';
 import { SelectableText } from '../selectable_text';
 import { OverflowField } from '../tables/helpers';
 import { ColumnHeader } from '../timeline/body/column_headers/column_header';
 import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers';
 import { DEFAULT_COLUMN_MIN_WIDTH } from '../timeline/body/helpers';
-import { DATE_FIELD_TYPE, MESSAGE_FIELD_NAME } from '../timeline/body/renderers/constants';
+import { MESSAGE_FIELD_NAME } from '../timeline/body/renderers/constants';
 import { FormattedFieldValue } from '../timeline/body/renderers/formatted_field';
 import { OnUpdateColumns } from '../timeline/events';
 import { WithHoverActions } from '../with_hover_actions';
@@ -180,28 +178,14 @@ export const getColumns = ({
                   data.field === MESSAGE_FIELD_NAME ? (
                     <OverflowField value={value} />
                   ) : (
-                    <DefaultDraggable
-                      data-test-subj="ip"
-                      field={data.field}
-                      id={`event-details-value-default-draggable-${contextId}-${eventId}-${data.field}-${i}-${value}`}
-                      tooltipContent={
-                        data.type === DATE_FIELD_TYPE || data.field === EVENT_DURATION_FIELD_NAME
-                          ? null
-                          : data.field
-                      }
+                    <FormattedFieldValue
+                      contextId={`event-details-value-formatted-field-value-${contextId}-${eventId}-${data.field}-${i}-${value}`}
+                      eventId={eventId}
+                      fieldFormat={data.format}
+                      fieldName={data.field}
+                      fieldType={data.type}
                       value={value}
-                    >
-                      <EuiText size="xs">
-                        <FormattedFieldValue
-                          contextId={`event-details-value-formatted-field-value-${contextId}-${eventId}-${data.field}-${i}-${value}`}
-                          eventId={eventId}
-                          fieldFormat={data.format}
-                          fieldName={data.field}
-                          fieldType={data.type}
-                          value={value}
-                        />
-                      </EuiText>
-                    </DefaultDraggable>
+                    />
                   )
                 }
               />
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.tsx
index cec8ddff1a7c94..f4e9a2b789d71b 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.tsx
@@ -6,7 +6,7 @@
 
 import { sortBy } from 'lodash';
 import { EuiInMemoryTable } from '@elastic/eui';
-import * as React from 'react';
+import React, { useMemo } from 'react';
 
 import { ColumnHeader } from '../timeline/body/column_headers/column_header';
 import { BrowserFields, getAllFieldsByName } from '../../containers/source';
@@ -29,26 +29,35 @@ interface Props {
 /** Renders a table view or JSON view of the `ECS` `data` */
 export const EventFieldsBrowser = React.memo<Props>(
   ({ browserFields, columnHeaders, data, eventId, onUpdateColumns, timelineId, toggleColumn }) => {
-    const fieldsByName = getAllFieldsByName(browserFields);
+    const fieldsByName = useMemo(() => getAllFieldsByName(browserFields), [browserFields]);
+    const items = useMemo(
+      () =>
+        sortBy(data, ['field']).map(item => ({
+          ...item,
+          ...fieldsByName[item.field],
+          valuesConcatenated: item.values != null ? item.values.join() : '',
+        })),
+      [data, fieldsByName]
+    );
+    const columns = useMemo(
+      () =>
+        getColumns({
+          browserFields,
+          columnHeaders,
+          eventId,
+          onUpdateColumns,
+          contextId: timelineId,
+          toggleColumn,
+        }),
+      [browserFields, columnHeaders, eventId, onUpdateColumns, timelineId, toggleColumn]
+    );
+
     return (
       <div className="euiTable--compressed">
         <EuiInMemoryTable
           // @ts-ignore items going in match Partial<BrowserField>, column `render` callbacks expect complete BrowserField
-          items={sortBy(data, ['field']).map(item => {
-            return {
-              ...item,
-              ...fieldsByName[item.field],
-              valuesConcatenated: item.values != null ? item.values.join() : '',
-            };
-          })}
-          columns={getColumns({
-            browserFields,
-            columnHeaders,
-            eventId,
-            onUpdateColumns,
-            contextId: timelineId,
-            toggleColumn,
-          })}
+          items={items}
+          columns={columns}
           pagination={false}
           search={search}
           sorting={true}
diff --git a/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.tsx b/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.tsx
index 20aea3251d8381..dce360877130ef 100644
--- a/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
 interface RowProps {
@@ -12,7 +12,7 @@ interface RowProps {
   rowPadding?: string;
 }
 
-const Row = styled.div.attrs<RowProps>(({ rowHeight, rowPadding, theme }) => ({
+const RowComponent = styled.div.attrs<RowProps>(({ rowHeight, rowPadding, theme }) => ({
   className: 'siemSkeletonRow',
   rowHeight: rowHeight || theme.eui.euiSizeXL,
   rowPadding: rowPadding || `${theme.eui.paddingSizes.s} ${theme.eui.paddingSizes.xs}`,
@@ -22,6 +22,10 @@ const Row = styled.div.attrs<RowProps>(({ rowHeight, rowPadding, theme }) => ({
   height: ${({ rowHeight }) => rowHeight};
   padding: ${({ rowPadding }) => rowPadding};
 `;
+RowComponent.displayName = 'RowComponent';
+
+const Row = React.memo(RowComponent);
+
 Row.displayName = 'Row';
 
 interface CellProps {
@@ -29,7 +33,7 @@ interface CellProps {
   cellMargin?: string;
 }
 
-const Cell = styled.div.attrs<CellProps>(({ cellColor, cellMargin, theme }) => ({
+const CellComponent = styled.div.attrs<CellProps>(({ cellColor, cellMargin, theme }) => ({
   className: 'siemSkeletonRow__cell',
   cellColor: cellColor || theme.eui.euiColorLightestShade,
   cellMargin: cellMargin || theme.eui.gutterTypes.gutterSmall,
@@ -42,6 +46,10 @@ const Cell = styled.div.attrs<CellProps>(({ cellColor, cellMargin, theme }) => (
     margin-left: ${({ cellMargin }) => cellMargin};
   }
 `;
+CellComponent.displayName = 'CellComponent';
+
+const Cell = React.memo(CellComponent);
+
 Cell.displayName = 'Cell';
 
 export interface SkeletonRowProps extends CellProps, RowProps {
@@ -51,9 +59,14 @@ export interface SkeletonRowProps extends CellProps, RowProps {
 
 export const SkeletonRow = React.memo<SkeletonRowProps>(
   ({ cellColor, cellCount = 4, cellMargin, rowHeight, rowPadding, style }) => {
-    const cells = [...Array(cellCount)].map((_, i) => (
-      <Cell cellColor={cellColor} cellMargin={cellMargin} key={i} />
-    ));
+    const cells = useMemo(
+      () =>
+        [...Array(cellCount)].map(
+          (_, i) => <Cell cellColor={cellColor} cellMargin={cellMargin} key={i} />,
+          [cellCount]
+        ),
+      [cellCount, cellColor, cellMargin]
+    );
 
     return (
       <Row rowHeight={rowHeight} rowPadding={rowPadding} style={style}>
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap
index d370a24cc1d4d5..a168f8d48fa33b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap
@@ -49,25 +49,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-event_category-1-event_category-Access",
-            "kqlQuery": "",
-            "name": "event.category: Access",
-            "queryMatch": Object {
-              "field": "event.category",
-              "operator": ":",
-              "value": "Access",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-event.category-1-event.category-Access"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="event.category"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-event.category-1-event.category-Access"
         truncate={true}
+        value="Access"
       />
     </EventsTdContent>
   </EventsTd>
@@ -82,25 +72,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-event_action-1-event_action-Action",
-            "kqlQuery": "",
-            "name": "event.action: Action",
-            "queryMatch": Object {
-              "field": "event.action",
-              "operator": ":",
-              "value": "Action",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-event.action-1-event.action-Action"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="event.action"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-event.action-1-event.action-Action"
         truncate={true}
+        value="Action"
       />
     </EventsTdContent>
   </EventsTd>
@@ -115,25 +95,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-host_name-1-host_name-apache",
-            "kqlQuery": "",
-            "name": "host.name: apache",
-            "queryMatch": Object {
-              "field": "host.name",
-              "operator": ":",
-              "value": "apache",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-host.name-1-host.name-apache"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="host.name"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-host.name-1-host.name-apache"
         truncate={true}
+        value="apache"
       />
     </EventsTdContent>
   </EventsTd>
@@ -148,25 +118,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-source_ip-1-source_ip-192_168_0_1",
-            "kqlQuery": "",
-            "name": "source.ip: 192.168.0.1",
-            "queryMatch": Object {
-              "field": "source.ip",
-              "operator": ":",
-              "value": "192.168.0.1",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-source.ip-1-source.ip-192.168.0.1"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="source.ip"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-source.ip-1-source.ip-192.168.0.1"
         truncate={true}
+        value="192.168.0.1"
       />
     </EventsTdContent>
   </EventsTd>
@@ -181,25 +141,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-destination_ip-1-destination_ip-192_168_0_3",
-            "kqlQuery": "",
-            "name": "destination.ip: 192.168.0.3",
-            "queryMatch": Object {
-              "field": "destination.ip",
-              "operator": ":",
-              "value": "192.168.0.3",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-destination.ip-1-destination.ip-192.168.0.3"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="destination.ip"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-destination.ip-1-destination.ip-192.168.0.3"
         truncate={true}
+        value="192.168.0.3"
       />
     </EventsTdContent>
   </EventsTd>
@@ -214,25 +164,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-user_name-1-user_name-john_dee",
-            "kqlQuery": "",
-            "name": "user.name: john.dee",
-            "queryMatch": Object {
-              "field": "user.name",
-              "operator": ":",
-              "value": "john.dee",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-user.name-1-user.name-john.dee"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="user.name"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-user.name-1-user.name-john.dee"
         truncate={true}
+        value="john.dee"
       />
     </EventsTdContent>
   </EventsTd>
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap
index 1fe02f6f35d064..83a241b628edbb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap
@@ -1,8 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Events renders correctly against snapshot 1`] = `
-<FormattedDate
+<FormattedFieldValue
+  contextId="test"
+  eventId="1"
   fieldName="timestamp"
+  fieldType="date"
   value="2018-11-05T19:03:25.937Z"
 />
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap
index b867e0a7884495..a79a7ed23e3d10 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap
@@ -2,24 +2,14 @@
 
 exports[`get_column_renderer renders correctly against snapshot 1`] = `
 <span>
-  <DraggableWrapper
-    dataProvider={
-      Object {
-        "and": Array [],
-        "enabled": true,
-        "excluded": false,
-        "id": "plain-column-renderer-data-provider-test-event_severity-1-message-3",
-        "kqlQuery": "",
-        "name": "event.severity: 3",
-        "queryMatch": Object {
-          "field": "message",
-          "operator": ":",
-          "value": "3",
-        },
-      }
-    }
-    key="plain-column-renderer-draggable-wrapper-test-event.severity-1-message-3"
-    render={[Function]}
+  <FormattedFieldValue
+    contextId="plain-column-renderer-formatted-field-value-test"
+    eventId="1"
+    fieldFormat=""
+    fieldName="event.severity"
+    fieldType=""
+    key="plain-column-renderer-formatted-field-value-test-event.severity-1-message-3"
+    value="3"
   />
 </span>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap
index e2eaf1d872b26d..563e356a689c82 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap
@@ -2,24 +2,14 @@
 
 exports[`plain_column_renderer rendering renders correctly against snapshot 1`] = `
 <span>
-  <DraggableWrapper
-    dataProvider={
-      Object {
-        "and": Array [],
-        "enabled": true,
-        "excluded": false,
-        "id": "plain-column-renderer-data-provider-test-event_category-1-event_category-Access",
-        "kqlQuery": "",
-        "name": "event.category: Access",
-        "queryMatch": Object {
-          "field": "event.category",
-          "operator": ":",
-          "value": "Access",
-        },
-      }
-    }
-    key="plain-column-renderer-draggable-wrapper-test-event.category-1-event.category-Access"
-    render={[Function]}
+  <FormattedFieldValue
+    contextId="plain-column-renderer-formatted-field-value-test"
+    eventId="1"
+    fieldFormat=""
+    fieldName="event.category"
+    fieldType="keyword"
+    key="plain-column-renderer-formatted-field-value-test-event.category-1-event.category-Access"
+    value="Access"
   />
 </span>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx
index 5c54e5be3374ca..1e7c3bfedc9b9c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx
@@ -4,12 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
-import * as React from 'react';
-import { ThemeProvider } from 'styled-components';
+import React from 'react';
 
 import { mockTimelineData, TestProviders } from '../../../../mock';
 import { getEmptyValue } from '../../../empty_value';
@@ -21,31 +19,34 @@ import { HOST_NAME_FIELD_NAME } from './constants';
 jest.mock('../../../../lib/kibana');
 
 describe('Events', () => {
-  const theme = () => ({ eui: euiDarkVars, darkMode: true });
   const mount = useMountAppended();
 
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="timestamp"
-        fieldType="date"
-        value={get('timestamp', mockTimelineData[0].ecs)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="timestamp"
+          fieldType="date"
+          value={get('timestamp', mockTimelineData[0].ecs)}
+        />
+      </TestProviders>
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(toJson(wrapper.find('FormattedFieldValue'))).toMatchSnapshot();
   });
 
   test('it renders a localized date tooltip for a field type of date that has a valid timestamp', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="timestamp"
-        fieldType="date"
-        value={get('timestamp', mockTimelineData[0].ecs)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="timestamp"
+          fieldType="date"
+          value={get('timestamp', mockTimelineData[0].ecs)}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="localized-date-tool-tip"]').exists()).toEqual(true);
@@ -53,13 +54,15 @@ describe('Events', () => {
 
   test('it does NOT render a localized date tooltip when field type is NOT date, even if it contains valid timestamp', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="timestamp"
-        fieldType="text"
-        value={get('timestamp', mockTimelineData[0].ecs)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="timestamp"
+          fieldType="text"
+          value={get('timestamp', mockTimelineData[0].ecs)}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="localized-date-tool-tip"]').exists()).toEqual(false);
@@ -72,13 +75,15 @@ describe('Events', () => {
     };
 
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="timestamp"
-        fieldType="date"
-        value={get('timestamp', hasBadDate)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="timestamp"
+          fieldType="date"
+          value={get('timestamp', hasBadDate)}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="localized-date-tool-tip"]').exists()).toEqual(false);
@@ -86,13 +91,15 @@ describe('Events', () => {
 
   test('it renders the value for a non-date field when the field is populated', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="event.module"
-        fieldType="text"
-        value={get('event.module[0]', mockTimelineData[0].ecs)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="event.module"
+          fieldType="text"
+          value={get('event.module[0]', mockTimelineData[0].ecs)}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.text()).toEqual('nginx');
@@ -100,7 +107,7 @@ describe('Events', () => {
 
   test('it renders placeholder text for a non-date field when the field is NOT populated', () => {
     const wrapper = mount(
-      <ThemeProvider theme={theme}>
+      <TestProviders>
         <FormattedFieldValue
           eventId={mockTimelineData[0].ecs._id}
           contextId="test"
@@ -108,7 +115,7 @@ describe('Events', () => {
           fieldType="text"
           value={get('fake.field', mockTimelineData[0].ecs)}
         />
-      </ThemeProvider>
+      </TestProviders>
     );
 
     expect(wrapper.text()).toEqual(getEmptyValue());
@@ -116,14 +123,16 @@ describe('Events', () => {
 
   test('it renders tooltip for truncatable message when it exists', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        contextId="test"
-        eventId={mockTimelineData[0].ecs._id}
-        fieldName="message"
-        fieldType="text"
-        truncate
-        value={'some message'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          contextId="test"
+          eventId={mockTimelineData[0].ecs._id}
+          fieldName="message"
+          fieldType="text"
+          truncate
+          value={'some message'}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="message-tool-tip"]').exists()).toEqual(true);
@@ -179,53 +188,61 @@ describe('Events', () => {
 
   test('it renders a message text string', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="message"
-        fieldType="text"
-        value={'some message'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="message"
+          fieldType="text"
+          value={'some message'}
+        />
+      </TestProviders>
     );
     expect(wrapper.text()).toEqual('some message');
   });
 
   test('it renders truncatable message text when fieldName is message with truncate prop', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        contextId="test"
-        eventId={mockTimelineData[0].ecs._id}
-        fieldName="message"
-        fieldType="text"
-        truncate
-        value={'some message'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          contextId="test"
+          eventId={mockTimelineData[0].ecs._id}
+          fieldName="message"
+          fieldType="text"
+          truncate
+          value={'some message'}
+        />
+      </TestProviders>
     );
     expect(wrapper.find('[data-test-subj="truncatable-message"]').exists()).toEqual(true);
   });
 
   test('it does NOT render the truncatable message style when fieldName is NOT message', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="NOT-message"
-        fieldType="text"
-        value={'a NON-message value'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="NOT-message"
+          fieldType="text"
+          value={'a NON-message value'}
+        />
+      </TestProviders>
     );
     expect(wrapper.find('[data-test-subj="truncatable-message"]').exists()).toEqual(false);
   });
 
   test('it renders a hyperlink to the hosts details page when fieldName is host.name, and a hostname is provided', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName={HOST_NAME_FIELD_NAME}
-        fieldType="text"
-        value={'some-hostname'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName={HOST_NAME_FIELD_NAME}
+          fieldType="text"
+          value={'some-hostname'}
+        />
+      </TestProviders>
     );
     expect(wrapper.find('[data-test-subj="host-details-link"]').exists()).toEqual(true);
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx
index 7529c0623ef478..280de3683a11f8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx
@@ -5,9 +5,10 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import { isNumber, isString } from 'lodash/fp';
-import * as React from 'react';
+import { isNumber, isString, isEmpty } from 'lodash/fp';
+import React from 'react';
 
+import { DefaultDraggable } from '../../../draggables';
 import { Bytes, BYTES_FORMAT } from '../../../bytes';
 import { Duration, EVENT_DURATION_FIELD_NAME } from '../../../duration';
 import { getOrEmptyTagFromValue, getEmptyTagValue } from '../../../empty_value';
@@ -23,6 +24,9 @@ import {
   MESSAGE_FIELD_NAME,
 } from './constants';
 
+// simple black-list to prevent dragging and dropping fields such as message name
+const columnNamesNotDraggable = [MESSAGE_FIELD_NAME];
+
 export const FormattedFieldValue = React.memo<{
   contextId: string;
   eventId: string;
@@ -42,7 +46,16 @@ export const FormattedFieldValue = React.memo<{
       />
     );
   } else if (fieldType === DATE_FIELD_TYPE) {
-    return <FormattedDate fieldName={fieldName} value={value} />;
+    return (
+      <DefaultDraggable
+        field={fieldName}
+        id={`event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}`}
+        tooltipContent={null}
+        value={`${value}`}
+      >
+        <FormattedDate fieldName={fieldName} value={value} />
+      </DefaultDraggable>
+    );
   } else if (PORT_NAMES.some(portName => fieldName === portName)) {
     return (
       <Port contextId={contextId} eventId={eventId} fieldName={fieldName} value={`${value}`} />
@@ -55,11 +68,16 @@ export const FormattedFieldValue = React.memo<{
     const hostname = `${value}`;
 
     return isString(value) && hostname.length > 0 ? (
-      <EuiToolTip content={value}>
+      <DefaultDraggable
+        field={fieldName}
+        id={`event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}`}
+        tooltipContent={value}
+        value={value}
+      >
         <HostDetailsLink data-test-subj="host-details-link" hostName={hostname}>
-          {value}
+          <TruncatableText data-test-subj="draggable-truncatable-content">{value}</TruncatableText>
         </HostDetailsLink>
-      </EuiToolTip>
+      </DefaultDraggable>
     ) : (
       getEmptyTagValue()
     );
@@ -67,34 +85,46 @@ export const FormattedFieldValue = React.memo<{
     return (
       <Bytes contextId={contextId} eventId={eventId} fieldName={fieldName} value={`${value}`} />
     );
-  } else if (fieldName === MESSAGE_FIELD_NAME && value != null && value !== '') {
-    return (
-      <>
-        {truncate ? (
-          <TruncatableText data-test-subj="truncatable-message">
-            <EuiToolTip
-              data-test-subj="message-tool-tip"
-              content={
-                <EuiFlexGroup direction="column" gutterSize="none">
-                  <EuiFlexItem grow={false}>
-                    <span>{fieldName}</span>
-                  </EuiFlexItem>
-                  <EuiFlexItem grow={false}>
-                    <span>{value}</span>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-              }
-            >
-              <>{value}</>
-            </EuiToolTip>
-          </TruncatableText>
-        ) : (
+  } else if (columnNamesNotDraggable.includes(fieldName)) {
+    return truncate && !isEmpty(value) ? (
+      <TruncatableText data-test-subj="truncatable-message">
+        <EuiToolTip
+          data-test-subj="message-tool-tip"
+          content={
+            <EuiFlexGroup direction="column" gutterSize="none">
+              <EuiFlexItem grow={false}>
+                <span>{fieldName}</span>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <span>{value}</span>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          }
+        >
           <>{value}</>
-        )}
-      </>
+        </EuiToolTip>
+      </TruncatableText>
+    ) : (
+      <>{value}</>
     );
   } else {
-    return getOrEmptyTagFromValue(value);
+    const contentValue = getOrEmptyTagFromValue(value);
+    const content = truncate ? <TruncatableText>{contentValue}</TruncatableText> : contentValue;
+
+    return (
+      <DefaultDraggable
+        field={fieldName}
+        id={`event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}`}
+        value={`${value}`}
+        tooltipContent={
+          fieldType === DATE_FIELD_TYPE || fieldType === EVENT_DURATION_FIELD_NAME
+            ? null
+            : fieldName
+        }
+      >
+        {content}
+      </DefaultDraggable>
+    );
   }
 });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx
index 25a70502e3e457..70485c41f3b889 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx
@@ -4,29 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { isNumber } from 'lodash/fp';
 import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
-import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper';
-import { escapeDataProviderId } from '../../../drag_and_drop/helpers';
 import { getEmptyTagValue } from '../../../empty_value';
-import { FormattedIp } from '../../../formatted_ip';
-import { IS_OPERATOR, DataProvider } from '../../data_providers/data_provider';
-import { Provider } from '../../data_providers/provider';
 import { ColumnHeader } from '../column_headers/column_header';
 import { ColumnRenderer } from './column_renderer';
-import { IP_FIELD_TYPE, MESSAGE_FIELD_NAME } from './constants';
 import { FormattedFieldValue } from './formatted_field';
-import { parseQueryValue } from './parse_query_value';
 import { parseValue } from './parse_value';
 
 export const dataExistsAtColumn = (columnName: string, data: TimelineNonEcsData[]): boolean =>
   data.findIndex(item => item.field === columnName) !== -1;
 
-// simple black-list to prevent dragging and dropping fields such as message name
-const columnNamesNotDraggable = [MESSAGE_FIELD_NAME];
-
 export const plainColumnRenderer: ColumnRenderer = {
   isInstance: (columnName: string, data: TimelineNonEcsData[]) =>
     dataExistsAtColumn(columnName, data),
@@ -47,91 +36,17 @@ export const plainColumnRenderer: ColumnRenderer = {
     values: string[] | undefined | null;
   }) =>
     values != null
-      ? values.map(value => {
-          const itemDataProvider: DataProvider = {
-            enabled: true,
-            id: escapeDataProviderId(
-              `plain-column-renderer-data-provider-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`
-            ),
-            name: `${columnName}: ${parseQueryValue(value)}`,
-            queryMatch: {
-              field: field.id,
-              value: parseQueryValue(value),
-              operator: IS_OPERATOR,
-            },
-            excluded: false,
-            kqlQuery: '',
-            and: [],
-          };
-          if (field.type === IP_FIELD_TYPE) {
-            // since ip fields may contain multiple IP addresses, return a FormattedIp here to avoid a "draggable of draggables"
-            return (
-              <FormattedIp
-                contextId={`plain-column-renderer-formatted-ip-${timelineId}`}
-                eventId={eventId}
-                fieldName={field.id}
-                key={`plain-column-renderer-formatted-ip-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
-                value={!isNumber(value) ? value : String(value)}
-                truncate={truncate}
-              />
-            );
-          }
-
-          if (columnNamesNotDraggable.includes(columnName)) {
-            if (truncate) {
-              return (
-                <FormattedFieldValue
-                  contextId={`plain-column-renderer-truncatable-formatted-field-value-${timelineId}`}
-                  eventId={eventId}
-                  fieldFormat={field.format || ''}
-                  fieldName={columnName}
-                  fieldType={field.type || ''}
-                  key={`plain-column-renderer-truncatable-formatted-field-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
-                  truncate={truncate}
-                  value={parseValue(value)}
-                />
-              );
-            } else {
-              return (
-                <FormattedFieldValue
-                  contextId={`plain-column-renderer-text-formatted-field-value-${timelineId}`}
-                  data-test-subj="draggable-content"
-                  eventId={eventId}
-                  fieldFormat={field.format || ''}
-                  fieldName={columnName}
-                  fieldType={field.type || ''}
-                  key={`plain-column-renderer-text-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
-                  truncate={truncate}
-                  value={parseValue(value)}
-                />
-              );
-            }
-          }
-          // note: we use a raw DraggableWrapper here instead of a DefaultDraggable,
-          // because we pass a width to enable text truncation, and we will show empty values
-          return (
-            <DraggableWrapper
-              dataProvider={itemDataProvider}
-              key={`plain-column-renderer-draggable-wrapper-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
-              render={(dataProvider, _, snapshot) =>
-                snapshot.isDragging ? (
-                  <DragEffects>
-                    <Provider dataProvider={dataProvider} />
-                  </DragEffects>
-                ) : (
-                  <FormattedFieldValue
-                    contextId={`plain-column-renderer-formatted-field-value-${timelineId}`}
-                    eventId={eventId}
-                    fieldFormat={field.format || ''}
-                    fieldName={columnName}
-                    fieldType={field.type || ''}
-                    value={parseValue(value)}
-                  />
-                )
-              }
-              truncate={truncate}
-            />
-          );
-        })
+      ? values.map(value => (
+          <FormattedFieldValue
+            key={`plain-column-renderer-formatted-field-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
+            contextId={`plain-column-renderer-formatted-field-value-${timelineId}`}
+            eventId={eventId}
+            fieldFormat={field.format || ''}
+            fieldName={columnName}
+            fieldType={field.type || ''}
+            value={parseValue(value)}
+            truncate={truncate}
+          />
+        ))
       : getEmptyTagValue(),
 };
diff --git a/x-pack/legacy/plugins/spaces/index.ts b/x-pack/legacy/plugins/spaces/index.ts
index 0083847cfb441b..934b44b4accaff 100644
--- a/x-pack/legacy/plugins/spaces/index.ts
+++ b/x-pack/legacy/plugins/spaces/index.ts
@@ -49,12 +49,12 @@ export const spaces = (kibana: Record<string, any>) =>
 
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      managementSections: ['plugins/spaces/views/management'],
+      managementSections: [],
       apps: [
         {
           id: 'space_selector',
           title: 'Spaces',
-          main: 'plugins/spaces/views/space_selector',
+          main: 'plugins/spaces/space_selector',
           url: 'space_selector',
           hidden: true,
         },
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
new file mode 100644
index 00000000000000..aa3c6acf262361
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AdvancedSettingsService } from './advanced_settings_service';
+jest.mock('ui/management', () => {
+  return {
+    PAGE_TITLE_COMPONENT: 'page_title_component',
+    PAGE_SUBTITLE_COMPONENT: 'page_subtitle_component',
+  };
+});
+
+describe('Advanced Settings Service', () => {
+  describe('#setup', () => {
+    it('registers space-aware components to augment the advanced settings screen', () => {
+      const deps = {
+        getActiveSpace: jest.fn().mockResolvedValue({ id: 'foo', name: 'foo-space' }),
+        registerSettingsComponent: jest.fn(),
+      };
+
+      const advancedSettingsService = new AdvancedSettingsService();
+      advancedSettingsService.setup(deps);
+
+      expect(deps.registerSettingsComponent).toHaveBeenCalledTimes(2);
+      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
+        'page_title_component',
+        expect.any(Function),
+        true
+      );
+
+      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
+        'page_subtitle_component',
+        expect.any(Function),
+        true
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
new file mode 100644
index 00000000000000..9c6c2fcc2cddac
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { PAGE_TITLE_COMPONENT, PAGE_SUBTITLE_COMPONENT } from 'ui/management';
+import { Space } from '../../common/model/space';
+import { AdvancedSettingsTitle, AdvancedSettingsSubtitle } from './components';
+
+interface SetupDeps {
+  getActiveSpace: () => Promise<Space>;
+  registerSettingsComponent: (
+    id: string,
+    component: string | React.FC<any>,
+    allowOverride: boolean
+  ) => void;
+}
+
+export class AdvancedSettingsService {
+  public setup({ getActiveSpace, registerSettingsComponent }: SetupDeps) {
+    const PageTitle = () => <AdvancedSettingsTitle getActiveSpace={getActiveSpace} />;
+    const SubTitle = () => <AdvancedSettingsSubtitle getActiveSpace={getActiveSpace} />;
+
+    registerSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle, true);
+    registerSettingsComponent(PAGE_SUBTITLE_COMPONENT, SubTitle, true);
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
index 433f8a8ccf0a20..e35d67c7214cf1 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
@@ -7,7 +7,7 @@
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Fragment, useState, useEffect } from 'react';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../../common/model/space';
 
 interface Props {
   getActiveSpace: () => Promise<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/index.ts
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx
index bf792ca2cdacf7..b772ff433abecd 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx
@@ -6,7 +6,7 @@
 import React from 'react';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { AdvancedSettingsTitle } from './advanced_settings_title';
-import { SpaceAvatar } from '../../../../components';
+import { SpaceAvatar } from '../../../space_avatar';
 import { act } from '@testing-library/react';
 
 describe('AdvancedSettingsTitle', () => {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
index af6fa42cce07be..b74524db81d812 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
@@ -7,8 +7,8 @@
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useState, useEffect } from 'react';
-import { Space } from '../../../../../common/model/space';
-import { SpaceAvatar } from '../../../../components';
+import { Space } from '../../../../../../../plugins/spaces/common/model/space';
+import { SpaceAvatar } from '../../../space_avatar';
 
 interface Props {
   getActiveSpace: () => Promise<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/index.ts
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts
similarity index 63%
rename from x-pack/legacy/plugins/spaces/public/lib/index.ts
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts
index 56ac7b8ff37f4f..6678be7fa34e46 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { SpacesManager } from './spaces_manager';
-export { getSpaceInitials, getSpaceColor, getSpaceImageUrl } from './space_attributes';
+export { AdvancedSettingsSubtitle } from './advanced_settings_subtitle';
+export { AdvancedSettingsTitle } from './advanced_settings_title';
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts
new file mode 100644
index 00000000000000..546831a84fa82a
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { AdvancedSettingsService } from './advanced_settings_service';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/constants.ts b/x-pack/legacy/plugins/spaces/public/constants.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/constants.ts
rename to x-pack/legacy/plugins/spaces/public/constants.ts
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss
new file mode 100644
index 00000000000000..30ac0c9fe9b27d
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss
@@ -0,0 +1 @@
+@import './components/index';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_copy_to_space.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/_index.scss
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_copy_to_space.scss
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss
new file mode 100644
index 00000000000000..92b19a8c8c6a3e
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss
@@ -0,0 +1 @@
+@import './copy_to_space';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
index f9da25409d60e4..ff9035ff02be5b 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
@@ -7,10 +7,7 @@
 import React from 'react';
 import { EuiLoadingSpinner, EuiText, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  SummarizedCopyToSpaceResult,
-  SummarizedSavedObjectResult,
-} from '../../../../lib/copy_saved_objects_to_space';
+import { SummarizedCopyToSpaceResult, SummarizedSavedObjectResult } from '..';
 
 interface Props {
   summarizedCopyResult: SummarizedCopyToSpaceResult;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
index 0ad5f72ba3e45f..9d73c216c73cec 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { EuiLoadingSpinner, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Space } from '../../../../../common/model/space';
-import { SummarizedCopyToSpaceResult } from '../../../../lib/copy_saved_objects_to_space';
+import { Space } from '../../../common/model/space';
+import { SummarizedCopyToSpaceResult } from '..';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
index b3fd345b1d2b4f..28011911e212eb 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
@@ -6,20 +6,20 @@
 import React from 'react';
 import Boom from 'boom';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
-import { mockManagementPlugin } from '../../../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
+import { mockManagementPlugin } from '../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
 import { CopySavedObjectsToSpaceFlyout } from './copy_to_space_flyout';
 import { CopyToSpaceForm } from './copy_to_space_form';
 import { EuiLoadingSpinner, EuiEmptyPrompt } from '@elastic/eui';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../common/model/space';
 import { findTestSubject } from 'test_utils/find_test_subject';
 import { SelectableSpacesControl } from './selectable_spaces_control';
 import { act } from '@testing-library/react';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
-import { spacesManagerMock } from '../../../../lib/mocks';
-import { SpacesManager } from '../../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
 
-jest.mock('../../../../../../../../../src/legacy/core_plugins/management/public/legacy', () => ({
+jest.mock('../../../../../../../src/legacy/core_plugins/management/public/legacy', () => ({
   setup: mockManagementPlugin.createSetupContract(),
   start: mockManagementPlugin.createStartContract(),
 }));
@@ -404,6 +404,7 @@ describe('CopyToSpaceFlyout', () => {
             id: 'my-viz',
             error: {
               type: 'missing_references',
+              blocking: [],
               references: [{ type: 'index-pattern', id: 'missing-index-pattern' }],
             },
           },
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
index 5a43e5878ab83f..f486f2f24f13df 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
@@ -22,17 +22,17 @@ import { mapValues } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
 import {
   ProcessedImportResponse,
   processImportResponse,
-} from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { Space } from '../../../../../common/model/space';
-import { SpacesManager } from '../../../../lib';
+} from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
 import { CopyToSpaceFlyoutFooter } from './copy_to_space_flyout_footer';
 import { CopyToSpaceForm } from './copy_to_space_form';
-import { CopyOptions, ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { CopyOptions, ImportRetry } from '../types';
 
 interface Props {
   onClose: () => void;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
index 5853bebe3c6697..56f39ce3ed4fb0 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
@@ -8,8 +8,8 @@ import React, { Fragment } from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiStat, EuiHorizontalRule } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { ProcessedImportResponse } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ImportRetry } from '../types';
 
 interface Props {
   copyInProgress: boolean;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
index 2a7e17c253f0b6..f680793e27fe06 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
@@ -14,8 +14,8 @@ import {
   EuiListGroupItem,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { CopyOptions } from '../../../../lib/copy_saved_objects_to_space/types';
-import { Space } from '../../../../../common/model/space';
+import { CopyOptions } from '../types';
+import { Space } from '../../../common/model/space';
 import { SelectableSpacesControl } from './selectable_spaces_control';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/index.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
index b04c9598559b3e..285abb828a0116 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
@@ -13,12 +13,12 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { ProcessedImportResponse } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { summarizeCopyResult } from '../../../../lib/copy_saved_objects_to_space';
-import { Space } from '../../../../../common/model/space';
-import { CopyOptions, ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
+import { CopyOptions, ImportRetry } from '../types';
 import { SpaceResult } from './space_result';
+import { summarizeCopyResult } from '..';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
index 42d57075313800..9cf81b1cc4486d 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -6,8 +6,8 @@
 
 import React, { Fragment, useState } from 'react';
 import { EuiSelectable, EuiLoadingSpinner } from '@elastic/eui';
-import { SpaceAvatar } from '../../../../components';
-import { Space } from '../../../../../common/model/space';
+import { SpaceAvatar } from '../../space_avatar';
+import { Space } from '../../../common/model/space';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
similarity index 86%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
index f71be12276be51..22f0767ba196e3 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
@@ -6,13 +6,13 @@
 
 import React from 'react';
 import { EuiAccordion, EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer } from '@elastic/eui';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { SummarizedCopyToSpaceResult } from '../../../../lib/copy_saved_objects_to_space';
-import { SpaceAvatar } from '../../../../components';
-import { Space } from '../../../../../common/model/space';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { SummarizedCopyToSpaceResult } from '../index';
+import { SpaceAvatar } from '../../space_avatar';
+import { Space } from '../../../common/model/space';
 import { CopyStatusSummaryIndicator } from './copy_status_summary_indicator';
 import { SpaceCopyResultDetails } from './space_result_details';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ImportRetry } from '../types';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
index 66ec38331c89ae..d3ab406b87c3e3 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
@@ -5,13 +5,13 @@
  */
 
 import React from 'react';
-import { SummarizedCopyToSpaceResult } from 'plugins/spaces/lib/copy_saved_objects_to_space';
 import { EuiText, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { Space } from '../../../../../common/model/space';
+import { SummarizedCopyToSpaceResult } from '../index';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
 import { CopyStatusIndicator } from './copy_status_indicator';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ImportRetry } from '../types';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
index 3b0fffa38e7856..c016494a4cdf9e 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
@@ -9,8 +9,8 @@ import { toastNotifications } from 'ui/notify';
 import {
   SavedObjectsManagementAction,
   SavedObjectsManagementRecord,
-} from '../../../../../../../src/legacy/core_plugins/management/public';
-import { CopySavedObjectsToSpaceFlyout } from '../../views/management/components/copy_saved_objects_to_space';
+} from '../../../../../../src/legacy/core_plugins/management/public';
+import { CopySavedObjectsToSpaceFlyout } from './components';
 import { SpacesManager } from '../spaces_manager';
 
 export class CopyToSpaceSavedObjectsManagementAction extends SavedObjectsManagementAction {
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts
new file mode 100644
index 00000000000000..63a59344dfe5d2
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
+import { spacesManagerMock } from '../spaces_manager/mocks';
+import { CopySavedObjectsToSpaceService } from '.';
+
+describe('CopySavedObjectsToSpaceService', () => {
+  describe('#setup', () => {
+    it('registers the CopyToSpaceSavedObjectsManagementAction', () => {
+      const deps = {
+        spacesManager: spacesManagerMock.create(),
+        // we don't have a proper NP mock for this yet
+        managementSetup: ({
+          savedObjects: {
+            registry: {
+              has: jest.fn().mockReturnValue(false),
+              register: jest.fn(),
+            },
+          },
+        } as unknown) as ManagementSetup,
+      };
+
+      const service = new CopySavedObjectsToSpaceService();
+      service.setup(deps);
+
+      expect(deps.managementSetup.savedObjects.registry.register).toHaveBeenCalledTimes(1);
+      expect(deps.managementSetup.savedObjects.registry.register).toHaveBeenCalledWith(
+        expect.any(CopyToSpaceSavedObjectsManagementAction)
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts
new file mode 100644
index 00000000000000..37354f985a2fc8
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.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 { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
+import { SpacesManager } from '../spaces_manager';
+
+interface SetupDeps {
+  spacesManager: SpacesManager;
+  managementSetup: ManagementSetup;
+}
+
+export class CopySavedObjectsToSpaceService {
+  public setup({ spacesManager, managementSetup }: SetupDeps) {
+    const action = new CopyToSpaceSavedObjectsManagementAction(spacesManager);
+    managementSetup.savedObjects.registry.register(action);
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts
similarity index 74%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts
index be23d90cc242a6..06969a52a3d8d4 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts
@@ -5,4 +5,4 @@
  */
 
 export * from './summarize_copy_result';
-export { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
+export { CopySavedObjectsToSpaceService } from './copy_saved_objects_to_space_service';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
index 0352902072790e..0244a35711e6fb 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { summarizeCopyResult } from './summarize_copy_result';
-import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../src/legacy/core_plugins/management/public';
 
 const createSavedObjectsManagementRecord = () => ({
   type: 'dashboard',
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
index 8807489157d71e..7bc47d35efc6c2 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
-import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { SavedObjectsManagementRecord } from '../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../src/legacy/core_plugins/management/public';
 
 export interface SummarizedSavedObjectResult {
   type: string;
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/types.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/types.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/types.ts
diff --git a/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts b/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
index 1f41bb89d77076..464066d2221de1 100644
--- a/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
+++ b/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
@@ -9,7 +9,7 @@ import {
   FeatureCatalogueEntry,
   FeatureCatalogueCategory,
 } from '../../../../../src/plugins/home/public';
-import { getSpacesFeatureDescription } from './lib/constants';
+import { getSpacesFeatureDescription } from './constants';
 
 export const createSpacesFeatureCatalogueEntry = (): FeatureCatalogueEntry => {
   return {
diff --git a/x-pack/legacy/plugins/spaces/public/index.scss b/x-pack/legacy/plugins/spaces/public/index.scss
index 7a40872b760cb7..26269f1d31aa3d 100644
--- a/x-pack/legacy/plugins/spaces/public/index.scss
+++ b/x-pack/legacy/plugins/spaces/public/index.scss
@@ -10,4 +10,7 @@
 //   spcChart__legend--small
 //   spcChart__legend-isLoading
 
-@import './views/index';
+@import './management/index';
+@import './nav_control/index';
+@import './space_selector/index';
+@import './copy_saved_objects_to_space/index';
diff --git a/x-pack/legacy/plugins/spaces/public/index.ts b/x-pack/legacy/plugins/spaces/public/index.ts
index 9233aae9fb12fb..53cb906a619d32 100644
--- a/x-pack/legacy/plugins/spaces/public/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/index.ts
@@ -5,6 +5,8 @@
  */
 import { SpacesPlugin } from './plugin';
 
+export { SpaceAvatar } from './space_avatar';
+
 export const plugin = () => {
   return new SpacesPlugin();
 };
diff --git a/x-pack/legacy/plugins/spaces/public/legacy.ts b/x-pack/legacy/plugins/spaces/public/legacy.ts
index 99419206093e93..1dffbd26617144 100644
--- a/x-pack/legacy/plugins/spaces/public/legacy.ts
+++ b/x-pack/legacy/plugins/spaces/public/legacy.ts
@@ -4,15 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { registerSettingsComponent } from 'ui/management';
 import { npSetup, npStart } from 'ui/new_platform';
+import { setup as managementSetup } from '../../../../../src/legacy/core_plugins/management/public/legacy';
 import { plugin } from '.';
-import { SpacesPlugin, PluginsSetup } from './plugin';
+import { SpacesPlugin, PluginsSetup, PluginsStart } from './plugin';
+import './management/legacy_page_routes';
 
 const spacesPlugin: SpacesPlugin = plugin();
 
-const plugins: PluginsSetup = {
+const pluginsSetup: PluginsSetup = {
   home: npSetup.plugins.home,
+  management: managementSetup,
+  __managementLegacyCompat: {
+    registerSettingsComponent,
+  },
 };
 
-export const setup = spacesPlugin.setup(npSetup.core, plugins);
-export const start = spacesPlugin.start(npStart.core);
+const pluginsStart: PluginsStart = {
+  management: npStart.plugins.management,
+};
+
+export const setup = spacesPlugin.setup(npSetup.core, pluginsSetup);
+export const start = spacesPlugin.start(npStart.core, pluginsStart);
diff --git a/x-pack/legacy/plugins/spaces/public/management/_index.scss b/x-pack/legacy/plugins/spaces/public/management/_index.scss
new file mode 100644
index 00000000000000..72deb1f1cde8d0
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/_index.scss
@@ -0,0 +1,4 @@
+@import './components/confirm_delete_modal/confirm_delete_modal';
+@import './edit_space/enabled_features/index';
+@import './edit_space/section_panel/section_panel';
+
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/_confirm_delete_modal.scss b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/_confirm_delete_modal.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/_confirm_delete_modal.scss
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/_confirm_delete_modal.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
index f0ab2c99ac2e20..331435b54edb70 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { ConfirmDeleteModal } from './confirm_delete_modal';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../../spaces_manager/mocks';
+import { SpacesManager } from '../../../spaces_manager';
 
 describe('ConfirmDeleteModal', () => {
   it('renders as expected', () => {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
index 0c76cb4a828fe2..6eed58a7842124 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
@@ -25,8 +25,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component } from 'react';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib';
+import { SpacesManager } from '../../../spaces_manager';
+import { Space } from '../../../../../../plugins/spaces/common/model/space';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/index.ts
new file mode 100644
index 00000000000000..651455d00e9f28
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ConfirmDeleteModal } from './confirm_delete_modal';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/index.ts
similarity index 85%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/components/index.ts
index 91f4964e1da068..7f9f80f470d12a 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/components/index.ts
@@ -6,3 +6,4 @@
 
 export { ConfirmDeleteModal } from './confirm_delete_modal';
 export { UnauthorizedPrompt } from './unauthorized_prompt';
+export { SecureSpaceMessage } from './secure_space_message';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
index 1cc6f6c1f72bee..b43010fe5f326a 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
@@ -8,7 +8,7 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { SecureSpaceMessage } from './secure_space_message';
 
 let mockShowLinks: boolean = true;
-jest.mock('../../../../../../xpack_main/public/services/xpack_info', () => {
+jest.mock('../../../../../xpack_main/public/services/xpack_info', () => {
   return {
     xpackInfo: {
       get: jest.fn().mockImplementation((key: string) => {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
index 6bbc423968b4bf..746b7e2ac4c986 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
 // @ts-ignore
-import { xpackInfo } from '../../../../../../xpack_main/public/services/xpack_info';
+import { xpackInfo } from '../../../../../xpack_main/public/services/xpack_info';
 
 export const SecureSpaceMessage = ({}) => {
   const showSecurityLinks = xpackInfo.get('features.security.showLinks');
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/unauthorized_prompt.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/__snapshots__/unauthorized_prompt.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/unauthorized_prompt.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/__snapshots__/unauthorized_prompt.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/index.ts
new file mode 100644
index 00000000000000..5a8120a77804bc
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { UnauthorizedPrompt } from './unauthorized_prompt';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.tsx b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
index 8a7e384d44b358..b0d74afaa90aa5 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
@@ -18,9 +18,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component, Fragment } from 'react';
-import { isReservedSpace } from '../../../../../common';
-import { Space } from '../../../../../common/model/space';
-import { SpaceAvatar } from '../../../../components';
+import { isReservedSpace } from '../../../../common';
+import { Space } from '../../../../common/model/space';
+import { SpaceAvatar } from '../../../space_avatar';
 import { SpaceValidator, toSpaceIdentifier } from '../../lib';
 import { SectionPanel } from '../section_panel';
 import { CustomizeSpaceAvatar } from './customize_space_avatar';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
index 12fa0193b59a4e..c3207c82bf95e1 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
@@ -17,12 +17,10 @@ import {
   isValidHex,
 } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
-
-import { getSpaceColor, getSpaceInitials } from '../../../../lib/space_attributes';
-import { encode, imageTypes } from '../../../../../common/lib/dataurl';
-
-import { MAX_SPACE_INITIALS } from '../../../../../common/constants';
-import { Space } from '../../../../../common/model/space';
+import { imageTypes, encode } from '../../../../common/lib/dataurl';
+import { getSpaceColor, getSpaceInitials } from '../../../space_avatar';
+import { Space } from '../../../../../../../plugins/spaces/common/model/space';
+import { MAX_SPACE_INITIALS } from '../../../../../../../plugins/spaces/common';
 
 interface Props {
   space: Partial<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
index a717570b19c5df..1d6664273d21ea 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
@@ -7,7 +7,7 @@
 import { EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component, Fragment } from 'react';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../../common/model/space';
 import { SpaceValidator, toSpaceIdentifier } from '../../lib';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
similarity index 88%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
index e7c7dfc5eb1b05..364145d6495b84 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { DeleteSpacesButton } from './delete_spaces_button';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 
 const space = {
   id: 'my-space',
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index 216dd7c41f124b..56a858eb4ccf67 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -7,10 +7,9 @@
 import { EuiButton, EuiButtonIcon, EuiButtonIconProps } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
-// @ts-ignore
 import { toastNotifications } from 'ui/notify';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib/spaces_manager';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
 import { ConfirmDeleteModal } from '../components/confirm_delete_modal';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/_index.scss b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/_index.scss
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
index f8bd4b889394ad..f770857d9313d6 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
@@ -7,8 +7,8 @@
 import { EuiLink } from '@elastic/eui';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { SectionPanel } from '../section_panel';
 import { EnabledFeatures } from './enabled_features';
 
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
index 628be759b7c5ce..70312296f757be 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
@@ -8,8 +8,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText, EuiTitle } from
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component, Fragment, ReactNode } from 'react';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { getEnabledFeatures } from '../../lib/feature_utils';
 import { SectionPanel } from '../section_panel';
 import { FeatureTable } from './feature_table';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
similarity index 92%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
index b3654b4d35bd3e..2866d0bfa8cf3c 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
@@ -3,13 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-// @ts-ignore
-import { EuiCheckbox, EuiIcon, EuiInMemoryTable, EuiSwitch, EuiText, IconType } from '@elastic/eui';
+
+import { EuiIcon, EuiInMemoryTable, EuiSwitch, EuiText, IconType } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { ChangeEvent, Component } from 'react';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { ToggleAllFeatures } from './toggle_all_features';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/toggle_all_features.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/toggle_all_features.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
index c69a885ae05878..d24e932bce1126 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
@@ -6,7 +6,7 @@
 jest.mock('ui/kfetch', () => ({
   kfetch: () => Promise.resolve([{ id: 'feature-1', name: 'feature 1', icon: 'spacesApp' }]),
 }));
-import '../../../__mocks__/xpack_info';
+import '../../__mocks__/xpack_info';
 import { EuiButton, EuiLink, EuiSwitch } from '@elastic/eui';
 import { ReactWrapper } from 'enzyme';
 import React from 'react';
@@ -14,8 +14,8 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
 import { ManageSpacePage } from './manage_space_page';
 import { SectionPanel } from './section_panel';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 
 const space = {
   id: 'my-space',
@@ -65,21 +65,28 @@ describe('ManageSpacePage', () => {
   });
 
   it('allows a space to be updated', async () => {
-    const spacesManager = spacesManagerMock.create();
-    spacesManager.getSpace = jest.fn().mockResolvedValue({
+    const spaceToUpdate = {
       id: 'existing-space',
       name: 'Existing Space',
       description: 'hey an existing space',
       color: '#aabbcc',
       initials: 'AB',
       disabledFeatures: [],
+    };
+
+    const spacesManager = spacesManagerMock.create();
+    spacesManager.getSpace = jest.fn().mockResolvedValue({
+      ...spaceToUpdate,
     });
     spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
 
+    const onLoadSpace = jest.fn();
+
     const wrapper = mountWithIntl(
       <ManageSpacePage.WrappedComponent
         spaceId={'existing-space'}
         spacesManager={(spacesManager as unknown) as SpacesManager}
+        onLoadSpace={onLoadSpace}
         intl={null as any}
         capabilities={{
           navLinks: {},
@@ -93,6 +100,9 @@ describe('ManageSpacePage', () => {
     await waitForDataLoad(wrapper);
 
     expect(spacesManager.getSpace).toHaveBeenCalledWith('existing-space');
+    expect(onLoadSpace).toHaveBeenCalledWith({
+      ...spaceToUpdate,
+    });
 
     await Promise.resolve();
 
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
index a5d60d1a731ba2..6bbb32ccd654f0 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -17,17 +17,15 @@ import {
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component, Fragment } from 'react';
-import { Breadcrumb } from 'ui/chrome';
 import { kfetch } from 'ui/kfetch';
 import { toastNotifications } from 'ui/notify';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../plugins/features/public';
-import { isReservedSpace } from '../../../../common';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib';
-import { SecureSpaceMessage } from '../components/secure_space_message';
-import { UnauthorizedPrompt } from '../components/unauthorized_prompt';
-import { getEditBreadcrumbs, toSpaceIdentifier } from '../lib';
+import { Feature } from '../../../../../../plugins/features/public';
+import { isReservedSpace } from '../../../common';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
+import { SecureSpaceMessage, UnauthorizedPrompt } from '../components';
+import { toSpaceIdentifier } from '../lib';
 import { SpaceValidator } from '../lib/validate_space';
 import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
 import { CustomizeSpace } from './customize_space';
@@ -39,7 +37,7 @@ interface Props {
   spacesManager: SpacesManager;
   spaceId?: string;
   intl: InjectedIntl;
-  setBreadcrumbs?: (breadcrumbs: Breadcrumb[]) => void;
+  onLoadSpace?: (space: Space) => void;
   capabilities: Capabilities;
 }
 
@@ -76,7 +74,7 @@ class ManageSpacePageUI extends Component<Props, State> {
       return;
     }
 
-    const { spaceId, spacesManager, intl, setBreadcrumbs } = this.props;
+    const { spaceId, spacesManager, intl, onLoadSpace } = this.props;
 
     const getFeatures = kfetch({ method: 'get', pathname: '/api/features' });
 
@@ -84,8 +82,8 @@ class ManageSpacePageUI extends Component<Props, State> {
       try {
         const [space, features] = await Promise.all([spacesManager.getSpace(spaceId), getFeatures]);
         if (space) {
-          if (setBreadcrumbs) {
-            setBreadcrumbs(getEditBreadcrumbs(space));
+          if (onLoadSpace) {
+            onLoadSpace(space);
           }
 
           this.setState({
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
index e4b2dda3a668b5..38bf3519020967 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
@@ -8,8 +8,8 @@ import React from 'react';
 
 import { EuiIcon, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { isReservedSpace } from '../../../../common';
-import { Space } from '../../../../common/model/space';
+import { isReservedSpace } from '../../../common';
+import { Space } from '../../../common/model/space';
 
 interface Props {
   space?: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/_section_panel.scss b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/_section_panel.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/_section_panel.scss
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/_section_panel.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/management/index.ts b/x-pack/legacy/plugins/spaces/public/management/index.ts
new file mode 100644
index 00000000000000..ad3cc6b2456192
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ManagementService } from './management_service';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx b/x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx
similarity index 75%
rename from x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx
rename to x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx
index d8fd0298df2fc3..8cf4a129e5b8fb 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx
@@ -4,30 +4,59 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 // @ts-ignore
-import template from 'plugins/spaces/views/management/template.html';
+import template from 'plugins/spaces/management/template.html';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nContext } from 'ui/i18n';
 // @ts-ignore
 import routes from 'ui/routes';
+import { MANAGEMENT_BREADCRUMB } from 'ui/management/breadcrumbs';
 import { npStart } from 'ui/new_platform';
 import { ManageSpacePage } from './edit_space';
-import { getCreateBreadcrumbs, getEditBreadcrumbs, getListBreadcrumbs } from './lib';
 import { SpacesGridPage } from './spaces_grid';
 
-import { start as spacesNPStart } from '../../legacy';
+import { start as spacesNPStart } from '../legacy';
+import { Space } from '../../common/model/space';
 
 const reactRootNodeId = 'manageSpacesReactRoot';
 
+function getListBreadcrumbs() {
+  return [
+    MANAGEMENT_BREADCRUMB,
+    {
+      text: 'Spaces',
+      href: '#/management/spaces/list',
+    },
+  ];
+}
+
+function getCreateBreadcrumbs() {
+  return [
+    ...getListBreadcrumbs(),
+    {
+      text: 'Create',
+    },
+  ];
+}
+
+function getEditBreadcrumbs(space?: Space) {
+  return [
+    ...getListBreadcrumbs(),
+    {
+      text: space ? space.name : '...',
+    },
+  ];
+}
+
 routes.when('/management/spaces/list', {
   template,
   k7Breadcrumbs: getListBreadcrumbs,
   requireUICapability: 'management.kibana.spaces',
   controller($scope: any) {
-    $scope.$$postDigest(async () => {
+    $scope.$$postDigest(() => {
       const domNode = document.getElementById(reactRootNodeId);
 
-      const { spacesManager } = await spacesNPStart;
+      const { spacesManager } = spacesNPStart;
 
       render(
         <I18nContext>
@@ -54,10 +83,10 @@ routes.when('/management/spaces/create', {
   k7Breadcrumbs: getCreateBreadcrumbs,
   requireUICapability: 'management.kibana.spaces',
   controller($scope: any) {
-    $scope.$$postDigest(async () => {
+    $scope.$$postDigest(() => {
       const domNode = document.getElementById(reactRootNodeId);
 
-      const { spacesManager } = await spacesNPStart;
+      const { spacesManager } = spacesNPStart;
 
       render(
         <I18nContext>
@@ -100,7 +129,9 @@ routes.when('/management/spaces/edit/:spaceId', {
           <ManageSpacePage
             spaceId={spaceId}
             spacesManager={spacesManager!}
-            setBreadcrumbs={npStart.core.chrome.setBreadcrumbs}
+            onLoadSpace={space => {
+              npStart.core.chrome.setBreadcrumbs(getEditBreadcrumbs(space));
+            }}
             capabilities={npStart.core.application.capabilities}
           />
         </I18nContext>,
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
index 8621ec5614368c..ce874956d0ef29 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Feature } from '../../../../../../../plugins/features/public';
 import { getEnabledFeatures } from './feature_utils';
+import { Feature } from '../../../../../../plugins/features/public';
 
 const buildFeatures = () =>
   [
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.ts b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.ts
similarity index 74%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.ts
index ef46a539677442..ff1688637ef73c 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Feature } from '../../../../../../../plugins/features/public';
+import { Feature } from '../../../../../../plugins/features/common';
 
-import { Space } from '../../../../common/model/space';
+import { Space } from '../../../../../../plugins/spaces/common/model/space';
 
 export function getEnabledFeatures(features: Feature[], space: Partial<Space>) {
   return features.filter(feature => !(space.disabledFeatures || []).includes(feature.id));
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/index.ts b/x-pack/legacy/plugins/spaces/public/management/lib/index.ts
similarity index 80%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/index.ts
index f65757f5dba262..4a158168febd8c 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/index.ts
@@ -7,5 +7,3 @@
 export { toSpaceIdentifier, isValidSpaceIdentifier } from './space_identifier_utils';
 
 export { SpaceValidator } from './validate_space';
-
-export { getCreateBreadcrumbs, getEditBreadcrumbs, getListBreadcrumbs } from './breadcrumbs';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.ts b/x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/validate_space.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
index e7b91161314313..43d42dacdd36d7 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { isReservedSpace } from '../../../../common/is_reserved_space';
-import { Space } from '../../../../common/model/space';
+import { isReservedSpace } from '../../../common/is_reserved_space';
+import { Space } from '../../../common/model/space';
 import { isValidSpaceIdentifier } from './space_identifier_utils';
 
 interface SpaceValidatorOptions {
diff --git a/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts b/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts
new file mode 100644
index 00000000000000..fa8ae641686737
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ManagementService } from '.';
+
+describe('ManagementService', () => {
+  describe('#start', () => {
+    it('registers the spaces management page under the kibana section', () => {
+      const mockKibanaSection = {
+        hasItem: jest.fn().mockReturnValue(false),
+        register: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledTimes(1);
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledWith('kibana');
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.register).toHaveBeenCalledWith('spaces', {
+        name: 'spacesManagementLink',
+        order: 10,
+        display: 'Spaces',
+        url: `#/management/spaces/list`,
+      });
+    });
+
+    it('will not register the spaces management page twice', () => {
+      const mockKibanaSection = {
+        hasItem: jest.fn().mockReturnValue(true),
+        register: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(0);
+    });
+
+    it('will not register the spaces management page if the kibana section is missing', () => {
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(undefined),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('#stop', () => {
+    it('deregisters the spaces management page', () => {
+      const mockKibanaSection = {
+        hasItem: jest
+          .fn()
+          .mockReturnValueOnce(false)
+          .mockReturnValueOnce(true),
+        register: jest.fn(),
+        deregister: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      service.stop();
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.deregister).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.deregister).toHaveBeenCalledWith('spaces');
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/management/management_service.ts b/x-pack/legacy/plugins/spaces/public/management/management_service.ts
new file mode 100644
index 00000000000000..ada38f5cf3387e
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/management_service.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+import { ManagementStart } from 'src/plugins/management/public';
+
+interface StartDeps {
+  managementStart: ManagementStart;
+}
+
+const MANAGE_SPACES_KEY = 'spaces';
+
+export class ManagementService {
+  private kibanaSection!: any;
+
+  public start({ managementStart }: StartDeps) {
+    this.kibanaSection = managementStart.legacy.getSection('kibana');
+    if (this.kibanaSection && !this.kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
+      this.kibanaSection.register(MANAGE_SPACES_KEY, {
+        name: 'spacesManagementLink',
+        order: 10,
+        display: i18n.translate('xpack.spaces.displayName', {
+          defaultMessage: 'Spaces',
+        }),
+        url: `#/management/spaces/list`,
+      });
+    }
+  }
+
+  public stop() {
+    if (this.kibanaSection && this.kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
+      this.kibanaSection.deregister(MANAGE_SPACES_KEY);
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/index.ts b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index 9fa03b1a9b74ae..6ca1877642bdc6 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -22,13 +22,13 @@ import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { kfetch } from 'ui/kfetch';
 import { toastNotifications } from 'ui/notify';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../plugins/features/public';
-import { isReservedSpace } from '../../../../common';
-import { DEFAULT_SPACE_ID } from '../../../../common/constants';
-import { Space } from '../../../../common/model/space';
-import { SpaceAvatar } from '../../../components';
-import { getSpacesFeatureDescription } from '../../../lib/constants';
-import { SpacesManager } from '../../../lib/spaces_manager';
+import { Feature } from '../../../../../../plugins/features/public';
+import { isReservedSpace } from '../../../common';
+import { DEFAULT_SPACE_ID } from '../../../common/constants';
+import { Space } from '../../../common/model/space';
+import { SpaceAvatar } from '../../space_avatar';
+import { getSpacesFeatureDescription } from '../../constants';
+import { SpacesManager } from '../..//spaces_manager';
 import { ConfirmDeleteModal } from '../components/confirm_delete_modal';
 import { SecureSpaceMessage } from '../components/secure_space_message';
 import { UnauthorizedPrompt } from '../components/unauthorized_prompt';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
index 4add607707b248..7856d2e7bee01c 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
@@ -6,12 +6,12 @@
 jest.mock('ui/kfetch', () => ({
   kfetch: () => Promise.resolve([]),
 }));
-import '../../../__mocks__/xpack_info';
+import '../../__mocks__/xpack_info';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { SpaceAvatar } from '../../../components';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { SpaceAvatar } from '../../space_avatar';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 import { SpacesGridPage } from './spaces_grid_page';
 
 const spaces = [
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/template.html b/x-pack/legacy/plugins/spaces/public/management/template.html
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/template.html
rename to x-pack/legacy/plugins/spaces/public/management/template.html
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/__snapshots__/nav_control_popover.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss b/x-pack/legacy/plugins/spaces/public/nav_control/_index.scss
similarity index 55%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/_index.scss
index 192091fb04e3c9..d0471da325cec9 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/_index.scss
@@ -1 +1,2 @@
 @import './components/index';
+@import './nav_control';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/_nav_control.scss b/x-pack/legacy/plugins/spaces/public/nav_control/_nav_control.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/_nav_control.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/_nav_control.scss
diff --git a/x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/manage_spaces_button.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/manage_spaces_button.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/__snapshots__/spaces_description.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_index.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_index.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_description.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_description.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_description.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_description.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_menu.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_menu.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_menu.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_menu.scss
diff --git a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
index 91a0803c20bc9e..857d0c1f828a69 100644
--- a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
@@ -8,7 +8,7 @@ import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, CSSProperties } from 'react';
 import { Capabilities } from 'src/core/public';
-import { getManageSpacesUrl } from '../lib/constants';
+import { getManageSpacesUrl } from '../../constants';
 
 interface Props {
   isDisabled?: boolean;
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
index 043fc656a571e8..abf3c636b839ed 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
@@ -7,8 +7,8 @@
 import { EuiContextMenuPanel, EuiText } from '@elastic/eui';
 import React, { FC } from 'react';
 import { Capabilities } from 'src/core/public';
-import { ManageSpacesButton } from '../../../components';
-import { getSpacesFeatureDescription } from '../../../lib/constants';
+import { ManageSpacesButton } from './manage_spaces_button';
+import { getSpacesFeatureDescription } from '../../constants';
 
 interface Props {
   onManageSpacesClick: () => void;
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
index 9a26f6802abdf5..96ce18896b426b 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
@@ -14,9 +14,10 @@ import {
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component, ReactElement } from 'react';
 import { Capabilities } from 'src/core/public';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../common/constants';
-import { Space } from '../../../../common/model/space';
-import { ManageSpacesButton, SpaceAvatar } from '../../../components';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common/constants';
+import { Space } from '../../../common/model/space';
+import { ManageSpacesButton } from './manage_spaces_button';
+import { SpaceAvatar } from '../../space_avatar';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/index.ts b/x-pack/legacy/plugins/spaces/public/nav_control/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/index.ts
rename to x-pack/legacy/plugins/spaces/public/nav_control/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
index 0df077e0d2da04..9ec070eff3fed8 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SpacesManager } from 'plugins/spaces/lib/spaces_manager';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { CoreStart } from 'src/core/public';
+import { SpacesManager } from '../spaces_manager';
 import { NavControlPopover } from './nav_control_popover';
 
 export function initSpacesNavControl(spacesManager: SpacesManager, core: CoreStart) {
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
similarity index 91%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
index a04f28242f984a..5ce141abb713e3 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
@@ -7,9 +7,9 @@
 import * as Rx from 'rxjs';
 import { shallow } from 'enzyme';
 import React from 'react';
-import { SpaceAvatar } from '../../components';
-import { spacesManagerMock } from '../../lib/mocks';
-import { SpacesManager } from '../../lib';
+import { SpaceAvatar } from '../space_avatar';
+import { spacesManagerMock } from '../spaces_manager/mocks';
+import { SpacesManager } from '../spaces_manager';
 import { NavControlPopover } from './nav_control_popover';
 import { EuiHeaderSectionItemButton } from '@elastic/eui';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
@@ -42,6 +42,7 @@ describe('NavControlPopover', () => {
         disabledFeatures: [],
       },
     ]);
+    // @ts-ignore readonly check
     spacesManager.onActiveSpaceChange$ = Rx.of({
       id: 'foo-space',
       name: 'foo',
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
index b37458aace2a28..f291027e15232c 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
@@ -13,9 +13,9 @@ import {
 import React, { Component } from 'react';
 import { Capabilities } from 'src/core/public';
 import { Subscription } from 'rxjs';
-import { Space } from '../../../common/model/space';
-import { SpaceAvatar } from '../../components';
-import { SpacesManager } from '../../lib/spaces_manager';
+import { Space } from '../../common/model/space';
+import { SpaceAvatar } from '../space_avatar';
+import { SpacesManager } from '../spaces_manager';
 import { SpacesDescription } from './components/spaces_description';
 import { SpacesMenu } from './components/spaces_menu';
 
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/types.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/types.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/types.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/types.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/plugin.tsx b/x-pack/legacy/plugins/spaces/public/plugin.tsx
index 4e070c3cee3df5..1ddb69a5b595cc 100644
--- a/x-pack/legacy/plugins/spaces/public/plugin.tsx
+++ b/x-pack/legacy/plugins/spaces/public/plugin.tsx
@@ -6,9 +6,14 @@
 
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { HomePublicPluginSetup } from 'src/plugins/home/public';
-import { SpacesManager } from './lib';
-import { initSpacesNavControl } from './views/nav_control';
+import { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { ManagementStart } from 'src/plugins/management/public';
+import { SpacesManager } from './spaces_manager';
+import { initSpacesNavControl } from './nav_control';
 import { createSpacesFeatureCatalogueEntry } from './create_feature_catalogue_entry';
+import { CopySavedObjectsToSpaceService } from './copy_saved_objects_to_space';
+import { AdvancedSettingsService } from './advanced_settings';
+import { ManagementService } from './management';
 
 export interface SpacesPluginStart {
   spacesManager: SpacesManager | null;
@@ -16,25 +21,61 @@ export interface SpacesPluginStart {
 
 export interface PluginsSetup {
   home?: HomePublicPluginSetup;
+  management: ManagementSetup;
+  __managementLegacyCompat: {
+    registerSettingsComponent: (
+      id: string,
+      component: string | React.FC<any>,
+      allowOverride: boolean
+    ) => void;
+  };
+}
+
+export interface PluginsStart {
+  management: ManagementStart;
 }
 
 export class SpacesPlugin implements Plugin<void, SpacesPluginStart, PluginsSetup> {
-  private spacesManager: SpacesManager | null = null;
+  private spacesManager!: SpacesManager;
 
-  public async start(core: CoreStart) {
-    const serverBasePath = core.injectedMetadata.getInjectedVar('serverBasePath') as string;
+  private managementService?: ManagementService;
 
+  public setup(core: CoreSetup, plugins: PluginsSetup) {
+    const serverBasePath = core.injectedMetadata.getInjectedVar('serverBasePath') as string;
     this.spacesManager = new SpacesManager(serverBasePath, core.http);
+
+    const copySavedObjectsToSpaceService = new CopySavedObjectsToSpaceService();
+    copySavedObjectsToSpaceService.setup({
+      spacesManager: this.spacesManager,
+      managementSetup: plugins.management,
+    });
+
+    const advancedSettingsService = new AdvancedSettingsService();
+    advancedSettingsService.setup({
+      getActiveSpace: () => this.spacesManager.getActiveSpace(),
+      registerSettingsComponent: plugins.__managementLegacyCompat.registerSettingsComponent,
+    });
+
+    if (plugins.home) {
+      plugins.home.featureCatalogue.register(createSpacesFeatureCatalogueEntry());
+    }
+  }
+
+  public start(core: CoreStart, plugins: PluginsStart) {
     initSpacesNavControl(this.spacesManager, core);
 
+    this.managementService = new ManagementService();
+    this.managementService.start({ managementStart: plugins.management });
+
     return {
       spacesManager: this.spacesManager,
     };
   }
 
-  public async setup(core: CoreSetup, plugins: PluginsSetup) {
-    if (plugins.home) {
-      plugins.home.featureCatalogue.register(createSpacesFeatureCatalogueEntry());
+  public stop() {
+    if (this.managementService) {
+      this.managementService.stop();
+      this.managementService = undefined;
     }
   }
 }
diff --git a/x-pack/legacy/plugins/spaces/public/components/__snapshots__/space_avatar.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/space_avatar/__snapshots__/space_avatar.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/__snapshots__/space_avatar.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/space_avatar/__snapshots__/space_avatar.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/components/index.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/index.ts
similarity index 82%
rename from x-pack/legacy/plugins/spaces/public/components/index.ts
rename to x-pack/legacy/plugins/spaces/public/space_avatar/index.ts
index 2e73f0c704f8c5..1525f2c8c61866 100644
--- a/x-pack/legacy/plugins/spaces/public/components/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/space_avatar/index.ts
@@ -5,4 +5,4 @@
  */
 
 export { SpaceAvatar } from './space_avatar';
-export { ManageSpacesButton } from './manage_spaces_button';
+export * from './space_attributes';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/space_attributes.test.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/space_attributes.test.ts
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/space_attributes.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/space_attributes.ts
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.ts
diff --git a/x-pack/legacy/plugins/spaces/public/components/space_avatar.test.tsx b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/space_avatar.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
index 0d9751ca43db94..c89f492a8fc99f 100644
--- a/x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
@@ -8,7 +8,7 @@ import { EuiAvatar, isValidHex } from '@elastic/eui';
 import React, { FC } from 'react';
 import { MAX_SPACE_INITIALS } from '../../common';
 import { Space } from '../../common/model/space';
-import { getSpaceColor, getSpaceInitials, getSpaceImageUrl } from '../lib/space_attributes';
+import { getSpaceColor, getSpaceInitials, getSpaceImageUrl } from './space_attributes';
 
 interface Props {
   space: Partial<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss b/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss
new file mode 100644
index 00000000000000..0621aa2a3efd72
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss
@@ -0,0 +1,2 @@
+@import './space_selector';
+@import './components/index';
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/_space_selector.scss b/x-pack/legacy/plugins/spaces/public/space_selector/_space_selector.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/_space_selector.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/_space_selector.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_index.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_index.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_space_card.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_space_card.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_space_card.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_space_card.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_space_cards.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_space_cards.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_space_cards.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_space_cards.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/index.ts b/x-pack/legacy/plugins/spaces/public/space_selector/components/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/index.ts
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_card.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_card.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
index 2386f6a6fe9d0e..f898ba87c60bd6 100644
--- a/x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
@@ -4,14 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  // FIXME: need updated typedefs
-  // @ts-ignore
-  EuiCard,
-} from '@elastic/eui';
+import { EuiCard } from '@elastic/eui';
 import React from 'react';
 import { Space } from '../../../common/model/space';
-import { SpaceAvatar } from '../../components';
+import { SpaceAvatar } from '../../space_avatar';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_cards.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_cards.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_cards.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_cards.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/index.tsx
similarity index 82%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/index.tsx
index c520c2683c9651..c1c1b6dc3a2f35 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/index.tsx
@@ -5,7 +5,7 @@
  */
 
 // @ts-ignore
-import template from 'plugins/spaces/views/space_selector/space_selector.html';
+import template from 'plugins/spaces/space_selector/space_selector.html';
 import chrome from 'ui/chrome';
 import { I18nContext } from 'ui/i18n';
 // @ts-ignore
@@ -15,14 +15,14 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { SpaceSelector } from './space_selector';
 
-import { start as spacesNPStart } from '../../legacy';
+import { start as spacesNPStart } from '../legacy';
 
 const module = uiModules.get('spaces_selector', []);
 module.controller('spacesSelectorController', ($scope: any) => {
-  $scope.$$postDigest(async () => {
+  $scope.$$postDigest(() => {
     const domNode = document.getElementById('spaceSelectorRoot');
 
-    const { spacesManager } = await spacesNPStart;
+    const { spacesManager } = spacesNPStart;
 
     render(
       <I18nContext>
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.html b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.html
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.html
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.html
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
similarity index 92%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
index 829312061ca980..b4d0f96307500a 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
@@ -6,8 +6,8 @@
 
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { Space } from '../../../common/model/space';
-import { spacesManagerMock } from '../../lib/mocks';
+import { Space } from '../../common/model/space';
+import { spacesManagerMock } from '../spaces_manager/mocks';
 import { SpaceSelector } from './space_selector';
 
 function getSpacesManager(spaces: Space[] = []) {
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
index d665752b3c8a65..206d38454fa8c5 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
@@ -19,11 +19,11 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
-import { SpacesManager } from 'plugins/spaces/lib';
 import React, { Component, Fragment } from 'react';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common/constants';
-import { Space } from '../../../common/model/space';
-import { SpaceCards } from '../components/space_cards';
+import { SpacesManager } from '../spaces_manager';
+import { Space } from '../../common/model/space';
+import { SpaceCards } from './components';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../common/constants';
 
 interface Props {
   spacesManager: SpacesManager;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/index.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/index.ts
similarity index 81%
rename from x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/index.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/index.ts
index 1c84a7bc3b7274..538dd77e053f57 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { getIndexPattern } from './get_index_pattern';
+export { SpacesManager } from './spaces_manager';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/mocks.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/mocks.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/mocks.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/mocks.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
similarity index 87%
rename from x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
index 69c6f7a452fdd0..56879af33916fc 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
@@ -6,9 +6,10 @@
 
 import { of, Observable } from 'rxjs';
 import { Space } from '../../common/model/space';
+import { SpacesManager } from './spaces_manager';
 
 function createSpacesManagerMock() {
-  return {
+  return ({
     onActiveSpaceChange$: (of(undefined) as unknown) as Observable<Space>,
     getSpaces: jest.fn().mockResolvedValue([]),
     getSpace: jest.fn().mockResolvedValue(undefined),
@@ -19,7 +20,8 @@ function createSpacesManagerMock() {
     copySavedObjects: jest.fn().mockResolvedValue(undefined),
     resolveCopySavedObjectsErrors: jest.fn().mockResolvedValue(undefined),
     redirectToSpaceSelector: jest.fn().mockResolvedValue(undefined),
-  };
+    changeSelectedSpace: jest.fn(),
+  } as unknown) as jest.Mocked<SpacesManager>;
 }
 
 export const spacesManagerMock = {
diff --git a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.test.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/spaces_manager.test.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
index ccc1b00dabb293..e9c738cf40c69a 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
@@ -9,9 +9,9 @@ import { HttpSetup } from 'src/core/public';
 import { SavedObjectsManagementRecord } from '../../../../../../src/legacy/core_plugins/management/public';
 import { Space } from '../../common/model/space';
 import { GetSpacePurpose } from '../../common/model/types';
-import { CopySavedObjectsToSpaceResponse } from './copy_saved_objects_to_space/types';
 import { ENTER_SPACE_PATH } from '../../common/constants';
 import { addSpaceIdToPath } from '../../../../../plugins/spaces/common';
+import { CopySavedObjectsToSpaceResponse } from '../copy_saved_objects_to_space/types';
 
 export class SpacesManager {
   private activeSpace$: BehaviorSubject<Space | null> = new BehaviorSubject<Space | null>(null);
diff --git a/x-pack/legacy/plugins/spaces/public/views/_index.scss b/x-pack/legacy/plugins/spaces/public/views/_index.scss
deleted file mode 100644
index 0cc8ccb10246b0..00000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/_index.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import './components/index';
-@import './management/index';
-@import './nav_control/index';
-@import './space_selector/index'
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/_index.scss b/x-pack/legacy/plugins/spaces/public/views/management/_index.scss
deleted file mode 100644
index e7cbdfe2de7e81..00000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './components/confirm_delete_modal';
-@import './edit_space/enabled_features/index';
-@import './components/copy_saved_objects_to_space/index';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/index.tsx b/x-pack/legacy/plugins/spaces/public/views/management/index.tsx
deleted file mode 100644
index bf33273c614d65..00000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/index.tsx
+++ /dev/null
@@ -1,77 +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 { i18n } from '@kbn/i18n';
-import 'plugins/spaces/views/management/page_routes';
-import React from 'react';
-import {
-  management,
-  PAGE_SUBTITLE_COMPONENT,
-  PAGE_TITLE_COMPONENT,
-  registerSettingsComponent,
-} from 'ui/management';
-// @ts-ignore
-import routes from 'ui/routes';
-import { setup as managementSetup } from '../../../../../../../src/legacy/core_plugins/management/public/legacy';
-import { AdvancedSettingsSubtitle } from './components/advanced_settings_subtitle';
-import { AdvancedSettingsTitle } from './components/advanced_settings_title';
-import { start as spacesNPStart } from '../../legacy';
-import { CopyToSpaceSavedObjectsManagementAction } from '../../lib/copy_saved_objects_to_space';
-
-const MANAGE_SPACES_KEY = 'spaces';
-
-routes.defaults(/\/management/, {
-  resolve: {
-    spacesManagementSection() {
-      function getKibanaSection() {
-        return management.getSection('kibana');
-      }
-
-      function deregisterSpaces() {
-        getKibanaSection().deregister(MANAGE_SPACES_KEY);
-      }
-
-      function ensureSpagesRegistered() {
-        const kibanaSection = getKibanaSection();
-
-        if (!kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
-          kibanaSection.register(MANAGE_SPACES_KEY, {
-            name: 'spacesManagementLink',
-            order: 10,
-            display: i18n.translate('xpack.spaces.displayName', {
-              defaultMessage: 'Spaces',
-            }),
-            url: `#/management/spaces/list`,
-          });
-        }
-
-        // Customize Saved Objects Management
-        spacesNPStart.then(({ spacesManager }) => {
-          const action = new CopyToSpaceSavedObjectsManagementAction(spacesManager!);
-          // This route resolve function executes any time the management screen is loaded, and we want to ensure
-          // that this action is only registered once.
-          if (!managementSetup.savedObjects.registry.has(action.id)) {
-            managementSetup.savedObjects.registry.register(action);
-          }
-        });
-
-        const getActiveSpace = async () => {
-          const { spacesManager } = await spacesNPStart;
-          return spacesManager!.getActiveSpace();
-        };
-
-        const PageTitle = () => <AdvancedSettingsTitle getActiveSpace={getActiveSpace} />;
-        registerSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle, true);
-
-        const SubTitle = () => <AdvancedSettingsSubtitle getActiveSpace={getActiveSpace} />;
-        registerSettingsComponent(PAGE_SUBTITLE_COMPONENT, SubTitle, true);
-      }
-
-      deregisterSpaces();
-
-      ensureSpagesRegistered();
-    },
-  },
-});
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.ts b/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.ts
deleted file mode 100644
index a4e8ba508b6177..00000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.ts
+++ /dev/null
@@ -1,36 +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 { MANAGEMENT_BREADCRUMB } from 'ui/management/breadcrumbs';
-import { Space } from '../../../../common/model/space';
-
-export function getListBreadcrumbs() {
-  return [
-    MANAGEMENT_BREADCRUMB,
-    {
-      text: 'Spaces',
-      href: '#/management/spaces/list',
-    },
-  ];
-}
-
-export function getCreateBreadcrumbs() {
-  return [
-    ...getListBreadcrumbs(),
-    {
-      text: 'Create',
-    },
-  ];
-}
-
-export function getEditBreadcrumbs(space?: Space) {
-  return [
-    ...getListBreadcrumbs(),
-    {
-      text: space ? space.name : '...',
-    },
-  ];
-}
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss b/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss
deleted file mode 100644
index f23ac662dce1dc..00000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './space_selector';
diff --git a/x-pack/legacy/plugins/uptime/public/apps/plugin.ts b/x-pack/legacy/plugins/uptime/public/apps/plugin.ts
index bc4e30b79cb157..c09fdf116e790a 100644
--- a/x-pack/legacy/plugins/uptime/public/apps/plugin.ts
+++ b/x-pack/legacy/plugins/uptime/public/apps/plugin.ts
@@ -30,14 +30,8 @@ export class Plugin {
   }
 
   public start(start: StartObject): void {
-    const {
-      core,
-      plugins: {
-        data: { autocomplete },
-      },
-    } = start;
     const libs: UMFrontendLibs = {
-      framework: getKibanaFrameworkAdapter(core, autocomplete),
+      framework: getKibanaFrameworkAdapter(start.core, start.plugins),
     };
     // @ts-ignore improper type description
     this.chrome.setRootTemplate(template);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx
index 72e88d28240737..731f560d315d63 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx
@@ -4,14 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useState, useEffect, useContext } from 'react';
+import React, { useState, useEffect } from 'react';
 import { uniqueId, startsWith } from 'lodash';
 import { EuiCallOut } from '@elastic/eui';
 import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Typeahead } from './typeahead';
-import { getIndexPattern } from '../../../lib/adapters/index_pattern';
-import { UptimeSettingsContext } from '../../../contexts';
 import { useUrlParams } from '../../../hooks';
 import { toStaticIndexPattern } from '../../../lib/helper';
 import {
@@ -20,6 +18,7 @@ import {
   esKuery,
   IIndexPattern,
 } from '../../../../../../../../src/plugins/data/public';
+import { useIndexPattern } from '../../../hooks';
 
 const Container = styled.div`
   margin-bottom: 10px;
@@ -71,16 +70,18 @@ export function KueryBar({ autocomplete }: Props) {
     suggestions: [],
     isLoadingIndexPattern: true,
   });
-  const { basePath } = useContext(UptimeSettingsContext);
   const [indexPattern, setIndexPattern] = useState<any | undefined>(undefined);
   const [isLoadingIndexPattern, setIsLoadingIndexPattern] = useState<boolean>(true);
   const [isLoadingSuggestions, setIsLoadingSuggestions] = useState<boolean>(false);
   let currentRequestCheck: string;
 
+  useIndexPattern((result: any) => setIndexPattern(toStaticIndexPattern(result)));
+
   useEffect(() => {
-    getIndexPattern(basePath, (result: any) => setIndexPattern(toStaticIndexPattern(result)));
-    setIsLoadingIndexPattern(false);
-  }, [basePath]);
+    if (indexPattern !== undefined) {
+      setIsLoadingIndexPattern(false);
+    }
+  }, [indexPattern]);
   const [getUrlParams, updateUrlParams] = useUrlParams();
   const { search: kuery } = getUrlParams();
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__mocks__/mock.ts b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/__mocks__/mock.ts
similarity index 98%
rename from x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__mocks__/mock.ts
rename to x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/__mocks__/mock.ts
index 9b902651690bf0..291ab555fbdc67 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__mocks__/mock.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/__mocks__/mock.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import lowPolyLayerFeatures from '../low_poly_layer.json';
+import lowPolyLayerFeatures from '../../low_poly_layer.json';
 
 export const mockDownPointsLayer = {
   id: 'down_points',
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.test.ts b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
similarity index 83%
rename from x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.test.ts
rename to x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
index 1e8e5b6012a79d..263c3fc787da91 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getLayerList } from './map_config';
+import { getLayerList } from '../map_config';
 import { mockLayerList } from './__mocks__/mock';
-import { LocationPoint } from './embedded_map';
+import { LocationPoint } from '../embedded_map';
 
 jest.mock('uuid', () => {
   return {
@@ -33,7 +33,7 @@ describe('map_config', () => {
 
   describe('#getLayerList', () => {
     test('it returns the low poly layer', () => {
-      const layerList = getLayerList(upPoints, downPoints);
+      const layerList = getLayerList(upPoints, downPoints, { danger: '#BC261E', gray: '#000' });
       expect(layerList).toStrictEqual(mockLayerList);
     });
   });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx
index 93de1d478fb836..fe8a1a0bad7ec6 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
 import uuid from 'uuid';
 import styled from 'styled-components';
 
@@ -15,6 +15,7 @@ import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../maps/common/constants';
 
 import { MapEmbeddable } from './types';
 import { getLayerList } from './map_config';
+import { UptimeSettingsContext } from '../../../../contexts';
 
 export interface EmbeddedMapProps {
   upPoints: LocationPoint[];
@@ -45,6 +46,7 @@ const EmbeddedPanel = styled.div`
 `;
 
 export const EmbeddedMap = ({ upPoints, downPoints }: EmbeddedMapProps) => {
+  const { colors } = useContext(UptimeSettingsContext);
   const [embeddable, setEmbeddable] = useState<MapEmbeddable>();
   const embeddableRoot: React.RefObject<HTMLDivElement> = React.createRef();
   const factory = start.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE);
@@ -58,16 +60,18 @@ export const EmbeddedMap = ({ upPoints, downPoints }: EmbeddedMapProps) => {
     viewMode: 'view',
     isLayerTOCOpen: false,
     hideFilterActions: true,
-    mapCenter: { lon: 11, lat: 47, zoom: 0 },
+    mapCenter: { lon: 11, lat: 20, zoom: 0 },
     disableInteractive: true,
     disableTooltipControl: true,
     hideToolbarOverlay: true,
+    hideLayerControl: true,
+    hideViewControl: true,
   };
 
   useEffect(() => {
     async function setupEmbeddable() {
       const mapState = {
-        layerList: getLayerList(upPoints, downPoints),
+        layerList: getLayerList(upPoints, downPoints, colors),
         title: i18n.MAP_TITLE,
       };
       // @ts-ignore
@@ -82,9 +86,9 @@ export const EmbeddedMap = ({ upPoints, downPoints }: EmbeddedMapProps) => {
 
   useEffect(() => {
     if (embeddable) {
-      embeddable.setLayerList(getLayerList(upPoints, downPoints));
+      embeddable.setLayerList(getLayerList(upPoints, downPoints, colors));
     }
-  }, [upPoints, downPoints, embeddable]);
+  }, [upPoints, downPoints, embeddable, colors]);
 
   useEffect(() => {
     if (embeddableRoot.current && embeddable) {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.ts b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.ts
index 608df8b235f001..b423b8baf41bf6 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.ts
@@ -12,8 +12,12 @@ import { LocationPoint } from './embedded_map';
  * destination, and line layer for each of the provided indexPatterns
  *
  */
-export const getLayerList = (upPoints: LocationPoint[], downPoints: LocationPoint[]) => {
-  return [getLowPolyLayer(), getDownPointsLayer(downPoints), getUpPointsLayer(upPoints)];
+export const getLayerList = (
+  upPoints: LocationPoint[],
+  downPoints: LocationPoint[],
+  { gray, danger }: { gray: string; danger: string }
+) => {
+  return [getLowPolyLayer(), getDownPointsLayer(downPoints, danger), getUpPointsLayer(upPoints)];
 };
 
 export const getLowPolyLayer = () => {
@@ -62,7 +66,7 @@ export const getLowPolyLayer = () => {
   };
 };
 
-export const getDownPointsLayer = (downPoints: LocationPoint[]) => {
+export const getDownPointsLayer = (downPoints: LocationPoint[], dangerColor: string) => {
   const features = downPoints?.map(point => ({
     type: 'feature',
     geometry: {
@@ -87,7 +91,7 @@ export const getDownPointsLayer = (downPoints: LocationPoint[]) => {
         fillColor: {
           type: 'STATIC',
           options: {
-            color: '#BC261E',
+            color: dangerColor,
           },
         },
         lineColor: {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
index b271632cb631fd..f70d145ec05c38 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
@@ -6,15 +6,19 @@
 
 import React from 'react';
 import styled from 'styled-components';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { LocationStatusTags } from './location_status_tags';
 import { EmbeddedMap, LocationPoint } from './embeddables/embedded_map';
+import { MonitorLocations } from '../../../../common/runtime_types';
 
 const MapPanel = styled.div`
-  height: 400px;
+  height: 240px;
   width: 520px;
+  margin-right: 10px;
 `;
 
 interface LocationMapProps {
-  monitorLocations: any;
+  monitorLocations: MonitorLocations;
 }
 
 export const LocationMap = ({ monitorLocations }: LocationMapProps) => {
@@ -31,8 +35,15 @@ export const LocationMap = ({ monitorLocations }: LocationMapProps) => {
     });
   }
   return (
-    <MapPanel>
-      <EmbeddedMap upPoints={upPoints} downPoints={downPoints} />
-    </MapPanel>
+    <EuiFlexGroup>
+      <EuiFlexItem grow={false}>
+        <LocationStatusTags locations={monitorLocations?.locations || []} />
+      </EuiFlexItem>
+      <EuiFlexItem grow={true}>
+        <MapPanel>
+          <EmbeddedMap upPoints={upPoints} downPoints={downPoints} />
+        </MapPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
new file mode 100644
index 00000000000000..a10d8e02e68638
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { EuiBadge, EuiText } from '@elastic/eui';
+import { UptimeSettingsContext } from '../../../contexts';
+import { MonitorLocation } from '../../../../common/runtime_types';
+
+const TextStyle = styled.div`
+  font-weight: 600;
+`;
+
+const BadgeItem = styled.div`
+  margin-bottom: 5px;
+`;
+
+const TagContainer = styled.div`
+  padding: 10px;
+  max-height: 200px;
+  overflow: hidden;
+`;
+
+interface Props {
+  locations: MonitorLocation[];
+}
+
+export const LocationStatusTags = ({ locations }: Props) => {
+  const {
+    colors: { gray, danger },
+  } = useContext(UptimeSettingsContext);
+
+  const upLocs: string[] = [];
+  const downLocs: string[] = [];
+
+  locations.forEach((item: any) => {
+    if (item.summary.down === 0) {
+      upLocs.push(item.geo.name);
+    } else {
+      downLocs.push(item.geo.name);
+    }
+  });
+
+  return (
+    <TagContainer>
+      <span>
+        {downLocs.map((item, ind) => (
+          <BadgeItem key={ind}>
+            <EuiBadge color={danger}>
+              <EuiText size="m">
+                <TextStyle>{item}</TextStyle>
+              </EuiText>
+            </EuiBadge>
+          </BadgeItem>
+        ))}
+      </span>
+      <span>
+        {upLocs.map((item, ind) => (
+          <BadgeItem key={ind}>
+            <EuiBadge color={gray}>
+              <EuiText size="m">
+                <TextStyle>{item}</TextStyle>
+              </EuiText>
+            </EuiBadge>
+          </BadgeItem>
+        ))}
+      </span>
+    </TagContainer>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/index.ts b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
index 22de59833b08d3..aa7bb0a220357d 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
@@ -5,3 +5,5 @@
  */
 
 export { useUrlParams } from './use_url_params';
+export { useIndexPattern } from './use_index_pattern';
+export * from './use_telemetry';
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
new file mode 100644
index 00000000000000..eb9b475a35716e
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useEffect, Dispatch } from 'react';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+
+export const useIndexPattern = <T>(setIndexPattern: Dispatch<T>) => {
+  const core = useKibana();
+  useEffect(() => {
+    const fetch = core.services.http?.fetch;
+    async function getIndexPattern() {
+      if (!fetch) throw new Error('Http core services are not defined');
+      setIndexPattern(await fetch('/api/uptime/index_pattern', { method: 'GET' }));
+    }
+    getIndexPattern();
+  }, [core.services.http, setIndexPattern]);
+};
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
new file mode 100644
index 00000000000000..15f276174e2cf1
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useEffect } from 'react';
+import { HttpHandler } from 'kibana/public';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+
+export enum UptimePage {
+  Overview = '/api/uptime/logOverview',
+  Monitor = '/api/uptime/logMonitor',
+  NotFound = '__not-found__',
+}
+
+const getApiPath = (page?: UptimePage) => {
+  if (!page) throw new Error('Telemetry logging for this page not yet implemented');
+  if (page === '__not-found__')
+    throw new Error('Telemetry logging for 404 page not yet implemented');
+  return page.valueOf();
+};
+
+const logPageLoad = async (fetch: HttpHandler, page?: UptimePage) => {
+  try {
+    await fetch(getApiPath(page), {
+      method: 'POST',
+    });
+  } catch (e) {
+    throw e;
+  }
+};
+
+export const useUptimeTelemetry = (page?: UptimePage) => {
+  const kibana = useKibana();
+  const fetch = kibana.services.http?.fetch;
+  useEffect(() => {
+    if (!fetch) throw new Error('Core http services are not defined');
+    logPageLoad(fetch, page);
+  }, [fetch, page]);
+};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
index b7ff3b2aa6264e..28179c229013b5 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
+++ b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ChromeBreadcrumb, CoreStart } from 'src/core/public';
+import { ChromeBreadcrumb, LegacyCoreStart } from 'src/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { get } from 'lodash';
-import { AutocompleteProviderRegister } from 'src/plugins/data/public';
 import { i18n as i18nFormatter } from '@kbn/i18n';
+import { PluginsStart } from 'ui/new_platform/new_platform';
 import { CreateGraphQLClient } from './framework_adapter_types';
 import { UptimeApp, UptimeAppProps } from '../../../uptime_app';
 import { getIntegratedAppAvailability } from './capabilities_adapter';
@@ -19,13 +19,12 @@ import {
   DEFAULT_DARK_MODE,
   DEFAULT_TIMEPICKER_QUICK_RANGES,
 } from '../../../../common/constants';
-import { getTelemetryMonitorPageLogger, getTelemetryOverviewPageLogger } from '../telemetry';
 import { UMFrameworkAdapter, BootstrapUptimeApp } from '../../lib';
 import { createApolloClient } from './apollo_client_adapter';
 
 export const getKibanaFrameworkAdapter = (
-  core: CoreStart,
-  autocomplete: Pick<AutocompleteProviderRegister, 'getProvider'>
+  core: LegacyCoreStart,
+  plugins: PluginsStart
 ): UMFrameworkAdapter => {
   const {
     application: { capabilities },
@@ -44,10 +43,10 @@ export const getKibanaFrameworkAdapter = (
   );
   const canSave = get(capabilities, 'uptime.save', false);
   const props: UptimeAppProps = {
-    autocomplete,
     basePath: basePath.get(),
     canSave,
     client: createApolloClient(`${basePath.get()}/api/uptime/graphql`, 'true'),
+    core,
     darkMode: core.uiSettings.get(DEFAULT_DARK_MODE),
     commonlyUsedRanges: core.uiSettings.get(DEFAULT_TIMEPICKER_QUICK_RANGES),
     i18n,
@@ -55,8 +54,7 @@ export const getKibanaFrameworkAdapter = (
     isInfraAvailable: infrastructure,
     isLogsAvailable: logs,
     kibanaBreadcrumbs: breadcrumbs,
-    logMonitorPageLoad: getTelemetryMonitorPageLogger('true', basePath.get()),
-    logOverviewPageLoad: getTelemetryOverviewPageLogger('true', basePath.get()),
+    plugins,
     renderGlobalHelpControls: () =>
       setHelpExtension({
         appName: i18nFormatter.translate('xpack.uptime.header.appName', {
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/__tests__/get_index_pattern.test.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/__tests__/get_index_pattern.test.ts
deleted file mode 100644
index 6654def2f944bc..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/__tests__/get_index_pattern.test.ts
+++ /dev/null
@@ -1,50 +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 axios, { AxiosRequestConfig } from 'axios';
-import { getIndexPattern } from '../get_index_pattern';
-
-describe('getIndexPattern', () => {
-  let axiosSpy: jest.SpyInstance<Promise<unknown>, [string, (AxiosRequestConfig | undefined)?]>;
-  beforeEach(() => {
-    axiosSpy = jest.spyOn(axios, 'get');
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns expected data', async () => {
-    expect.assertions(3);
-    axiosSpy.mockReturnValue(new Promise(r => r({ data: { foo: 'bar' } })));
-    expect(await getIndexPattern()).toEqual({ foo: 'bar' });
-    expect(axiosSpy.mock.calls).toHaveLength(1);
-    expect(axiosSpy.mock.calls[0]).toEqual(['/api/uptime/index_pattern']);
-  });
-
-  it('handles the supplied basePath', async () => {
-    expect.assertions(2);
-    await getIndexPattern('foo');
-    expect(axiosSpy.mock.calls).toHaveLength(1);
-    expect(axiosSpy.mock.calls[0]).toEqual(['foo/api/uptime/index_pattern']);
-  });
-
-  it('supplies the returned data to the given setter function', async () => {
-    const mockSetter = jest.fn();
-    axiosSpy.mockReturnValue(new Promise(r => r({ data: { foo: 'bar' } })));
-    await getIndexPattern(undefined, mockSetter);
-    expect(mockSetter).toHaveBeenCalled();
-    expect(mockSetter).toHaveBeenCalledWith({ foo: 'bar' });
-  });
-
-  it('returns undefined when there is an error fetching', async () => {
-    expect.assertions(1);
-    axiosSpy.mockReturnValue(
-      new Promise((resolve, reject) => reject('Request timeout, server could not be reached'))
-    );
-    expect(await getIndexPattern()).toBeUndefined();
-  });
-});
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/get_index_pattern.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/get_index_pattern.ts
deleted file mode 100644
index fd4161b35f7ddb..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/get_index_pattern.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 axios from 'axios';
-import { getApiPath } from '../../helper';
-
-/**
- * Fetches and returns the uptime index pattern, optionally provides it to
- * a given setter function.
- * @param basePath - the base path, if any
- * @param setter - a callback for use with non-async functions like `useEffect`
- */
-export const getIndexPattern = async (basePath?: string, setter?: (data: unknown) => void) => {
-  try {
-    const { data } = await axios.get(getApiPath('/api/uptime/index_pattern', basePath));
-    if (setter) {
-      setter(data);
-    }
-    return data;
-  } catch {
-    return undefined;
-  }
-};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_monitor.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_monitor.ts
deleted file mode 100644
index 20328497d69a86..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_monitor.ts
+++ /dev/null
@@ -1,18 +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 axios from 'axios';
-import { getApiPath } from '../../helper';
-
-/**
- * Generates a function to log a page load of the monitor page for Kibana telemetry.
- * @returns a function that can log page loads
- */
-export const getTelemetryMonitorPageLogger = (xsrf: string, basePath?: string) => async () => {
-  await axios.post(getApiPath('/api/uptime/logMonitor', basePath), undefined, {
-    headers: { 'kbn-xsrf': xsrf },
-  });
-};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_overview.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_overview.ts
deleted file mode 100644
index fd9fd773a18b9f..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_overview.ts
+++ /dev/null
@@ -1,18 +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 axios from 'axios';
-import { getApiPath } from '../../helper';
-
-/**
- * Generates a function to log a page load of the overview page for Kibana telemtry.
- * @returns a function that can log page loads
- */
-export const getTelemetryOverviewPageLogger = (xsrf: string, basePath?: string) => async () => {
-  await axios.post(getApiPath('/api/uptime/logOverview', basePath), undefined, {
-    headers: { 'kbn-xsrf': xsrf },
-  });
-};
diff --git a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
index 8c5649f680fcb5..c8334b2376bc17 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
@@ -12,14 +12,13 @@ import { getMonitorPageBreadcrumb } from '../breadcrumbs';
 import { MonitorCharts, MonitorPageTitle, PingList } from '../components/functional';
 import { UMUpdateBreadcrumbs } from '../lib/lib';
 import { UptimeSettingsContext } from '../contexts';
-import { useUrlParams } from '../hooks';
+import { useUptimeTelemetry, useUrlParams, UptimePage } from '../hooks';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { useTrackPageview } from '../../../infra/public';
 import { getTitle } from '../lib/helper/get_title';
 import { MonitorStatusDetails } from '../components/functional/monitor_status_details';
 
 interface MonitorPageProps {
-  logMonitorPageLoad: () => void;
   match: { params: { monitorId: string } };
   // this is the query function provided by Apollo's Client API
   query: <T, TVariables = OperationVariables>(
@@ -28,12 +27,7 @@ interface MonitorPageProps {
   setBreadcrumbs: UMUpdateBreadcrumbs;
 }
 
-export const MonitorPage = ({
-  logMonitorPageLoad,
-  query,
-  setBreadcrumbs,
-  match,
-}: MonitorPageProps) => {
+export const MonitorPage = ({ query, setBreadcrumbs, match }: MonitorPageProps) => {
   // decode 64 base string, it was decoded to make it a valid url, since monitor id can be a url
   const monitorId = atob(match.params.monitorId);
   const [pingListPageCount, setPingListPageCount] = useState<number>(10);
@@ -74,9 +68,7 @@ export const MonitorPage = ({
     monitorId,
   };
 
-  useEffect(() => {
-    logMonitorPageLoad();
-  }, [logMonitorPageLoad]);
+  useUptimeTelemetry(UptimePage.Monitor);
 
   useTrackPageview({ app: 'uptime', path: 'monitor' });
   useTrackPageview({ app: 'uptime', path: 'monitor', delay: 15000 });
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index 8e72f964ed1289..34bcfb994cd484 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -19,10 +19,9 @@ import {
 } from '../components/functional';
 import { UMUpdateBreadcrumbs } from '../lib/lib';
 import { UptimeSettingsContext } from '../contexts';
-import { useUrlParams } from '../hooks';
+import { useIndexPattern, useUrlParams, useUptimeTelemetry, UptimePage } from '../hooks';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { useTrackPageview } from '../../../infra/public';
-import { getIndexPattern } from '../lib/adapters/index_pattern';
 import { combineFiltersAndUserSearch, stringifyKueries, toStaticIndexPattern } from '../lib/helper';
 import { AutocompleteProviderRegister, esKuery } from '../../../../../../src/plugins/data/public';
 
@@ -34,7 +33,6 @@ interface OverviewPageProps {
     pathname: string;
     search: string;
   };
-  logOverviewPageLoad: () => void;
   setBreadcrumbs: UMUpdateBreadcrumbs;
 }
 
@@ -54,12 +52,7 @@ const EuiFlexItemStyled = styled(EuiFlexItem)`
   }
 `;
 
-export const OverviewPage = ({
-  basePath,
-  autocomplete,
-  logOverviewPageLoad,
-  setBreadcrumbs,
-}: Props) => {
+export const OverviewPage = ({ basePath, autocomplete, setBreadcrumbs }: Props) => {
   const { colors, setHeadingText } = useContext(UptimeSettingsContext);
   const [getUrlParams, updateUrl] = useUrlParams();
   const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
@@ -72,11 +65,11 @@ export const OverviewPage = ({
     filters: urlFilters,
   } = params;
   const [indexPattern, setIndexPattern] = useState<any>(undefined);
+  useUptimeTelemetry(UptimePage.Overview);
+  useIndexPattern(setIndexPattern);
 
   useEffect(() => {
-    getIndexPattern(basePath, setIndexPattern);
     setBreadcrumbs(getOverviewPageBreadcrumbs());
-    logOverviewPageLoad();
     if (setHeadingText) {
       setHeadingText(
         i18n.translate('xpack.uptime.overviewPage.headerText', {
@@ -85,7 +78,7 @@ export const OverviewPage = ({
         })
       );
     }
-  }, [basePath, logOverviewPageLoad, setBreadcrumbs, setHeadingText]);
+  }, [basePath, setBreadcrumbs, setHeadingText]);
 
   useTrackPageview({ app: 'uptime', path: 'overview' });
   useTrackPageview({ app: 'uptime', path: 'overview', delay: 15000 });
diff --git a/x-pack/legacy/plugins/uptime/public/uptime_app.tsx b/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
index f72055c52255d8..cecbfe375f5fed 100644
--- a/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
+++ b/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
@@ -13,8 +13,9 @@ import React, { useEffect, useState } from 'react';
 import { ApolloProvider } from 'react-apollo';
 import { Provider as ReduxProvider } from 'react-redux';
 import { BrowserRouter as Router, Route, RouteComponentProps, Switch } from 'react-router-dom';
-import { I18nStart, ChromeBreadcrumb } from 'src/core/public';
-import { AutocompleteProviderRegister } from 'src/plugins/data/public';
+import { I18nStart, ChromeBreadcrumb, LegacyCoreStart } from 'src/core/public';
+import { PluginsStart } from 'ui/new_platform/new_platform';
+import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
 import { UMGraphQLClient, UMUpdateBreadcrumbs, UMUpdateBadge } from './lib/lib';
 import { MonitorPage, OverviewPage, NotFoundPage } from './pages';
 import { UptimeRefreshContext, UptimeSettingsContext, UMSettingsContextValues } from './contexts';
@@ -37,15 +38,14 @@ export interface UptimeAppProps {
   basePath: string;
   canSave: boolean;
   client: UMGraphQLClient;
+  core: LegacyCoreStart;
   darkMode: boolean;
-  autocomplete: Pick<AutocompleteProviderRegister, 'getProvider'>;
   i18n: I18nStart;
   isApmAvailable: boolean;
   isInfraAvailable: boolean;
   isLogsAvailable: boolean;
   kibanaBreadcrumbs: ChromeBreadcrumb[];
-  logMonitorPageLoad: () => void;
-  logOverviewPageLoad: () => void;
+  plugins: PluginsStart;
   routerBasename: string;
   setBreadcrumbs: UMUpdateBreadcrumbs;
   setBadge: UMUpdateBadge;
@@ -55,18 +55,17 @@ export interface UptimeAppProps {
 
 const Application = (props: UptimeAppProps) => {
   const {
-    autocomplete,
     basePath,
     canSave,
     client,
+    core,
     darkMode,
     commonlyUsedRanges,
     i18n: i18nCore,
     isApmAvailable,
     isInfraAvailable,
     isLogsAvailable,
-    logMonitorPageLoad,
-    logOverviewPageLoad,
+    plugins,
     renderGlobalHelpControls,
     routerBasename,
     setBreadcrumbs,
@@ -156,70 +155,70 @@ const Application = (props: UptimeAppProps) => {
   return (
     <i18nCore.Context>
       <ReduxProvider store={store}>
-        <Router basename={routerBasename}>
-          <Route
-            path="/"
-            render={(rootRouteProps: RouteComponentProps) => {
-              return (
-                <ApolloProvider client={client}>
-                  <UptimeRefreshContext.Provider value={{ lastRefresh, ...rootRouteProps }}>
-                    <UptimeSettingsContext.Provider value={initializeSettingsContextValues()}>
-                      <EuiPage className="app-wrapper-panel " data-test-subj="uptimeApp">
-                        <main>
-                          <EuiFlexGroup
-                            alignItems="center"
-                            justifyContent="spaceBetween"
-                            gutterSize="s"
-                          >
-                            <EuiFlexItem>
-                              <EuiTitle>
-                                <h1>{headingText}</h1>
-                              </EuiTitle>
-                            </EuiFlexItem>
-                            <EuiFlexItem grow={false}>
-                              <UptimeDatePicker
-                                refreshApp={refreshApp}
-                                commonlyUsedRanges={commonlyUsedRanges}
-                                {...rootRouteProps}
-                              />
-                            </EuiFlexItem>
-                          </EuiFlexGroup>
-                          <EuiSpacer size="s" />
-                          <Switch>
-                            <Route
-                              path="/monitor/:monitorId/:location?"
-                              render={routerProps => (
-                                <MonitorPage
-                                  logMonitorPageLoad={logMonitorPageLoad}
-                                  query={client.query}
-                                  setBreadcrumbs={setBreadcrumbs}
-                                  {...routerProps}
-                                />
-                              )}
-                            />
-                            <Route
-                              path="/"
-                              render={routerProps => (
-                                <OverviewPage
-                                  autocomplete={autocomplete}
-                                  basePath={basePath}
-                                  logOverviewPageLoad={logOverviewPageLoad}
-                                  setBreadcrumbs={setBreadcrumbs}
-                                  {...routerProps}
+        <KibanaContextProvider services={{ ...core, ...plugins }}>
+          <Router basename={routerBasename}>
+            <Route
+              path="/"
+              render={(rootRouteProps: RouteComponentProps) => {
+                return (
+                  <ApolloProvider client={client}>
+                    <UptimeRefreshContext.Provider value={{ lastRefresh, ...rootRouteProps }}>
+                      <UptimeSettingsContext.Provider value={initializeSettingsContextValues()}>
+                        <EuiPage className="app-wrapper-panel " data-test-subj="uptimeApp">
+                          <main>
+                            <EuiFlexGroup
+                              alignItems="center"
+                              justifyContent="spaceBetween"
+                              gutterSize="s"
+                            >
+                              <EuiFlexItem>
+                                <EuiTitle>
+                                  <h1>{headingText}</h1>
+                                </EuiTitle>
+                              </EuiFlexItem>
+                              <EuiFlexItem grow={false}>
+                                <UptimeDatePicker
+                                  refreshApp={refreshApp}
+                                  commonlyUsedRanges={commonlyUsedRanges}
+                                  {...rootRouteProps}
                                 />
-                              )}
-                            />
-                            <Route component={NotFoundPage} />
-                          </Switch>
-                        </main>
-                      </EuiPage>
-                    </UptimeSettingsContext.Provider>
-                  </UptimeRefreshContext.Provider>
-                </ApolloProvider>
-              );
-            }}
-          />
-        </Router>
+                              </EuiFlexItem>
+                            </EuiFlexGroup>
+                            <EuiSpacer size="s" />
+                            <Switch>
+                              <Route
+                                path="/monitor/:monitorId/:location?"
+                                render={routerProps => (
+                                  <MonitorPage
+                                    query={client.query}
+                                    setBreadcrumbs={setBreadcrumbs}
+                                    {...routerProps}
+                                  />
+                                )}
+                              />
+                              <Route
+                                path="/"
+                                render={routerProps => (
+                                  <OverviewPage
+                                    autocomplete={plugins.data.autocomplete}
+                                    basePath={basePath}
+                                    setBreadcrumbs={setBreadcrumbs}
+                                    {...routerProps}
+                                  />
+                                )}
+                              />
+                              <Route component={NotFoundPage} />
+                            </Switch>
+                          </main>
+                        </EuiPage>
+                      </UptimeSettingsContext.Provider>
+                    </UptimeRefreshContext.Provider>
+                  </ApolloProvider>
+                );
+              }}
+            />
+          </Router>
+        </KibanaContextProvider>
       </ReduxProvider>
     </i18nCore.Context>
   );
diff --git a/x-pack/plugins/endpoint/server/config.test.ts b/x-pack/plugins/endpoint/server/config.test.ts
new file mode 100644
index 00000000000000..39f6bca2d43caa
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/config.test.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { EndpointConfigSchema, EndpointConfigType } from './config';
+
+describe('test config schema', () => {
+  it('test config defaults', () => {
+    const config: EndpointConfigType = EndpointConfigSchema.validate({});
+    expect(config.enabled).toEqual(false);
+    expect(config.endpointResultListDefaultPageSize).toEqual(10);
+    expect(config.endpointResultListDefaultFirstPageIndex).toEqual(0);
+  });
+});
diff --git a/x-pack/plugins/endpoint/server/config.ts b/x-pack/plugins/endpoint/server/config.ts
new file mode 100644
index 00000000000000..3f9a8a5508dd8d
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/config.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { schema, TypeOf } from '@kbn/config-schema';
+import { Observable } from 'rxjs';
+import { PluginInitializerContext } from 'kibana/server';
+
+export type EndpointConfigType = ReturnType<typeof createConfig$> extends Observable<infer P>
+  ? P
+  : ReturnType<typeof createConfig$>;
+
+export const EndpointConfigSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: false }),
+  endpointResultListDefaultFirstPageIndex: schema.number({ defaultValue: 0 }),
+  endpointResultListDefaultPageSize: schema.number({ defaultValue: 10 }),
+});
+
+export function createConfig$(context: PluginInitializerContext) {
+  return context.config.create<TypeOf<typeof EndpointConfigSchema>>();
+}
diff --git a/x-pack/plugins/endpoint/server/index.ts b/x-pack/plugins/endpoint/server/index.ts
index eec836141ea5e2..ae603b7e44449f 100644
--- a/x-pack/plugins/endpoint/server/index.ts
+++ b/x-pack/plugins/endpoint/server/index.ts
@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { schema } from '@kbn/config-schema';
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer, PluginInitializerContext } from 'src/core/server';
 import {
   EndpointPlugin,
   EndpointPluginStart,
@@ -13,9 +12,10 @@ import {
   EndpointPluginStartDependencies,
   EndpointPluginSetupDependencies,
 } from './plugin';
+import { EndpointConfigSchema } from './config';
 
 export const config = {
-  schema: schema.object({ enabled: schema.boolean({ defaultValue: false }) }),
+  schema: EndpointConfigSchema,
 };
 
 export const plugin: PluginInitializer<
@@ -23,4 +23,4 @@ export const plugin: PluginInitializer<
   EndpointPluginStart,
   EndpointPluginSetupDependencies,
   EndpointPluginStartDependencies
-> = () => new EndpointPlugin();
+> = (initializerContext: PluginInitializerContext) => new EndpointPlugin(initializerContext);
diff --git a/x-pack/plugins/endpoint/server/plugin.test.ts b/x-pack/plugins/endpoint/server/plugin.test.ts
new file mode 100644
index 00000000000000..87d373d3a4f34c
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/plugin.test.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { CoreSetup } from 'kibana/server';
+import { EndpointPlugin, EndpointPluginSetupDependencies } from './plugin';
+import { coreMock } from '../../../../src/core/server/mocks';
+import { PluginSetupContract } from '../../features/server';
+
+describe('test endpoint plugin', () => {
+  let plugin: EndpointPlugin;
+  let mockCoreSetup: MockedKeys<CoreSetup>;
+  let mockedEndpointPluginSetupDependencies: jest.Mocked<EndpointPluginSetupDependencies>;
+  let mockedPluginSetupContract: jest.Mocked<PluginSetupContract>;
+  beforeEach(() => {
+    plugin = new EndpointPlugin(
+      coreMock.createPluginInitializerContext({
+        cookieName: 'sid',
+        sessionTimeout: 1500,
+      })
+    );
+
+    mockCoreSetup = coreMock.createSetup();
+    mockedPluginSetupContract = {
+      registerFeature: jest.fn(),
+      getFeatures: jest.fn(),
+      getFeaturesUICapabilities: jest.fn(),
+      registerLegacyAPI: jest.fn(),
+    };
+    mockedEndpointPluginSetupDependencies = { features: mockedPluginSetupContract };
+  });
+
+  it('test properly setup plugin', async () => {
+    await plugin.setup(mockCoreSetup, mockedEndpointPluginSetupDependencies);
+    expect(mockedPluginSetupContract.registerFeature).toBeCalledTimes(1);
+    expect(mockCoreSetup.http.createRouter).toBeCalledTimes(1);
+  });
+});
diff --git a/x-pack/plugins/endpoint/server/plugin.ts b/x-pack/plugins/endpoint/server/plugin.ts
index b41dfee1f78fd6..7ed116ba211407 100644
--- a/x-pack/plugins/endpoint/server/plugin.ts
+++ b/x-pack/plugins/endpoint/server/plugin.ts
@@ -3,9 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup, PluginInitializerContext, Logger } from 'kibana/server';
+import { first } from 'rxjs/operators';
 import { addRoutes } from './routes';
 import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
+import { createConfig$, EndpointConfigType } from './config';
+import { EndpointAppContext } from './types';
+import { registerEndpointRoutes } from './routes/endpoints';
 
 export type EndpointPluginStart = void;
 export type EndpointPluginSetup = void;
@@ -23,6 +27,10 @@ export class EndpointPlugin
       EndpointPluginSetupDependencies,
       EndpointPluginStartDependencies
     > {
+  private readonly logger: Logger;
+  constructor(private readonly initializerContext: PluginInitializerContext) {
+    this.logger = this.initializerContext.logger.get('endpoint');
+  }
   public setup(core: CoreSetup, plugins: EndpointPluginSetupDependencies) {
     plugins.features.registerFeature({
       id: 'endpoint',
@@ -49,10 +57,23 @@ export class EndpointPlugin
         },
       },
     });
+    const endpointContext = {
+      logFactory: this.initializerContext.logger,
+      config: (): Promise<EndpointConfigType> => {
+        return createConfig$(this.initializerContext)
+          .pipe(first())
+          .toPromise();
+      },
+    } as EndpointAppContext;
     const router = core.http.createRouter();
     addRoutes(router);
+    registerEndpointRoutes(router, endpointContext);
   }
 
-  public start() {}
-  public stop() {}
+  public start() {
+    this.logger.debug('Starting plugin');
+  }
+  public stop() {
+    this.logger.debug('Stopping plugin');
+  }
 }
diff --git a/x-pack/plugins/endpoint/server/routes/endpoints.test.ts b/x-pack/plugins/endpoint/server/routes/endpoints.test.ts
new file mode 100644
index 00000000000000..60433f86b6f7ed
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/routes/endpoints.test.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import {
+  IClusterClient,
+  IRouter,
+  IScopedClusterClient,
+  KibanaResponseFactory,
+  RequestHandler,
+  RequestHandlerContext,
+  RouteConfig,
+} from 'kibana/server';
+import {
+  elasticsearchServiceMock,
+  httpServerMock,
+  httpServiceMock,
+  loggingServiceMock,
+} from '../../../../../src/core/server/mocks';
+import { EndpointData } from '../types';
+import { SearchResponse } from 'elasticsearch';
+import { EndpointResultList, registerEndpointRoutes } from './endpoints';
+import { EndpointConfigSchema } from '../config';
+import * as data from '../test_data/all_endpoints_data.json';
+
+describe('test endpoint route', () => {
+  let routerMock: jest.Mocked<IRouter>;
+  let mockResponse: jest.Mocked<KibanaResponseFactory>;
+  let mockClusterClient: jest.Mocked<IClusterClient>;
+  let mockScopedClient: jest.Mocked<IScopedClusterClient>;
+  let routeHandler: RequestHandler<any, any, any>;
+  let routeConfig: RouteConfig<any, any, any, any>;
+
+  beforeEach(() => {
+    mockClusterClient = elasticsearchServiceMock.createClusterClient() as jest.Mocked<
+      IClusterClient
+    >;
+    mockScopedClient = elasticsearchServiceMock.createScopedClusterClient();
+    mockClusterClient.asScoped.mockReturnValue(mockScopedClient);
+    routerMock = httpServiceMock.createRouter();
+    mockResponse = httpServerMock.createResponseFactory();
+    registerEndpointRoutes(routerMock, {
+      logFactory: loggingServiceMock.create(),
+      config: () => Promise.resolve(EndpointConfigSchema.validate({})),
+    });
+  });
+
+  it('test find the latest of all endpoints', async () => {
+    const mockRequest = httpServerMock.createKibanaRequest({});
+
+    const response: SearchResponse<EndpointData> = (data as unknown) as SearchResponse<
+      EndpointData
+    >;
+    mockScopedClient.callAsCurrentUser.mockImplementationOnce(() => Promise.resolve(response));
+    [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
+      path.startsWith('/api/endpoint/endpoints')
+    )!;
+
+    await routeHandler(
+      ({
+        core: {
+          elasticsearch: {
+            dataClient: mockScopedClient,
+          },
+        },
+      } as unknown) as RequestHandlerContext,
+      mockRequest,
+      mockResponse
+    );
+
+    expect(mockScopedClient.callAsCurrentUser).toBeCalled();
+    expect(routeConfig.options).toEqual({ authRequired: true });
+    expect(mockResponse.ok).toBeCalled();
+    const endpointResultList = mockResponse.ok.mock.calls[0][0]?.body as EndpointResultList;
+    expect(endpointResultList.endpoints.length).toEqual(3);
+    expect(endpointResultList.total).toEqual(3);
+    expect(endpointResultList.request_index).toEqual(0);
+    expect(endpointResultList.request_page_size).toEqual(10);
+  });
+
+  it('test find the latest of all endpoints with params', async () => {
+    const mockRequest = httpServerMock.createKibanaRequest({
+      body: {
+        paging_properties: [
+          {
+            page_size: 10,
+          },
+          {
+            page_index: 1,
+          },
+        ],
+      },
+    });
+    mockScopedClient.callAsCurrentUser.mockImplementationOnce(() =>
+      Promise.resolve((data as unknown) as SearchResponse<EndpointData>)
+    );
+    [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
+      path.startsWith('/api/endpoint/endpoints')
+    )!;
+
+    await routeHandler(
+      ({
+        core: {
+          elasticsearch: {
+            dataClient: mockScopedClient,
+          },
+        },
+      } as unknown) as RequestHandlerContext,
+      mockRequest,
+      mockResponse
+    );
+
+    expect(mockScopedClient.callAsCurrentUser).toBeCalled();
+    expect(routeConfig.options).toEqual({ authRequired: true });
+    expect(mockResponse.ok).toBeCalled();
+    const endpointResultList = mockResponse.ok.mock.calls[0][0]?.body as EndpointResultList;
+    expect(endpointResultList.endpoints.length).toEqual(3);
+    expect(endpointResultList.total).toEqual(3);
+    expect(endpointResultList.request_index).toEqual(10);
+    expect(endpointResultList.request_page_size).toEqual(10);
+  });
+});
diff --git a/x-pack/plugins/endpoint/server/routes/endpoints.ts b/x-pack/plugins/endpoint/server/routes/endpoints.ts
new file mode 100644
index 00000000000000..59430947d97da7
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/routes/endpoints.ts
@@ -0,0 +1,87 @@
+/*
+ * 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 { IRouter } from 'kibana/server';
+import { SearchResponse } from 'elasticsearch';
+import { schema } from '@kbn/config-schema';
+import { EndpointAppContext, EndpointData } from '../types';
+import { kibanaRequestToEndpointListQuery } from '../services/endpoint/endpoint_query_builders';
+
+interface HitSource {
+  _source: EndpointData;
+}
+
+export interface EndpointResultList {
+  // the endpoint restricted by the page size
+  endpoints: EndpointData[];
+  // the total number of unique endpoints in the index
+  total: number;
+  // the page size requested
+  request_page_size: number;
+  // the index requested
+  request_index: number;
+}
+
+export function registerEndpointRoutes(router: IRouter, endpointAppContext: EndpointAppContext) {
+  router.post(
+    {
+      path: '/api/endpoint/endpoints',
+      validate: {
+        body: schema.nullable(
+          schema.object({
+            paging_properties: schema.arrayOf(
+              schema.oneOf([
+                // the number of results to return for this request per page
+                schema.object({
+                  page_size: schema.number({ defaultValue: 10, min: 1, max: 10000 }),
+                }),
+                // the index of the page to return
+                schema.object({ page_index: schema.number({ defaultValue: 0, min: 0 }) }),
+              ])
+            ),
+          })
+        ),
+      },
+      options: { authRequired: true },
+    },
+    async (context, req, res) => {
+      try {
+        const queryParams = await kibanaRequestToEndpointListQuery(req, endpointAppContext);
+        const response = (await context.core.elasticsearch.dataClient.callAsCurrentUser(
+          'search',
+          queryParams
+        )) as SearchResponse<EndpointData>;
+        return res.ok({ body: mapToEndpointResultList(queryParams, response) });
+      } catch (err) {
+        return res.internalError({ body: err });
+      }
+    }
+  );
+}
+
+function mapToEndpointResultList(
+  queryParams: Record<string, any>,
+  searchResponse: SearchResponse<EndpointData>
+): EndpointResultList {
+  if (searchResponse.hits.hits.length > 0) {
+    return {
+      request_page_size: queryParams.size,
+      request_index: queryParams.from,
+      endpoints: searchResponse.hits.hits
+        .map(response => response.inner_hits.most_recent.hits.hits)
+        .flatMap(data => data as HitSource)
+        .map(entry => entry._source),
+      total: searchResponse.aggregations.total.value,
+    };
+  } else {
+    return {
+      request_page_size: queryParams.size,
+      request_index: queryParams.from,
+      total: 0,
+      endpoints: [],
+    };
+  }
+}
diff --git a/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts
new file mode 100644
index 00000000000000..2a8cecec16526b
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { httpServerMock, loggingServiceMock } from '../../../../../../src/core/server/mocks';
+import { EndpointConfigSchema } from '../../config';
+import { kibanaRequestToEndpointListQuery } from './endpoint_query_builders';
+
+describe('test query builder', () => {
+  describe('test query builder request processing', () => {
+    it('test default query params for all endpoints when no params or body is provided', async () => {
+      const mockRequest = httpServerMock.createKibanaRequest({
+        body: {},
+      });
+      const query = await kibanaRequestToEndpointListQuery(mockRequest, {
+        logFactory: loggingServiceMock.create(),
+        config: () => Promise.resolve(EndpointConfigSchema.validate({})),
+      });
+      expect(query).toEqual({
+        body: {
+          query: {
+            match_all: {},
+          },
+          collapse: {
+            field: 'machine_id',
+            inner_hits: {
+              name: 'most_recent',
+              size: 1,
+              sort: [{ created_at: 'desc' }],
+            },
+          },
+          aggs: {
+            total: {
+              cardinality: {
+                field: 'machine_id',
+              },
+            },
+          },
+          sort: [
+            {
+              created_at: {
+                order: 'desc',
+              },
+            },
+          ],
+        },
+        from: 0,
+        size: 10,
+        index: 'endpoint-agent*',
+      } as Record<string, any>);
+    });
+  });
+});
diff --git a/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts
new file mode 100644
index 00000000000000..7430ba97216083
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts
@@ -0,0 +1,66 @@
+/*
+ * 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 { KibanaRequest } from 'kibana/server';
+import { EndpointAppConstants, EndpointAppContext } from '../../types';
+
+export const kibanaRequestToEndpointListQuery = async (
+  request: KibanaRequest<any, any, any>,
+  endpointAppContext: EndpointAppContext
+): Promise<Record<string, any>> => {
+  const pagingProperties = await getPagingProperties(request, endpointAppContext);
+  return {
+    body: {
+      query: {
+        match_all: {},
+      },
+      collapse: {
+        field: 'machine_id',
+        inner_hits: {
+          name: 'most_recent',
+          size: 1,
+          sort: [{ created_at: 'desc' }],
+        },
+      },
+      aggs: {
+        total: {
+          cardinality: {
+            field: 'machine_id',
+          },
+        },
+      },
+      sort: [
+        {
+          created_at: {
+            order: 'desc',
+          },
+        },
+      ],
+    },
+    from: pagingProperties.pageIndex * pagingProperties.pageSize,
+    size: pagingProperties.pageSize,
+    index: EndpointAppConstants.ENDPOINT_INDEX_NAME,
+  };
+};
+
+async function getPagingProperties(
+  request: KibanaRequest<any, any, any>,
+  endpointAppContext: EndpointAppContext
+) {
+  const config = await endpointAppContext.config();
+  const pagingProperties: { page_size?: number; page_index?: number } = {};
+  if (request?.body?.paging_properties) {
+    for (const property of request.body.paging_properties) {
+      Object.assign(
+        pagingProperties,
+        ...Object.keys(property).map(key => ({ [key]: property[key] }))
+      );
+    }
+  }
+  return {
+    pageSize: pagingProperties.page_size || config.endpointResultListDefaultPageSize,
+    pageIndex: pagingProperties.page_index || config.endpointResultListDefaultFirstPageIndex,
+  };
+}
diff --git a/x-pack/plugins/endpoint/server/test_data/all_endpoints_data.json b/x-pack/plugins/endpoint/server/test_data/all_endpoints_data.json
new file mode 100644
index 00000000000000..d505b2c929828c
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/test_data/all_endpoints_data.json
@@ -0,0 +1,348 @@
+{
+  "took": 3,
+  "timed_out": false,
+  "_shards": {
+    "total": 1,
+    "successful": 1,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": {
+      "value": 9,
+      "relation": "eq"
+    },
+    "max_score": null,
+    "hits": [
+      {
+        "_index": "endpoint-agent",
+        "_id": "UV_6SG8B9c_DH2QsbOZd",
+        "_score": null,
+        "_source": {
+          "machine_id": "606267a9-2e51-42b4-956e-6cc7812e3447",
+          "created_at": "2019-12-27T20:09:28.377Z",
+          "host": {
+            "name": "natalee-2",
+            "hostname": "natalee-2.example.com",
+            "ip": "10.5.220.127",
+            "mac_address": "17-5f-c9-f8-ca-d6",
+            "os": {
+              "name": "windows 6.3",
+              "full": "Windows Server 2012R2"
+            }
+          },
+          "endpoint": {
+            "domain": "example.com",
+            "is_base_image": false,
+            "active_directory_distinguished_name": "CN=natalee-2,DC=example,DC=com",
+            "active_directory_hostname": "natalee-2.example.com",
+            "upgrade": {
+              "status": null,
+              "updated_at": null
+            },
+            "isolation": {
+              "status": false,
+              "request_status": null,
+              "updated_at": null
+            },
+            "policy": {
+              "name": "With Eventing",
+              "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A"
+            },
+            "sensor": {
+              "persistence": true,
+              "status": {}
+            }
+          }
+        },
+        "fields": {
+          "machine_id": [
+            "606267a9-2e51-42b4-956e-6cc7812e3447"
+          ]
+        },
+        "sort": [
+          1577477368377
+        ],
+        "inner_hits": {
+          "most_recent": {
+            "hits": {
+              "total": {
+                "value": 3,
+                "relation": "eq"
+              },
+              "max_score": null,
+              "hits": [
+                {
+                  "_index": "endpoint-agent",
+                  "_id": "UV_6SG8B9c_DH2QsbOZd",
+                  "_score": null,
+                  "_source": {
+                    "machine_id": "606267a9-2e51-42b4-956e-6cc7812e3447",
+                    "created_at": "2019-12-27T20:09:28.377Z",
+                    "host": {
+                      "name": "natalee-2",
+                      "hostname": "natalee-2.example.com",
+                      "ip": "10.5.220.127",
+                      "mac_address": "17-5f-c9-f8-ca-d6",
+                      "os": {
+                        "name": "windows 6.3",
+                        "full": "Windows Server 2012R2"
+                      }
+                    },
+                    "endpoint": {
+                      "domain": "example.com",
+                      "is_base_image": false,
+                      "active_directory_distinguished_name": "CN=natalee-2,DC=example,DC=com",
+                      "active_directory_hostname": "natalee-2.example.com",
+                      "upgrade": {
+                        "status": null,
+                        "updated_at": null
+                      },
+                      "isolation": {
+                        "status": false,
+                        "request_status": null,
+                        "updated_at": null
+                      },
+                      "policy": {
+                        "name": "With Eventing",
+                        "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A"
+                      },
+                      "sensor": {
+                        "persistence": true,
+                        "status": {}
+                      }
+                    }
+                  },
+                  "sort": [
+                    1577477368377
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      },
+      {
+        "_index": "endpoint-agent",
+        "_id": "Ul_6SG8B9c_DH2QsbOZd",
+        "_score": null,
+        "_source": {
+          "machine_id": "8ec625e1-a80c-4c9f-bdfd-496060aa6310",
+          "created_at": "2019-12-27T20:09:28.377Z",
+          "host": {
+            "name": "luttrell-2",
+            "hostname": "luttrell-2.example.com",
+            "ip": "10.246.84.193",
+            "mac_address": "dc-d-88-14-c3-c6",
+            "os": {
+              "name": "windows 6.3",
+              "full": "Windows Server 2012R2"
+            }
+          },
+          "endpoint": {
+            "domain": "example.com",
+            "is_base_image": false,
+            "active_directory_distinguished_name": "CN=luttrell-2,DC=example,DC=com",
+            "active_directory_hostname": "luttrell-2.example.com",
+            "upgrade": {
+              "status": null,
+              "updated_at": null
+            },
+            "isolation": {
+              "status": false,
+              "request_status": null,
+              "updated_at": null
+            },
+            "policy": {
+              "name": "Default",
+              "id": "00000000-0000-0000-0000-000000000000"
+            },
+            "sensor": {
+              "persistence": true,
+              "status": {}
+            }
+          }
+        },
+        "fields": {
+          "machine_id": [
+            "8ec625e1-a80c-4c9f-bdfd-496060aa6310"
+          ]
+        },
+        "sort": [
+          1577477368377
+        ],
+        "inner_hits": {
+          "most_recent": {
+            "hits": {
+              "total": {
+                "value": 3,
+                "relation": "eq"
+              },
+              "max_score": null,
+              "hits": [
+                {
+                  "_index": "endpoint-agent",
+                  "_id": "Ul_6SG8B9c_DH2QsbOZd",
+                  "_score": null,
+                  "_source": {
+                    "machine_id": "8ec625e1-a80c-4c9f-bdfd-496060aa6310",
+                    "created_at": "2019-12-27T20:09:28.377Z",
+                    "host": {
+                      "name": "luttrell-2",
+                      "hostname": "luttrell-2.example.com",
+                      "ip": "10.246.84.193",
+                      "mac_address": "dc-d-88-14-c3-c6",
+                      "os": {
+                        "name": "windows 6.3",
+                        "full": "Windows Server 2012R2"
+                      }
+                    },
+                    "endpoint": {
+                      "domain": "example.com",
+                      "is_base_image": false,
+                      "active_directory_distinguished_name": "CN=luttrell-2,DC=example,DC=com",
+                      "active_directory_hostname": "luttrell-2.example.com",
+                      "upgrade": {
+                        "status": null,
+                        "updated_at": null
+                      },
+                      "isolation": {
+                        "status": false,
+                        "request_status": null,
+                        "updated_at": null
+                      },
+                      "policy": {
+                        "name": "Default",
+                        "id": "00000000-0000-0000-0000-000000000000"
+                      },
+                      "sensor": {
+                        "persistence": true,
+                        "status": {}
+                      }
+                    }
+                  },
+                  "sort": [
+                    1577477368377
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      },
+      {
+        "_index": "endpoint-agent",
+        "_id": "U1_6SG8B9c_DH2QsbOZd",
+        "_score": null,
+        "_source": {
+          "machine_id": "853a308c-6e6d-4b92-a32b-2f623b6c8cf4",
+          "created_at": "2019-12-27T20:09:28.377Z",
+          "host": {
+            "name": "akeylah-7",
+            "hostname": "akeylah-7.example.com",
+            "ip": "10.252.242.44",
+            "mac_address": "27-b9-51-21-31-a",
+            "os": {
+              "name": "windows 6.3",
+              "full": "Windows Server 2012R2"
+            }
+          },
+          "endpoint": {
+            "domain": "example.com",
+            "is_base_image": false,
+            "active_directory_distinguished_name": "CN=akeylah-7,DC=example,DC=com",
+            "active_directory_hostname": "akeylah-7.example.com",
+            "upgrade": {
+              "status": null,
+              "updated_at": null
+            },
+            "isolation": {
+              "status": false,
+              "request_status": null,
+              "updated_at": null
+            },
+            "policy": {
+              "name": "With Eventing",
+              "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A"
+            },
+            "sensor": {
+              "persistence": true,
+              "status": {}
+            }
+          }
+        },
+        "fields": {
+          "machine_id": [
+            "853a308c-6e6d-4b92-a32b-2f623b6c8cf4"
+          ]
+        },
+        "sort": [
+          1577477368377
+        ],
+        "inner_hits": {
+          "most_recent": {
+            "hits": {
+              "total": {
+                "value": 3,
+                "relation": "eq"
+              },
+              "max_score": null,
+              "hits": [
+                {
+                  "_index": "endpoint-agent",
+                  "_id": "U1_6SG8B9c_DH2QsbOZd",
+                  "_score": null,
+                  "_source": {
+                    "machine_id": "853a308c-6e6d-4b92-a32b-2f623b6c8cf4",
+                    "created_at": "2019-12-27T20:09:28.377Z",
+                    "host": {
+                      "name": "akeylah-7",
+                      "hostname": "akeylah-7.example.com",
+                      "ip": "10.252.242.44",
+                      "mac_address": "27-b9-51-21-31-a",
+                      "os": {
+                        "name": "windows 6.3",
+                        "full": "Windows Server 2012R2"
+                      }
+                    },
+                    "endpoint": {
+                      "domain": "example.com",
+                      "is_base_image": false,
+                      "active_directory_distinguished_name": "CN=akeylah-7,DC=example,DC=com",
+                      "active_directory_hostname": "akeylah-7.example.com",
+                      "upgrade": {
+                        "status": null,
+                        "updated_at": null
+                      },
+                      "isolation": {
+                        "status": false,
+                        "request_status": null,
+                        "updated_at": null
+                      },
+                      "policy": {
+                        "name": "With Eventing",
+                        "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A"
+                      },
+                      "sensor": {
+                        "persistence": true,
+                        "status": {}
+                      }
+                    }
+                  },
+                  "sort": [
+                    1577477368377
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  "aggregations": {
+    "total": {
+      "value": 3
+    }
+  }
+}
diff --git a/x-pack/plugins/endpoint/server/types.ts b/x-pack/plugins/endpoint/server/types.ts
new file mode 100644
index 00000000000000..c6d0e3dea70cf7
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/types.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { LoggerFactory } from 'kibana/server';
+import { EndpointConfigType } from './config';
+
+export interface EndpointAppContext {
+  logFactory: LoggerFactory;
+  config(): Promise<EndpointConfigType>;
+}
+
+export class EndpointAppConstants {
+  static ENDPOINT_INDEX_NAME = 'endpoint-agent*';
+}
+
+export interface EndpointData {
+  machine_id: string;
+  created_at: Date;
+  host: {
+    name: string;
+    hostname: string;
+    ip: string;
+    mac_address: string;
+    os: {
+      name: string;
+      full: string;
+    };
+  };
+  endpoint: {
+    domain: string;
+    is_base_image: boolean;
+    active_directory_distinguished_name: string;
+    active_directory_hostname: string;
+    upgrade: {
+      status?: string;
+      updated_at?: Date;
+    };
+    isolation: {
+      status: boolean;
+      request_status?: string | boolean;
+      updated_at?: Date;
+    };
+    policy: {
+      name: string;
+      id: string;
+    };
+    sensor: {
+      persistence: boolean;
+      status: object;
+    };
+  };
+}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 83ef497e50649a..09d71814e5bf09 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1850,6 +1850,25 @@
     "kbn.discover.discoverDescription": "ドキュメントにクエリをかけたりフィルターを適用することで、データをインタラクティブに閲覧できます。",
     "kbn.discover.discoverTitle": "ディスカバー",
     "kbn.discover.documentsAriaLabel": "ドキュメント",
+    "kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip": "{underscoreSign} で始まるフィールド名はサポートされていません",
+    "kbn.discover.docViews.table.filterForFieldPresentButtonAriaLabel": "現在のフィールドのフィルター",
+    "kbn.discover.docViews.table.filterForFieldPresentButtonTooltip": "現在のフィールドのフィルター",
+    "kbn.discover.docViews.table.filterForValueButtonAriaLabel": "値でフィルタリング",
+    "kbn.discover.docViews.table.filterForValueButtonTooltip": "値でフィルタリング",
+    "kbn.discover.docViews.table.filterOutValueButtonAriaLabel": "値を除外",
+    "kbn.discover.docViews.table.filterOutValueButtonTooltip": "値を除外します",
+    "kbn.discover.docViews.table.noCachedMappingForThisFieldTooltip": "このフィールドのキャッシュされたマッピングがありません。管理 > インデックスパターンページからフィールドリストを更新してください",
+    "kbn.discover.docViews.table.tableTitle": "表",
+    "kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel": "表の列を切り替える",
+    "kbn.discover.docViews.table.toggleColumnInTableButtonTooltip": "表の列を切り替える",
+    "kbn.discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "メタフィールドの有無でフィルタリングできません",
+    "kbn.discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "スクリプトフィールドの有無でフィルタリングできません",
+    "kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip": "インデックスされていないフィールドは検索できません",
+    "kbn.discover.docViews.json.codeEditorAriaLabel": "Elasticsearch ドキュメントの JSON ビューのみを読み込む",
+    "kbn.discover.docViews.json.jsonTitle": "JSON",
+    "kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel": "警告",
+    "kbn.discover.docViews.table.noCachedMappingForThisFieldAriaLabel": "警告",
+    "kbn.discover.docViews.table.toggleFieldDetails": "フィールド詳細を切り替える",
     "kbn.discover.errorLoadingData": "データの読み込み中にエラーが発生",
     "kbn.discover.fetchError.howToAddressErrorDescription": "このエラーは、{scriptedFields} タブにある {managementLink} の {fetchErrorScript} フィールドを編集することで解決できます。",
     "kbn.discover.fetchError.managmentLinkText": "管理 > インデックスパターン",
@@ -2834,25 +2853,6 @@
     "kbn.advancedSettings.courier.batchSearchesText": "無効の場合、ダッシュボードパネルは個々に読み込まれ、検索リクエストはユーザーが移動するか\n           クエリを更新すると停止します。有効の場合、ダッシュボードパネルはすべてのデータが読み込まれると同時に読み込まれ、\n           検索は停止しません。",
     "kbn.doc.couldNotFindDocumentsDescription": "その ID に一致するドキュメントがありません。",
     "kbn.doc.somethingWentWrongDescription": "{indexName} が欠けています。",
-    "kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip": "{underscoreSign} で始まるフィールド名はサポートされていません",
-    "kbnDocViews.table.filterForFieldPresentButtonAriaLabel": "現在のフィールドのフィルター",
-    "kbnDocViews.table.filterForFieldPresentButtonTooltip": "現在のフィールドのフィルター",
-    "kbnDocViews.table.filterForValueButtonAriaLabel": "値でフィルタリング",
-    "kbnDocViews.table.filterForValueButtonTooltip": "値でフィルタリング",
-    "kbnDocViews.table.filterOutValueButtonAriaLabel": "値を除外",
-    "kbnDocViews.table.filterOutValueButtonTooltip": "値を除外します",
-    "kbnDocViews.table.noCachedMappingForThisFieldTooltip": "このフィールドのキャッシュされたマッピングがありません。管理 > インデックスパターンページからフィールドリストを更新してください",
-    "kbnDocViews.table.tableTitle": "表",
-    "kbnDocViews.table.toggleColumnInTableButtonAriaLabel": "表の列を切り替える",
-    "kbnDocViews.table.toggleColumnInTableButtonTooltip": "表の列を切り替える",
-    "kbnDocViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "メタフィールドの有無でフィルタリングできません",
-    "kbnDocViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "スクリプトフィールドの有無でフィルタリングできません",
-    "kbnDocViews.table.unindexedFieldsCanNotBeSearchedTooltip": "インデックスされていないフィールドは検索できません",
-    "kbnDocViews.json.codeEditorAriaLabel": "Elasticsearch ドキュメントの JSON ビューのみを読み込む",
-    "kbnDocViews.json.jsonTitle": "JSON",
-    "kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel": "警告",
-    "kbnDocViews.table.noCachedMappingForThisFieldAriaLabel": "警告",
-    "kbnDocViews.table.toggleFieldDetails": "フィールド詳細を切り替える",
     "kbnVislibVisTypes.area.areaDescription": "折れ線グラフの下の数量を強調します。",
     "kbnVislibVisTypes.area.areaTitle": "エリア",
     "kbnVislibVisTypes.area.groupTitle": "系列を分割",
@@ -6588,8 +6588,6 @@
     "xpack.maps.source.wmsTitle": "ウェブマップサービス",
     "xpack.maps.style.heatmap.displayNameLabel": "ヒートマップスタイル",
     "xpack.maps.style.heatmap.resolutionStyleErrorMessage": "解像度パラメーターが認識されません: {resolution}",
-    "xpack.maps.styles.staticDynamic.dynamicDescription": "プロパティ値で特徴をシンボル化します。",
-    "xpack.maps.styles.staticDynamic.staticDescription": "静的スタイルプロパティで特徴をシンボル化します。",
     "xpack.maps.styles.vector.borderColorLabel": "境界線の色",
     "xpack.maps.styles.vector.borderWidthLabel": "境界線の幅",
     "xpack.maps.styles.vector.fillColorLabel": "塗りつぶす色",
@@ -12704,4 +12702,4 @@
     "xpack.licensing.welcomeBanner.licenseIsExpiredDescription.updateYourLicenseLinkText": "ライセンスを更新",
     "xpack.licensing.welcomeBanner.licenseIsExpiredTitle": "ご使用の {licenseType} ライセンスは期限切れです"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 87c11adcb5e777..e221cba874bcdb 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1851,6 +1851,25 @@
     "kbn.discover.discoverDescription": "通过查询和筛选原始文档来以交互方式浏览您的数据。",
     "kbn.discover.discoverTitle": "Discover",
     "kbn.discover.documentsAriaLabel": "文档",
+    "kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip": "不支持以 {underscoreSign} 开头的字段名称",
+    "kbn.discover.docViews.table.filterForFieldPresentButtonAriaLabel": "筛留存在的字段",
+    "kbn.discover.docViews.table.filterForFieldPresentButtonTooltip": "筛留存在的字段",
+    "kbn.discover.docViews.table.filterForValueButtonAriaLabel": "筛留值",
+    "kbn.discover.docViews.table.filterForValueButtonTooltip": "筛留值",
+    "kbn.discover.docViews.table.filterOutValueButtonAriaLabel": "筛除值",
+    "kbn.discover.docViews.table.filterOutValueButtonTooltip": "筛除值",
+    "kbn.discover.docViews.table.noCachedMappingForThisFieldTooltip": "此字段没有任何已缓存映射。从“管理”>“索引模式”页面刷新字段列表",
+    "kbn.discover.docViews.table.tableTitle": "表",
+    "kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel": "在表中切换列",
+    "kbn.discover.docViews.table.toggleColumnInTableButtonTooltip": "在表中切换列",
+    "kbn.discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "无法筛留元数据字段",
+    "kbn.discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "无法筛留脚本字段",
+    "kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip": "无法搜索未索引字段",
+    "kbn.discover.docViews.json.codeEditorAriaLabel": "Elasticsearch 文档的只读 JSON 视图",
+    "kbn.discover.docViews.json.jsonTitle": "JSON",
+    "kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel": "警告",
+    "kbn.discover.docViews.table.noCachedMappingForThisFieldAriaLabel": "警告",
+    "kbn.discover.docViews.table.toggleFieldDetails": "切换字段详细信息",
     "kbn.discover.errorLoadingData": "加载数据时出错",
     "kbn.discover.fetchError.howToAddressErrorDescription": "您可以通过编辑 “{scriptedFields}” 选项卡下 “{managementLink}” 中的 “{fetchErrorScript}” 字段来解决此错误。",
     "kbn.discover.fetchError.managmentLinkText": "管理 > 索引模式",
@@ -2835,25 +2854,6 @@
     "kbn.advancedSettings.courier.batchSearchesText": "禁用时，仪表板面板将分别加载，用户离开时或更新查询时，\n           搜索请求将终止。启用时，仪表板面板将一起加载并加载所有数据，\n           搜索将不会终止。",
     "kbn.doc.couldNotFindDocumentsDescription": "无文档匹配该 ID。",
     "kbn.doc.somethingWentWrongDescription": "{indexName} 缺失。",
-    "kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip": "不支持以 {underscoreSign} 开头的字段名称",
-    "kbnDocViews.table.filterForFieldPresentButtonAriaLabel": "筛留存在的字段",
-    "kbnDocViews.table.filterForFieldPresentButtonTooltip": "筛留存在的字段",
-    "kbnDocViews.table.filterForValueButtonAriaLabel": "筛留值",
-    "kbnDocViews.table.filterForValueButtonTooltip": "筛留值",
-    "kbnDocViews.table.filterOutValueButtonAriaLabel": "筛除值",
-    "kbnDocViews.table.filterOutValueButtonTooltip": "筛除值",
-    "kbnDocViews.table.noCachedMappingForThisFieldTooltip": "此字段没有任何已缓存映射。从“管理”>“索引模式”页面刷新字段列表",
-    "kbnDocViews.table.tableTitle": "表",
-    "kbnDocViews.table.toggleColumnInTableButtonAriaLabel": "在表中切换列",
-    "kbnDocViews.table.toggleColumnInTableButtonTooltip": "在表中切换列",
-    "kbnDocViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "无法筛留元数据字段",
-    "kbnDocViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "无法筛留脚本字段",
-    "kbnDocViews.table.unindexedFieldsCanNotBeSearchedTooltip": "无法搜索未索引字段",
-    "kbnDocViews.json.codeEditorAriaLabel": "Elasticsearch 文档的只读 JSON 视图",
-    "kbnDocViews.json.jsonTitle": "JSON",
-    "kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel": "警告",
-    "kbnDocViews.table.noCachedMappingForThisFieldAriaLabel": "警告",
-    "kbnDocViews.table.toggleFieldDetails": "切换字段详细信息",
     "kbnVislibVisTypes.area.areaDescription": "突出折线图下方的数量",
     "kbnVislibVisTypes.area.areaTitle": "面积图",
     "kbnVislibVisTypes.area.groupTitle": "拆分序列",
@@ -6590,8 +6590,6 @@
     "xpack.maps.source.wmsTitle": "Web 地图服务",
     "xpack.maps.style.heatmap.displayNameLabel": "热图样式",
     "xpack.maps.style.heatmap.resolutionStyleErrorMessage": "无法识别分辨率参数：{resolution}",
-    "xpack.maps.styles.staticDynamic.dynamicDescription": "使用属性值代表功能。",
-    "xpack.maps.styles.staticDynamic.staticDescription": "使用静态样式属性代表功能。",
     "xpack.maps.styles.vector.borderColorLabel": "边框颜色",
     "xpack.maps.styles.vector.borderWidthLabel": "边框宽度",
     "xpack.maps.styles.vector.fillColorLabel": "填充颜色",
@@ -12793,4 +12791,4 @@
     "xpack.licensing.welcomeBanner.licenseIsExpiredDescription.updateYourLicenseLinkText": "更新您的许可",
     "xpack.licensing.welcomeBanner.licenseIsExpiredTitle": "您的{licenseType}许可已过期"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts b/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
index 487f396d7a3dca..c47649544f9a76 100644
--- a/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
@@ -17,7 +17,7 @@ export interface AlertUtilsOpts {
   objectRemover?: ObjectRemover;
 }
 
-export interface CreateAlwaysFiringActionOpts {
+export interface CreateAlertWithActionOpts {
   indexRecordActionId?: string;
   objectRemover?: ObjectRemover;
   overwrites?: Record<string, any>;
@@ -159,7 +159,7 @@ export class AlertUtils {
     overwrites = {},
     indexRecordActionId,
     reference,
-  }: CreateAlwaysFiringActionOpts) {
+  }: CreateAlertWithActionOpts) {
     const objRemover = objectRemover || this.objectRemover;
     const actionId = indexRecordActionId || this.indexRecordActionId;
 
@@ -207,4 +207,47 @@ export class AlertUtils {
     }
     return response;
   }
+
+  public async createAlwaysFailingAction({
+    objectRemover,
+    overwrites = {},
+    indexRecordActionId,
+    reference,
+  }: CreateAlertWithActionOpts) {
+    const objRemover = objectRemover || this.objectRemover;
+    const actionId = indexRecordActionId || this.indexRecordActionId;
+
+    if (!objRemover) {
+      throw new Error('objectRemover is required');
+    }
+    if (!actionId) {
+      throw new Error('indexRecordActionId is required ');
+    }
+
+    let request = this.supertestWithoutAuth
+      .post(`${getUrlPrefix(this.space.id)}/api/alert`)
+      .set('kbn-xsrf', 'foo');
+    if (this.user) {
+      request = request.auth(this.user.username, this.user.password);
+    }
+    const response = await request.send({
+      enabled: true,
+      name: 'fail',
+      schedule: { interval: '30s' },
+      throttle: '30s',
+      tags: [],
+      alertTypeId: 'test.failing',
+      consumer: 'bar',
+      params: {
+        index: ES_TEST_INDEX_NAME,
+        reference,
+      },
+      actions: [],
+      ...overwrites,
+    });
+    if (response.statusCode === 200) {
+      objRemover.add(this.space.id, response.body.id, 'alert');
+    }
+    return response;
+  }
 }
diff --git a/x-pack/test/alerting_api_integration/common/lib/index.ts b/x-pack/test/alerting_api_integration/common/lib/index.ts
index a2f21264634f83..c1e59664f9ce2e 100644
--- a/x-pack/test/alerting_api_integration/common/lib/index.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/index.ts
@@ -10,4 +10,5 @@ export { ES_TEST_INDEX_NAME, ESTestIndexTool } from './es_test_index_tool';
 export { getTestAlertData } from './get_test_alert_data';
 export { AlertUtils } from './alert_utils';
 export { TaskManagerUtils } from './task_manager_utils';
+export * from './test_assertions';
 export { checkAAD } from './check_aad';
diff --git a/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts b/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts
new file mode 100644
index 00000000000000..9495dd4cfae82a
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+
+export function ensureDatetimeIsWithinRange(
+  date: number,
+  expectedDiff: number,
+  buffer: number = 10000
+) {
+  const diff = date - Date.now();
+  expect(diff).to.be.greaterThan(expectedDiff - buffer);
+  expect(diff).to.be.lessThan(expectedDiff + buffer);
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
index e89b54b1caa554..2a7e0b22038248 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
@@ -7,7 +7,13 @@
 import expect from '@kbn/expect';
 import { Response as SupertestResponse } from 'supertest';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { checkAAD, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
+import {
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+  ensureDatetimeIsWithinRange,
+} from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -406,10 +412,3 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
     }
   });
 }
-
-function ensureDatetimeIsWithinRange(scheduledRunTime: number, expectedDiff: number) {
-  const buffer = 10000;
-  const diff = scheduledRunTime - Date.now();
-  expect(diff).to.be.greaterThan(expectedDiff - buffer);
-  expect(diff).to.be.lessThan(expectedDiff + buffer);
-}
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts
index 03e973194b4e2c..032fee15882cf8 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts
@@ -5,6 +5,7 @@
  */
 
 import expect from '@kbn/expect';
+import { Response as SupertestResponse } from 'supertest';
 import { Spaces } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -14,6 +15,7 @@ import {
   getTestAlertData,
   ObjectRemover,
   AlertUtils,
+  ensureDatetimeIsWithinRange,
 } from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
@@ -23,6 +25,13 @@ export default function alertTests({ getService }: FtrProviderContext) {
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
+  function getAlertingTaskById(taskId: string) {
+    return supertestWithoutAuth
+      .get(`/api/alerting_tasks/${taskId}`)
+      .expect(200)
+      .then((response: SupertestResponse) => response.body);
+  }
+
   describe('alerts', () => {
     let alertUtils: AlertUtils;
     let indexRecordActionId: string;
@@ -100,6 +109,37 @@ export default function alertTests({ getService }: FtrProviderContext) {
       });
     });
 
+    it('should reschedule failing alerts using the alerting interval and not the Task Manager retry logic', async () => {
+      /*
+        Alerting does not use the Task Manager schedule and instead implements its own due to a current limitation
+        in TaskManager's ability to update an existing Task.
+        For this reason we need to handle the retry when Alert executors fail, as TaskManager doesn't understand that
+        alerting tasks are recurring tasks.
+      */
+      const alertIntervalInSeconds = 30;
+      const reference = alertUtils.generateReference();
+      const response = await alertUtils.createAlwaysFailingAction({
+        reference,
+        overwrites: { schedule: { interval: `${alertIntervalInSeconds}s` } },
+      });
+
+      expect(response.statusCode).to.eql(200);
+
+      // wait for executor Alert Executor to be run, which means the underlying task is running
+      await esTestIndexTool.waitForDocs('alert:test.failing', reference);
+
+      await retry.try(async () => {
+        const alertTask = (await getAlertingTaskById(response.body.scheduledTaskId)).docs[0];
+        expect(alertTask.status).to.eql('idle');
+        // ensure the alert is rescheduled to a minute from now
+        ensureDatetimeIsWithinRange(
+          Date.parse(alertTask.runAt),
+          alertIntervalInSeconds * 1000,
+          5000
+        );
+      });
+    });
+
     it('should handle custom retry logic', async () => {
       // We'll use this start time to query tasks created after this point
       const testStart = new Date();
diff --git a/x-pack/test/api_integration/apis/endpoint/endpoints.ts b/x-pack/test/api_integration/apis/endpoint/endpoints.ts
new file mode 100644
index 00000000000000..95c3678672da30
--- /dev/null
+++ b/x-pack/test/api_integration/apis/endpoint/endpoints.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect/expect.js';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertest');
+  describe('test endpoints api', () => {
+    before(() => esArchiver.load('endpoint/endpoints'));
+    after(() => esArchiver.unload('endpoint/endpoints'));
+    describe('GET /api/endpoint/endpoints', () => {
+      it('endpoints api should return one entry for each endpoint with default paging', async () => {
+        const { body } = await supertest
+          .post('/api/endpoint/endpoints')
+          .set('kbn-xsrf', 'xxx')
+          .send()
+          .expect(200);
+        expect(body.total).to.eql(3);
+        expect(body.endpoints.length).to.eql(3);
+        expect(body.request_page_size).to.eql(10);
+        expect(body.request_index).to.eql(0);
+      });
+
+      it('endpoints api should return page based on params passed.', async () => {
+        const { body } = await supertest
+          .post('/api/endpoint/endpoints')
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            paging_properties: [
+              {
+                page_size: 1,
+              },
+              {
+                page_index: 1,
+              },
+            ],
+          })
+          .expect(200);
+        expect(body.total).to.eql(3);
+        expect(body.endpoints.length).to.eql(1);
+        expect(body.request_page_size).to.eql(1);
+        expect(body.request_index).to.eql(1);
+      });
+
+      it('endpoints api should return 400 when pagingProperties is below boundaries.', async () => {
+        const { body } = await supertest
+          .post('/api/endpoint/endpoints')
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            paging_properties: [
+              {
+                page_size: 0,
+              },
+              {
+                page_index: 1,
+              },
+            ],
+          })
+          .expect(400);
+        expect(body.message).to.contain('Value is [0] but it must be equal to or greater than [1]');
+      });
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/endpoint/index.ts b/x-pack/test/api_integration/apis/endpoint/index.ts
index e0ffbb13e59787..a3f0e828d7240f 100644
--- a/x-pack/test/api_integration/apis/endpoint/index.ts
+++ b/x-pack/test/api_integration/apis/endpoint/index.ts
@@ -9,5 +9,6 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default function endpointAPIIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('Endpoint plugin', function() {
     loadTestFile(require.resolve('./resolver'));
+    loadTestFile(require.resolve('./endpoints'));
   });
 }
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 67529c77f70f78..66701de2704a68 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
@@ -110,7 +110,9 @@ export default function({ getService }: FtrProviderContext) {
           });
         });
 
-        it('highlights field columns', async () => {
+        // Skipped since it behaves differently in master and in the 7.X branch
+        // See https://github.com/elastic/kibana/issues/49959
+        it.skip('highlights field columns', async () => {
           const { body } = await supertest
             .post(LOG_ENTRIES_HIGHLIGHTS_PATH)
             .set(COMMON_HEADERS)
@@ -140,9 +142,7 @@ export default function({ getService }: FtrProviderContext) {
           entries.forEach(entry => {
             entry.columns.forEach(column => {
               if ('field' in column && 'highlights' in column && column.highlights.length > 0) {
-                // https://github.com/elastic/kibana/issues/49959
-                // expect(column.highlights).to.eql(['generate_test_data/simple_logs']);
-                expect(column.highlights).to.eql(['generate_test_data']);
+                expect(column.highlights).to.eql(['generate_test_data/simple_logs']);
               }
             });
           });
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
index 0bf24be0fa0b05..ef7124e2864f8c 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
@@ -79,6 +79,10 @@ export default function({ getService }) {
       expect(stats.stack_stats.kibana.plugins.apm.services_per_agent).to.be.an('object');
       expect(stats.stack_stats.kibana.plugins.infraops.last_24_hours).to.be.an('object');
       expect(stats.stack_stats.kibana.plugins.kql.defaultQueryLanguage).to.be.a('string');
+      expect(stats.stack_stats.kibana.plugins['maps-telemetry'].attributes.timeCaptured).to.be.a(
+        'string'
+      );
+
       expect(stats.stack_stats.kibana.plugins.reporting.enabled).to.be(true);
       expect(stats.stack_stats.kibana.plugins.rollups.index_patterns).to.be.an('object');
       expect(stats.stack_stats.kibana.plugins.spaces.available).to.be(true);
diff --git a/x-pack/test/functional/apps/security/rbac_phase1.js b/x-pack/test/functional/apps/security/rbac_phase1.js
index 361bb6dbbdae4d..9309e23bdd762c 100644
--- a/x-pack/test/functional/apps/security/rbac_phase1.js
+++ b/x-pack/test/functional/apps/security/rbac_phase1.js
@@ -7,7 +7,14 @@
 import expect from '@kbn/expect';
 import { indexBy } from 'lodash';
 export default function({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['security', 'settings', 'common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'security',
+    'settings',
+    'common',
+    'visualize',
+    'timePicker',
+    'visChart',
+  ]);
   const log = getService('log');
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
@@ -110,7 +117,7 @@ export default function({ getService, getPageObjects }) {
           '"'
       );
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
       await PageObjects.visualize.saveVisualizationExpectSuccess(vizName1);
       await PageObjects.security.forceLogout();
     });
diff --git a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
index 03b6ed8e8e7c54..5ec6bd275133a4 100644
--- a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
+++ b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
@@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker', 'visChart']);
   const inspector = getService('inspector');
 
   describe('hybrid index pattern', () => {
@@ -81,7 +81,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
       await PageObjects.common.navigateToApp('visualize');
       await PageObjects.visualize.clickVisualizationByName('hybrid_histogram_line_chart');
       await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       await inspector.open();
       await inspector.setTablePageSize(50);
       await inspector.expectTableData(expectedData);
diff --git a/x-pack/test/functional/es_archives/endpoint/endpoints/data.json.gz b/x-pack/test/functional/es_archives/endpoint/endpoints/data.json.gz
new file mode 100644
index 00000000000000..fda46096e1ab24
Binary files /dev/null and b/x-pack/test/functional/es_archives/endpoint/endpoints/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/endpoint/endpoints/mappings.json b/x-pack/test/functional/es_archives/endpoint/endpoints/mappings.json
new file mode 100644
index 00000000000000..9544d05d706001
--- /dev/null
+++ b/x-pack/test/functional/es_archives/endpoint/endpoints/mappings.json
@@ -0,0 +1,104 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+    },
+    "index": "endpoint-agent",
+    "mappings": {
+      "properties": {
+        "created_at": {
+          "type": "date"
+        },
+        "endpoint": {
+          "properties": {
+            "active_directory_distinguished_name": {
+              "type": "text"
+            },
+            "active_directory_hostname": {
+              "type": "text"
+            },
+            "domain": {
+              "type": "text"
+            },
+            "is_base_image": {
+              "type": "boolean"
+            },
+            "isolation": {
+              "properties": {
+                "status": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "policy": {
+              "properties": {
+                "id": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "sensor": {
+              "properties": {
+                "persistence": {
+                  "type": "boolean"
+                },
+                "status": {
+                  "type": "object"
+                }
+              }
+            },
+            "upgrade": {
+              "type": "object"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "hostname": {
+              "type": "text"
+            },
+            "ip": {
+              "ignore_above": 256,
+              "type": "keyword"
+            },
+            "mac_address": {
+              "type": "text"
+            },
+            "name": {
+              "type": "text"
+            },
+            "os": {
+              "properties": {
+                "full": {
+                  "type": "text"
+                },
+                "name": {
+                  "type": "text"
+                }
+              }
+            }
+          }
+        },
+        "machine_id": {
+          "type": "keyword"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/reporting/README.md b/x-pack/test/reporting/README.md
index 30859fa96c015a..d4a6c20a835e22 100644
--- a/x-pack/test/reporting/README.md
+++ b/x-pack/test/reporting/README.md
@@ -82,16 +82,6 @@ node scripts/functional_tests_server.js --config test/reporting/configs/chromium
 
 **Note:** Dashboard has some snapshot testing too, in `_dashboard_snapshots.js`. This test watches for a command line flag `--updateBaselines` which automates updating the baselines. Probably worthwhile to do some similar here in the long run.
 
-  ### Adding a new BWC test
-
-  We have tests that ensure the latest version of Kibana will continue to generate reports from URLs generated in previous versions, to ensure backward compatibility.  These tests are in `api/bwc_generation_urls.js`. It's important to update these every now and then and add new ones, especially if anything in the URL changed in a release.
-
-  To add test coverage for a specific minor release,:
-1. Checkout previous branch, e.g. `git checkout upstream/6.4`
-2. Sync your environment via `yarn kbn bootstrap` (Note, if you run into problems you may want to first clean via `yarn kbn clean`)
-3. Start up kibana and Elasticsearch (`yarn es snapshot --license trial` in one terminal, and `yarn start` in another)
-4. Load the reporting test data that is used in the tests. Ensure you are in the `x-pack` directory and run:
-
 ```
 node ../scripts/es_archiver.js --es-url http://elastic:changeme@localhost:9200 load ../../../../test/functional/fixtures/es_archiver/dashboard/current/kibana
 ```
diff --git a/x-pack/test/reporting/api/bwc_existing_indexes.js b/x-pack/test/reporting/api/bwc_existing_indexes.js
deleted file mode 100644
index ffcf123848bb2e..00000000000000
--- a/x-pack/test/reporting/api/bwc_existing_indexes.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as GenerationUrls from './generation_urls';
-
-/**
- * This file tests the situation when a reporting index spans releases. By default reporting indexes are created
- * on a weekly basis, but this is configurable so it is possible a user has this set to yearly. In that event, it
- * is possible report data is getting posted to an index that was created by a very old version. We don't have a
- * reporting index migration plan, so this test is important to ensure BWC, or that in the event we decide to make
- * a major change in a major release, we handle it properly.
- */
-
-export default function({ getService }) {
-  const esArchiver = getService('esArchiver');
-  const reportingAPI = getService('reportingAPI');
-  const usageAPI = getService('usageAPI');
-
-  // FLAKY: https://github.com/elastic/kibana/issues/42725
-  describe.skip('BWC report generation into existing indexes', () => {
-    let expectedCompletedReportCount;
-    let cleanupIndexAlias;
-
-    describe('existing 6_2 index', () => {
-      before('load data and add index alias', async () => {
-        await reportingAPI.deleteAllReportingIndexes();
-        await esArchiver.load('reporting/bwc/6_2');
-
-        // The index name in the 6_2 archive.
-        const ARCHIVED_REPORTING_INDEX = '.reporting-2018.03.11';
-        cleanupIndexAlias = await reportingAPI.coerceReportsIntoExistingIndex(
-          ARCHIVED_REPORTING_INDEX
-        );
-
-        const stats = await usageAPI.getUsageStats();
-        expectedCompletedReportCount = await reportingAPI.getCompletedReportCount(stats);
-
-        await esArchiver.unload('reporting/bwc/6_2');
-      });
-
-      after('remove index alias', async () => {
-        await cleanupIndexAlias();
-      });
-
-      // Might not be great test practice to lump all these jobs together but reporting takes awhile and it'll be
-      // more efficient to post them all up front, then sequentially.
-      it('multiple jobs posted', async () => {
-        const reportPaths = [];
-        reportPaths.push(
-          await reportingAPI.postJob(GenerationUrls.CSV_DISCOVER_KUERY_AND_FILTER_6_3)
-        );
-        reportPaths.push(
-          await reportingAPI.postJob(GenerationUrls.PDF_PRESERVE_DASHBOARD_FILTER_6_3)
-        );
-        reportPaths.push(
-          await reportingAPI.postJob(GenerationUrls.PDF_PRESERVE_PIE_VISUALIZATION_6_3)
-        );
-        reportPaths.push(await reportingAPI.postJob(GenerationUrls.PDF_PRINT_DASHBOARD_6_3));
-        reportPaths.push(
-          await reportingAPI.postJob(
-            GenerationUrls.PDF_PRINT_PIE_VISUALIZATION_FILTER_AND_SAVED_SEARCH_6_3
-          )
-        );
-
-        await reportingAPI.expectAllJobsToFinishSuccessfully(reportPaths);
-      }).timeout(1540000);
-
-      it('jobs completed successfully', async () => {
-        const stats = await usageAPI.getUsageStats();
-        expectedCompletedReportCount += 5;
-        reportingAPI.expectCompletedReportCount(stats, expectedCompletedReportCount);
-      });
-    });
-  });
-}
diff --git a/x-pack/test/reporting/api/bwc_generation_urls.js b/x-pack/test/reporting/api/bwc_generation_urls.js
deleted file mode 100644
index 25b40ff3f74a82..00000000000000
--- a/x-pack/test/reporting/api/bwc_generation_urls.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as GenerationUrls from './generation_urls';
-
-export default function({ getService }) {
-  const reportingAPI = getService('reportingAPI');
-  const usageAPI = getService('usageAPI');
-
-  describe('BWC report generation urls', () => {
-    describe('Pre 6_2', () => {
-      before(async () => {
-        await reportingAPI.deleteAllReportingIndexes();
-      });
-
-      // The URL being tested was captured from release 6.4 and then the layout section was removed to test structure before
-      // preserve_layout was introduced. See https://github.com/elastic/kibana/issues/23414
-      it('job posted successfully', async () => {
-        const path = await reportingAPI.postJob(GenerationUrls.PDF_PRINT_DASHBOARD_PRE_6_2);
-        await reportingAPI.waitForJobToFinish(path);
-        const stats = await usageAPI.getUsageStats();
-        reportingAPI.expectCompletedReportCount(stats, 1);
-      }).timeout(500000);
-    });
-
-    describe('6_2', () => {
-      before(async () => {
-        await reportingAPI.deleteAllReportingIndexes();
-      });
-
-      // Might not be great test practice to lump all these jobs together but reporting takes awhile and it'll be
-      // more efficient to post them all up front, then sequentially.
-      it('multiple jobs posted', async () => {
-        const reportPaths = [];
-        reportPaths.push(await reportingAPI.postJob(GenerationUrls.PDF_PRINT_DASHBOARD_6_2));
-        reportPaths.push(await reportingAPI.postJob(GenerationUrls.PDF_PRESERVE_VISUALIZATION_6_2));
-        reportPaths.push(await reportingAPI.postJob(GenerationUrls.CSV_DISCOVER_FILTER_QUERY_6_2));
-
-        await reportingAPI.expectAllJobsToFinishSuccessfully(reportPaths);
-      }).timeout(1540000);
-
-      it('jobs completed successfully', async () => {
-        const stats = await usageAPI.getUsageStats();
-        reportingAPI.expectCompletedReportCount(stats, 3);
-      });
-    });
-
-    // 6.3 urls currently being tested as part of the "bwc_existing_indexes" test suite. Reports are time consuming,
-    // don't replicate tests if we don't need to, so no specific 6_3 url tests here.
-  });
-}
diff --git a/x-pack/test/reporting/api/chromium_tests.js b/x-pack/test/reporting/api/chromium_tests.js
index 6594a80db491b1..2d5a31bb40da32 100644
--- a/x-pack/test/reporting/api/chromium_tests.js
+++ b/x-pack/test/reporting/api/chromium_tests.js
@@ -27,8 +27,6 @@ export default function({ loadTestFile, getService }) {
       await esArchiver.unload(OSS_DATA_ARCHIVE_PATH);
     });
 
-    loadTestFile(require.resolve('./bwc_existing_indexes'));
-    loadTestFile(require.resolve('./bwc_generation_urls'));
     loadTestFile(require.resolve('./usage'));
   });
 }
diff --git a/x-pack/test/reporting/api/generation_urls.js b/x-pack/test/reporting/api/generation_urls.js
index 182d395704a25b..b98b1a26651a15 100644
--- a/x-pack/test/reporting/api/generation_urls.js
+++ b/x-pack/test/reporting/api/generation_urls.js
@@ -4,13 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// These all have the domain name portion stripped out. The api infrastructure assumes it when we post to it anyhow.
-
-// The URL below was captured from release 6.4 and then the layout section was removed to test structure before
-// preserve_layout was introduced. See https://github.com/elastic/kibana/issues/23414
-export const PDF_PRINT_DASHBOARD_PRE_6_2 =
-  '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F2ae34a60-3dd4-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(pause:!!t,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!(),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%27145ced90-3dcb-11e8-8660-4d65aa086b3c!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:e2023110-3dcb-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:visualization,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!f,title:!%27couple%2Bpanels!%27,viewMode:view)%27),title:%27couple%20panels%27)';
-
 export const PDF_PRINT_DASHBOARD_6_3 =
   '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F2ae34a60-3dd4-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!(),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%27145ced90-3dcb-11e8-8660-4d65aa086b3c!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:e2023110-3dcb-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:visualization,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!f,title:!%27couple%2Bpanels!%27,viewMode:view)%27),title:%27couple%20panels%27)';
 export const PDF_PRESERVE_DASHBOARD_FILTER_6_3 =
@@ -21,10 +14,3 @@ export const PDF_PRINT_PIE_VISUALIZATION_FILTER_AND_SAVED_SEARCH_6_3 =
   '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:visualization,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fvisualize%2Fedit%2Fbefdb6b0-3e59-11e8-9fc3-39e49624228e%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:animal.keyword,negate:!!f,params:(query:dog,type:phrase),type:phrase,value:dog),query:(match:(animal.keyword:(query:dog,type:phrase))))),linked:!!t,query:(language:lucene,query:!%27!%27),uiState:(),vis:(aggs:!!((enabled:!!t,id:!%271!%27,params:(),schema:metric,type:count),(enabled:!!t,id:!%272!%27,params:(field:name.keyword,missingBucket:!!f,missingBucketLabel:Missing,order:desc,orderBy:!%271!%27,otherBucket:!!f,otherBucketLabel:Other,size:5),schema:segment,type:terms)),params:(addLegend:!!t,addTooltip:!!t,isDonut:!!t,labels:(last_level:!!t,show:!!f,truncate:100,values:!!t),legendPosition:right,type:pie),title:!%27Filter%2BTest:%2Banimals:%2Blinked%2Bto%2Bsearch%2Bwith%2Bfilter!%27,type:pie))%27),title:%27Filter%20Test:%20animals:%20linked%20to%20search%20with%20filter%27)';
 export const CSV_DISCOVER_KUERY_AND_FILTER_6_3 =
   '/api/reporting/generate/csv?jobParams=(conflictedTypesFields:!(),fields:!(%27@timestamp%27,agent,bytes,clientip),indexPatternId:%270bf35f60-3dc9-11e8-8660-4d65aa086b3c%27,metaFields:!(_source,_id,_type,_index,_score),searchRequest:(body:(_source:(excludes:!(),includes:!(%27@timestamp%27,agent,bytes,clientip)),docvalue_fields:!(%27@timestamp%27),query:(bool:(filter:!((bool:(minimum_should_match:1,should:!((match:(clientip:%2773.14.212.83%27)))))),must:!((range:(bytes:(gte:100,lt:1000))),(range:(%27@timestamp%27:(format:epoch_millis,gte:1369165215770,lte:1526931615770)))),must_not:!(),should:!())),script_fields:(),sort:!((%27@timestamp%27:(order:desc,unmapped_type:boolean))),stored_fields:!(%27@timestamp%27,agent,bytes,clientip),version:!t),index:%27logstash-*%27),title:%27Bytes%20and%20kuery%20in%20saved%20search%20with%20filter%27,type:search)';
-
-export const PDF_PRINT_DASHBOARD_6_2 =
-  '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:dashboard,queryString:%27_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,field:isDog,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:isDog,negate:!!f,params:(value:!!t),type:phrase,value:true),script:(script:(inline:!%27boolean%2Bcompare(Supplier%2Bs,%2Bdef%2Bv)%2B%257Breturn%2Bs.get()%2B%253D%253D%2Bv%3B%257Dcompare(()%2B-%253E%2B%257B%2Breturn%2Bdoc%255B!!!%27animal.keyword!!!%27%255D.value%2B%253D%253D%2B!!!%27dog!!!%27%2B%257D,%2Bparams.value)%3B!%27,lang:painless,params:(value:!!t))))),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((gridData:(h:3,i:!%274!%27,w:6,x:6,y:0),id:edb65990-53ca-11e8-b481-c9426d020fcd,panelIndex:!%274!%27,type:visualization,version:!%276.2.4!%27),(gridData:(h:3,i:!%275!%27,w:6,x:0,y:0),id:!%270644f890-53cb-11e8-b481-c9426d020fcd!%27,panelIndex:!%275!%27,type:visualization,version:!%276.2.4!%27)),query:(language:lucene,query:!%27weightLbs:%253E15!%27),timeRestore:!!t,title:!%27Animal%2BWeights%2B(created%2Bin%2B6.2)!%27,viewMode:view)%27,savedObjectId:%271b2f47b0-53cb-11e8-b481-c9426d020fcd%27)';
-export const PDF_PRESERVE_VISUALIZATION_6_2 =
-  '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(dimensions:(height:441,width:1002),id:preserve_layout),objectType:visualization,queryString:%27_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(filters:!!(),linked:!!f,query:(language:lucene,query:!%27weightLbs:%253E10!%27),uiState:(),vis:(aggs:!!((enabled:!!t,id:!%271!%27,params:(),schema:metric,type:count),(enabled:!!t,id:!%272!%27,params:(field:weightLbs,missingBucket:!!f,missingBucketLabel:Missing,order:desc,orderBy:!%271!%27,otherBucket:!!f,otherBucketLabel:Other,size:5),schema:segment,type:terms)),params:(addLegend:!!t,addTooltip:!!t,isDonut:!!t,labels:(last_level:!!t,show:!!f,truncate:100,values:!!t),legendPosition:right,type:pie),title:!%27Weight%2Bin%2Blbs%2Bpie%2Bcreated%2Bin%2B6.2!%27,type:pie))%27,savedObjectId:%270644f890-53cb-11e8-b481-c9426d020fcd%27)';
-export const CSV_DISCOVER_FILTER_QUERY_6_2 =
-  '/api/reporting/generate/csv?jobParams=(conflictedTypesFields:!(),fields:!(%27@timestamp%27,animal,sound,weightLbs),indexPatternId:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,metaFields:!(_source,_id,_type,_index,_score),searchRequest:(body:(_source:(excludes:!(),includes:!(%27@timestamp%27,animal,sound,weightLbs)),docvalue_fields:!(%27@timestamp%27),query:(bool:(filter:!(),must:!((query_string:(analyze_wildcard:!t,default_field:%27*%27,query:%27weightLbs:%3E10%27)),(match_phrase:(sound.keyword:(query:growl))),(range:(%27@timestamp%27:(format:epoch_millis,gte:1523310968000,lte:1523483768000)))),must_not:!(),should:!())),script_fields:(),sort:!((%27@timestamp%27:(order:desc,unmapped_type:boolean))),stored_fields:!(%27@timestamp%27,animal,sound,weightLbs),version:!t),index:%27animals-*%27),title:%27Search%20created%20in%206.2%27,type:search)';
diff --git a/x-pack/test/reporting/configs/chromium_api.js b/x-pack/test/reporting/configs/chromium_api.js
index f016738c0e052d..95649dfb5d7a3c 100644
--- a/x-pack/test/reporting/configs/chromium_api.js
+++ b/x-pack/test/reporting/configs/chromium_api.js
@@ -28,6 +28,7 @@ export default async function({ readConfigFile }) {
         '["info","warning","error","fatal","optimize","reporting"]',
         '--xpack.endpoint.enabled=true',
         '--xpack.reporting.csv.enablePanelActionDownload=true',
+        '--xpack.reporting.capture.maxAttempts=1',
         '--xpack.security.session.idleTimeout=3600000',
         '--xpack.spaces.enabled=false',
       ],
diff --git a/x-pack/test/reporting/functional/reporting.js b/x-pack/test/reporting/functional/reporting.js
index 7d72db8c08e223..8458f4e537b70d 100644
--- a/x-pack/test/reporting/functional/reporting.js
+++ b/x-pack/test/reporting/functional/reporting.js
@@ -25,6 +25,7 @@ export default function({ getService, getPageObjects }) {
     'header',
     'discover',
     'visualize',
+    'visEditor',
   ]);
   const log = getService('log');
 
@@ -298,9 +299,9 @@ export default function({ getService, getPageObjects }) {
 
         it('becomes available when saved', async () => {
           await PageObjects.reporting.setTimepickerInDataRange();
-          await PageObjects.visualize.clickBucket('X-axis');
-          await PageObjects.visualize.selectAggregation('Date Histogram');
-          await PageObjects.visualize.clickGo();
+          await PageObjects.visEditor.clickBucket('X-axis');
+          await PageObjects.visEditor.selectAggregation('Date Histogram');
+          await PageObjects.visEditor.clickGo();
           await PageObjects.visualize.saveVisualization('my viz');
           await PageObjects.reporting.openPdfReportingPanel();
           await expectEnabledGenerateReportButton();