From fa8da7c34911475aa9f5d4abe25876b736e2ca71 Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Mon, 6 Jan 2020 14:34:27 -0700
Subject: [PATCH 01/96] [Reporting/PDF] Refactor screenshot pipeline for
 multi-url by default (#48588)

* Multi-url pass to screenshotsObservable

* Restore "first" operator

* max attempt = 1 for testing

* cleanup debug

* restore more concatMap

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../execute_job/decrypt_job_headers.test.ts   |   2 +-
 .../common/execute_job/decrypt_job_headers.ts |  12 +-
 .../get_conditional_headers.test.ts           |  22 +--
 .../execute_job/get_conditional_headers.ts    |   6 +-
 .../execute_job/get_custom_logo.test.ts       |   2 +-
 .../common/execute_job/get_custom_logo.ts     |  12 +-
 .../common/execute_job/get_full_urls.test.ts  | 115 +++++-------
 .../common/execute_job/get_full_urls.ts       |  13 +-
 .../omit_blacklisted_headers.test.ts          |   9 +-
 .../execute_job/omit_blacklisted_headers.ts   |   5 +-
 .../common/lib/screenshots/index.ts           | 169 ++++++------------
 .../common/lib/screenshots/scan_page.ts       |  30 ++++
 .../common/lib/screenshots/types.ts           |   4 +-
 .../png/server/execute_job/index.test.js      |   2 +-
 .../png/server/execute_job/index.ts           |  20 +--
 .../png/server/lib/generate_png.ts            |  12 +-
 .../printable_pdf/server/execute_job/index.ts |  48 +++--
 .../printable_pdf/server/lib/generate_pdf.ts  |  23 ++-
 .../browsers/chromium/driver_factory/index.ts |  91 +++++-----
 .../reporting/server/browsers/index.ts        |   1 +
 .../server/lib/validate/validate_browser.ts   |  16 +-
 x-pack/test/reporting/configs/chromium_api.js |   1 +
 22 files changed, 269 insertions(+), 346 deletions(-)
 create mode 100644 x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/scan_page.ts

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..e25b94e98d020f 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\` or \`job.objects[{ relativeUrl }]\`"`
   );
 });
 
 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,26 @@ 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,
-          },
-        ],
-        forceNow,
-      },
+      job: { objects: [{ 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,7 +76,7 @@ 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: [
@@ -100,59 +87,48 @@ test(`fails if URLs are absolute for PDF`, async () => {
         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: '/app/kibana#/something_aaa' },
     {
       relativeUrl:
         'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
     },
-    {
-      relativeUrl: 'file://etc/passwd/#/something',
-    },
+    { relativeUrl: 'file://etc/passwd/#/something' },
   ];
-  await expect(
+
+  const fn = () =>
     getFullUrls({
-      job: {
-        objects,
-        forceNow,
-      },
+      job: { objects, 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 +140,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 +151,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,7 +161,7 @@ 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' },
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..90049e8e3aea48 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';
 
@@ -23,15 +23,12 @@ function isPdfJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloa
   return (job as JobDocPayloadPDF).objects !== 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();
 
@@ -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/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/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/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/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',
       ],

From ecab2073ae8a730d9913d4b66c0e3f5181b1d92c Mon Sep 17 00:00:00 2001
From: Ahmad Bamieh <ahmadbamieh@gmail.com>
Date: Mon, 6 Jan 2020 23:58:55 +0200
Subject: [PATCH 02/96] =?UTF-8?q?[Telemetry]=20fix=20bug=20where=20uiStats?=
 =?UTF-8?q?Metrics=20is=20not=20getting=20report=E2=80=A6=20(#54045)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix bug where uiStatsMetrics is not getting reported

* fix tests
---
 packages/kbn-analytics/src/report.ts          | 24 ++++++++---------
 .../apis/ui_metric/ui_metric.js               | 26 +++++++------------
 2 files changed, 21 insertions(+), 29 deletions(-)

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/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')

From 9481cbf36e359d6e60ffb3c1b00c1ad8ac6e8d17 Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Mon, 6 Jan 2020 18:00:49 -0500
Subject: [PATCH 03/96] [Uptime] Prefer Kibana core http services (#53726)

* Prefer Kibana core http service to other fetch functions, refactor helper functions to hooks.

* Reintroduce newline deleted in previous commit.

* Clean up obsolete import.

* Clean up effect code in new hook.

* Clean up enum usage in new hook.

* Implement PR feedback on new hook.

* Fix eslint error.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../plugins/uptime/public/apps/plugin.ts      |   8 +-
 .../components/functional/kuery_bar/index.tsx |  15 +-
 .../plugins/uptime/public/hooks/index.ts      |   2 +
 .../uptime/public/hooks/use_index_pattern.ts  |  20 +++
 .../uptime/public/hooks/use_telemetry.ts      |  41 +++++
 .../framework/new_platform_adapter.tsx        |  14 +-
 .../__tests__/get_index_pattern.test.ts       |  50 -------
 .../index_pattern/get_index_pattern.ts        |  26 ----
 .../lib/adapters/index_pattern/index.ts       |   7 -
 .../public/lib/adapters/telemetry/index.ts    |   8 -
 .../lib/adapters/telemetry/log_monitor.ts     |  18 ---
 .../lib/adapters/telemetry/log_overview.ts    |  18 ---
 .../plugins/uptime/public/pages/monitor.tsx   |  14 +-
 .../plugins/uptime/public/pages/overview.tsx  |  17 +--
 .../plugins/uptime/public/uptime_app.tsx      | 141 +++++++++---------
 15 files changed, 156 insertions(+), 243 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/__tests__/get_index_pattern.test.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/get_index_pattern.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/index.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_monitor.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_overview.ts

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/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/index_pattern/index.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/index.ts
deleted file mode 100644
index 1c84a7bc3b7274..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/index.ts
+++ /dev/null
@@ -1,7 +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 { getIndexPattern } from './get_index_pattern';
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts
deleted file mode 100644
index 08d8d9a5d40694..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts
+++ /dev/null
@@ -1,8 +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 { getTelemetryMonitorPageLogger } from './log_monitor';
-export { getTelemetryOverviewPageLogger } from './log_overview';
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>
   );

From fef8485f367785b78426430a08b4b0ddd1eb1ae8 Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Mon, 6 Jan 2020 16:20:45 -0700
Subject: [PATCH 04/96] [Reporting/Legacy] Remove reporting legacy job params
 compatibility shim (#52539)

* [Reporting/Tests] consolidate functional test configs

* remove console.log

* trash

* Update

* add more to the comment

* restore historic archive for wip ui functional tests

* [Reporting/Legacy] Remove reporting legacy job params compatibility shimmy shim shim

* objectType: objectType

* fix jest test and get_urls logging

* simplify change

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../common/execute_job/get_full_urls.test.ts  |  36 +--
 .../common/execute_job/get_full_urls.ts       |   6 +-
 .../server/create_job/compatibility_shim.js   | 126 --------
 .../create_job/compatibility_shim.test.js     | 297 ------------------
 .../printable_pdf/server/create_job/index.ts  |  32 +-
 .../server/execute_job/index.test.js          |   9 +-
 .../export_types/printable_pdf/types.d.ts     |   6 +-
 .../public/components/report_listing.tsx      |   2 +-
 .../lib/esqueue/helpers/create_index.js       |   2 +-
 .../reporting/server/lib/esqueue/job.js       |   2 +-
 .../reporting/server/routes/generation.ts     |   2 -
 .../plugins/reporting/server/routes/legacy.ts |  73 -----
 x-pack/test/reporting/README.md               |  10 -
 .../reporting/api/bwc_existing_indexes.js     |  78 -----
 .../test/reporting/api/bwc_generation_urls.js |  54 ----
 x-pack/test/reporting/api/chromium_tests.js   |   2 -
 x-pack/test/reporting/api/generation_urls.js  |  14 -
 17 files changed, 38 insertions(+), 713 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js
 delete mode 100644 x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.test.js
 delete mode 100644 x-pack/legacy/plugins/reporting/server/routes/legacy.ts
 delete mode 100644 x-pack/test/reporting/api/bwc_existing_indexes.js
 delete mode 100644 x-pack/test/reporting/api/bwc_generation_urls.js

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 e25b94e98d020f..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
@@ -28,7 +28,7 @@ test(`fails if no URL is passed`, async () => {
       server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
-    `"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[]\`"`
   );
 });
 
@@ -64,7 +64,10 @@ test(`fails if URLs are file-protocols for PDF`, async () => {
   const relativeUrl = 'file://etc/passwd/#/something';
   const fn = () =>
     getFullUrls({
-      job: { objects: [{ relativeUrl }], forceNow },
+      job: {
+        relativeUrls: [relativeUrl],
+        forceNow,
+      },
       server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
@@ -79,11 +82,7 @@ test(`fails if URLs are absolute for PDF`, async () => {
   const fn = () =>
     getFullUrls({
       job: {
-        objects: [
-          {
-            relativeUrl,
-          },
-        ],
+        relativeUrls: [relativeUrl],
         forceNow,
       },
       server: mockServer,
@@ -95,18 +94,15 @@ test(`fails if URLs are absolute for PDF`, async () => {
 
 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',
   ];
 
   const fn = () =>
     getFullUrls({
-      job: { objects, forceNow },
+      job: { relativeUrls, forceNow },
       server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
@@ -163,11 +159,11 @@ test(`adds forceNow to each of multiple urls`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   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 90049e8e3aea48..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
@@ -20,7 +20,7 @@ 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 function getFullUrls<JobDocPayloadType>({
@@ -45,10 +45,10 @@ export 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[]\``
     );
   }
 
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/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/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/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/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/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)';

From 9aa23410d52b306d0550ffae6a3cfc4e22ce1eb1 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Mon, 6 Jan 2020 19:50:55 -0500
Subject: [PATCH 05/96] convert modelMemoryLimit nums to strings before
 validation check (#54011)

---
 x-pack/legacy/plugins/ml/common/util/job_utils.js           | 2 +-
 .../hooks/use_create_analytics_form/reducer.test.ts         | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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/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);
   });
 });

From 6398e22b4f9bbc6d01f053187e52e86738a57c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Tue, 7 Jan 2020 08:33:49 +0000
Subject: [PATCH 06/96] adding message to transaction and span metadata
 (#54017)

---
 .../__test__/SpanMetadata.test.tsx             | 18 +++++++++++++-----
 .../MetadataTable/SpanMetadata/sections.ts     |  4 +++-
 .../__test__/TransactionMetadata.test.tsx      | 18 ++++++++++++++----
 .../TransactionMetadata/sections.ts            |  4 +++-
 .../shared/MetadataTable/sections.ts           | 17 +++++++++++++++++
 .../apm/typings/es_schemas/raw/SpanRaw.ts      |  6 ++++++
 .../typings/es_schemas/raw/TransactionRaw.ts   |  6 ++++++
 7 files changed, 62 insertions(+), 11 deletions(-)

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/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

From e687fc63dfe815877378299f2b9f7c443ccf6088 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Tue, 7 Jan 2020 11:01:21 +0100
Subject: [PATCH 07/96] [Console] Telemetry (part 1) (#52893)

* Saving anonymised data to SO

* Add new files

* Hook up usage collector

* Added app start up ui metric tracking

* Only use client side track metrics functionality

* Added comment regarding use of `patterns`, renamed trackMetric -> trackUiMetric

* Fix jest tests

* Slight refactor and fix for functional tests. More defensive tracking logic

* Fix types in test

* Minor refactor to get endpoint description - removed SenseEditor from autocomplete.
Fix bug where cursor at end of line does not get endpoint informaiton

* Send request to es: do not mutate args
Always move cursor to end of line when getting endpoint description

* Create an interface a simple interface to the metrics tracker
Use the new createUiStatsReporter function to create the tracker

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../core_plugins/console/public/kibana.json   |  3 +-
 .../core_plugins/console/public/legacy.ts     | 10 +++--
 .../console_editor/editor.test.mock.tsx       |  4 ++
 .../legacy/console_editor/editor.test.tsx     | 16 ++++++--
 .../editor/legacy/console_menu_actions.ts     |  5 +--
 .../np_ready/application/contexts/index.ts    |  2 +-
 .../application/contexts/services_context.tsx |  4 +-
 .../send_request_to_es.ts                     |  3 +-
 .../use_send_current_request_to_es/track.ts   | 40 ++++++++++++++++++
 .../use_send_current_request_to_es.ts         | 16 ++++----
 .../public/np_ready/application/index.tsx     | 12 +++++-
 .../application/models/sense_editor/index.ts  |  1 +
 .../np_ready/lib/autocomplete/autocomplete.ts | 35 ++++++----------
 .../get_endpoint_from_position.ts             | 41 +++++++++++++++++++
 .../console/public/np_ready/lib/es/es.js      |  1 -
 .../public/np_ready/services/tracker.ts       | 31 ++++++++++++++
 .../console/public/np_ready/types/common.ts   |  5 +++
 .../console/public/np_ready/types/index.ts    |  1 +
 .../spec/overrides/sql.query.json             |  3 +-
 19 files changed, 186 insertions(+), 47 deletions(-)
 create mode 100644 src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.ts
 create mode 100644 src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts
 create mode 100644 src/legacy/core_plugins/console/public/np_ready/services/tracker.ts

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/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts
new file mode 100644
index 00000000000000..cb037e29e33f64
--- /dev/null
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts
@@ -0,0 +1,41 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { 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/console/public/np_ready/services/tracker.ts b/src/legacy/core_plugins/console/public/np_ready/services/tracker.ts
new file mode 100644
index 00000000000000..13d5f875b3c6fb
--- /dev/null
+++ b/src/legacy/core_plugins/console/public/np_ready/services/tracker.ts
@@ -0,0 +1,31 @@
+/*
+ * 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 { METRIC_TYPE } from '@kbn/analytics';
+import { MetricsTracker } from '../types';
+import { createUiStatsReporter } from '../../../../ui_metric/public';
+
+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/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"
   }
 }

From 7607c162fe0b464052d0324580e589c5a84e4ea3 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Tue, 7 Jan 2020 12:53:58 +0100
Subject: [PATCH 08/96] removes logout (#54098)

---
 .../siem/cypress/integration/lib/logout/index.ts  | 15 ---------------
 .../cypress/integration/lib/logout/selectors.ts   | 11 -----------
 .../events_viewer/events_viewer.spec.ts           |  5 -----
 .../fields_browser/fields_browser.spec.ts         |  5 -----
 .../smoke_tests/inspect/inspect.spec.ts           |  8 --------
 .../ml_conditional_links.spec.ts                  |  5 -----
 .../smoke_tests/navigation/navigation.spec.ts     |  5 -----
 .../smoke_tests/overview/overview.spec.ts         |  5 -----
 .../smoke_tests/pagination/pagination.spec.ts     |  5 -----
 .../smoke_tests/timeline/data_providers.spec.ts   |  5 -----
 .../smoke_tests/timeline/flyout_button.spec.ts    |  5 -----
 .../smoke_tests/timeline/search_or_filter.spec.ts |  5 -----
 .../smoke_tests/timeline/toggle_column.spec.ts    |  5 -----
 .../smoke_tests/url_state/url_state.spec.ts       |  5 -----
 14 files changed, 89 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/siem/cypress/integration/lib/logout/index.ts
 delete mode 100644 x-pack/legacy/plugins/siem/cypress/integration/lib/logout/selectors.ts

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(

From 58cb24a7e66f5e740e53ad5a16bb2ced4a98ca2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Tue, 7 Jan 2020 11:56:23 +0000
Subject: [PATCH 09/96] [APM] Show errors on the timeline instead of under the
 transaction (#53756)

* creating error marker and refactoring some stuff

* styling popover

* adding agent marks and errors to waterfall items

* adding agent marks and errors to waterfall items

* adding agent marks and errors to waterfall items

* fixing tests and typescript checking

* refactoring helper

* changing transaction error badge style

* adding unit test

* fixing agent marker position

* fixing offset when error is registered before its parent

* refactoring error marker

* refactoring error marker

* refactoring error marker

* refactoring error marker

* refactoring error marker

* refactoring waterfall helper

* refactoring waterfall helper

* refactoring waterfall helper api

* refactoring waterfall helper

* removing unused code

* refactoring waterfall helper

* changing unit test

* removing comment

* refactoring marker component and waterfall helper

* removing servicecolor from waterfall item and adding it to errormark

* fixing trace order
---
 .../WaterfallWithSummmary/ErrorCount.tsx      |   32 +
 .../WaterfallWithSummmary/ErrorCountBadge.tsx |   17 -
 .../MaybeViewTraceLink.tsx                    |   17 +-
 .../WaterfallWithSummmary/TransactionTabs.tsx |    1 -
 .../__test__}/get_agent_marks.test.ts         |   25 +-
 .../Marks/__test__/get_error_marks.test.ts    |   97 +
 .../Marks/get_agent_marks.ts                  |   31 +
 .../Marks/get_error_marks.ts                  |   39 +
 .../WaterfallContainer/Marks/index.ts         |   12 +
 .../WaterfallContainer/ServiceLegends.tsx     |    2 +-
 .../Waterfall/SpanFlyout/index.tsx            |    2 +-
 .../Waterfall/TransactionFlyout/index.tsx     |   10 +-
 .../Waterfall/WaterfallFlyout.tsx             |   59 +
 .../Waterfall/WaterfallItem.tsx               |   83 +-
 .../WaterfallContainer/Waterfall/index.tsx    |  216 +-
 .../waterfall_helpers.test.ts.snap            | 1771 +++++++++++------
 .../waterfall_helpers.test.ts                 |  241 ++-
 .../waterfall_helpers/waterfall_helpers.ts    |  254 ++-
 .../WaterfallContainer/get_agent_marks.ts     |   27 -
 .../WaterfallContainer/index.tsx              |    9 +-
 .../__tests__/ErrorCount.test.tsx             |   37 +
 .../WaterfallWithSummmary/index.tsx           |   27 +-
 .../components/shared/Links/apm/APMLink.tsx   |    2 +-
 ...tem.tsx => ErrorCountSummaryItemBadge.tsx} |   27 +-
 .../shared/Summary/TransactionSummary.tsx     |    4 +-
 .../ErrorCountSummaryItemBadge.test.tsx       |   21 +
 .../shared/charts/CustomPlot/Legends.js       |    2 +-
 .../__snapshots__/CustomPlot.test.js.snap     |   27 +
 .../components/shared/charts/Legend/index.js  |   56 -
 .../components/shared/charts/Legend/index.tsx |   94 +
 .../AgentMarker.tsx}                          |   40 +-
 .../charts/Timeline/Marker/ErrorMarker.tsx    |  103 +
 .../Marker/__test__/AgentMarker.test.tsx      |   23 +
 .../Marker/__test__/ErrorMarker.test.tsx      |   30 +
 .../Timeline/Marker/__test__/Marker.test.tsx  |   42 +
 .../__snapshots__/AgentMarker.test.tsx.snap   |   26 +
 .../__snapshots__/ErrorMarker.test.tsx.snap   |   49 +
 .../__snapshots__/Marker.test.tsx.snap        |   58 +
 .../shared/charts/Timeline/Marker/index.tsx   |   36 +
 .../shared/charts/Timeline/TimelineAxis.js    |   16 +-
 .../shared/charts/Timeline/VerticalLines.js   |   12 +-
 .../charts/Timeline/__test__/Timeline.test.js |   23 +-
 .../__snapshots__/Timeline.test.js.snap       |  197 +-
 .../shared/charts/Timeline/index.js           |    8 +-
 .../components/shared/charts/Tooltip/index.js |    2 +-
 .../get_trace_errors_per_transaction.ts       |    1 -
 .../traces/__snapshots__/queries.test.ts.snap |    1 +
 .../apm/server/lib/traces/get_trace_items.ts  |    5 +-
 48 files changed, 2575 insertions(+), 1339 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge.tsx
 rename x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/{ => Marks/__test__}/get_agent_marks.test.ts (66%)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_error_marks.test.ts
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.ts
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/__tests__/ErrorCount.test.tsx
 rename x-pack/legacy/plugins/apm/public/components/shared/Summary/{ErrorCountSummaryItem.tsx => ErrorCountSummaryItemBadge.tsx} (51%)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/Summary/__test__/ErrorCountSummaryItemBadge.test.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.js
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.tsx
 rename x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/{AgentMarker.js => Marker/AgentMarker.tsx} (56%)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/AgentMarker.test.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/ErrorMarker.test.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/Marker.test.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/AgentMarker.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/ErrorMarker.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/Marker.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx

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/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),

From 3953c9020e5f2143680d54777c07e9bbf844b4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez?=
 <alejandro.fernandez@elastic.co>
Date: Tue, 7 Jan 2020 13:29:35 +0100
Subject: [PATCH 10/96] Skip failing test (#54100)

ES behaves differently in master and in 7.x, causing the test to fail in
the latter.
---
 .../api_integration/apis/infra/log_entry_highlights.ts    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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']);
               }
             });
           });

From 54b2f148e3dd4eddfd16eda52a9f48c1ea02795f Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Tue, 7 Jan 2020 04:55:44 -0800
Subject: [PATCH 11/96] [ML] persist the brush when expanded to full width
 (#54020)

---
 .../components/timeseries_chart/timeseries_chart.js             | 2 --
 1 file changed, 2 deletions(-)

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])),

From 3c50551392ef6a310ab9a609513a5abb8b4f1706 Mon Sep 17 00:00:00 2001
From: Chris Mark <chrismarkou92@gmail.com>
Date: Tue, 7 Jan 2020 15:03:38 +0200
Subject: [PATCH 12/96] Add data ui for envoyproxy Metricbeat Module (#53476)

---
 .../tutorial_resources/logos/envoyproxy.svg   |  1 +
 .../tutorials/envoyproxy_metrics/index.js     | 60 +++++++++++++++++++
 .../kibana/server/tutorials/register.js       |  2 +
 3 files changed, 63 insertions(+)
 create mode 100644 src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/envoyproxy.svg
 create mode 100644 src/legacy/core_plugins/kibana/server/tutorials/envoyproxy_metrics/index.js

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/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);
 }

From 825748ea0c61e770390838d05738cbc6fc94a90d Mon Sep 17 00:00:00 2001
From: Silvia Mitter <silvia.mitter@elastic.co>
Date: Tue, 7 Jan 2020 14:57:43 +0100
Subject: [PATCH 13/96] update apm index pattern (#54095)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../core_plugins/kibana/server/tutorials/apm/index_pattern.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"
   },

From 8ac233f303a5f7b772a23de14e3f89158a90c824 Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Tue, 7 Jan 2020 06:14:32 -0800
Subject: [PATCH 14/96] [ML] Support search for partitions on Single Metric
 Viewer (#53879)

* [ML] agg for partition field values

* [ML] change api

* [ML] load entity values

* [ML] check for partition field names

* [ML] wip

* [ML] refactor api

* [ML] debounce input

* [ML] remove Record, improve types, fix typo

* [ML] jobId as dedicated param, jsdoc comments

* [ML] result_type term based on model plot config

* [ML] remove redundant criteria for job id

* [ML] refactor getPartitionFieldsValues to TS

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../services/ml_api_service/index.d.ts        |  10 +-
 .../services/ml_api_service/results.js        |  13 ++
 .../services/results_service/index.ts         |   2 +
 .../results_service/result_service_rx.ts      |  35 ++++
 .../entity_control/entity_control.js          | 120 -------------
 .../entity_control/entity_control.tsx         | 156 +++++++++++++++++
 .../entity_control/{index.js => index.ts}     |   0
 .../timeseriesexplorer/timeseriesexplorer.js  | 107 +++++++-----
 .../get_partition_fields_values.ts            | 161 ++++++++++++++++++
 .../models/results_service/results_service.js |   2 +
 .../ml/server/routes/results_service.js       |  20 +++
 11 files changed, 458 insertions(+), 168 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.js
 create mode 100644 x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx
 rename x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/{index.js => index.ts} (100%)
 create mode 100644 x-pack/legacy/plugins/ml/server/models/results_service/get_partition_fields_values.ts

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..39c69d4bbbeba5 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
@@ -124,6 +125,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/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/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/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,
+    },
+  });
 }

From ab76ee5a5815649a5222f35ccec8037d244cfff3 Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Tue, 7 Jan 2020 14:41:02 +0000
Subject: [PATCH 15/96] [Dashboard] Redesign empty screen in readonly mode
 (#54073)

* [Dashboard] Make empty screen nicer in readonly mode

* Adding contact-the-owner part

* Updating text
---
 .../dashboard_empty_screen.test.tsx.snap      | 362 ++++++++++++++++++
 .../__tests__/dashboard_empty_screen.test.tsx |  16 +-
 .../np_ready/dashboard_app_controller.tsx     |  24 +-
 .../np_ready/dashboard_empty_screen.tsx       |  58 ++-
 .../dashboard_empty_screen_constants.tsx      |  10 +
 5 files changed, 443 insertions(+), 27 deletions(-)

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!',

From a1176b0e4a7e61449509fffd5bff9f9d40e6c42a Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko <dzmitry.lemechko@elastic.co>
Date: Tue, 7 Jan 2020 15:42:20 +0100
Subject: [PATCH 16/96] Functional tests: refactor visualize_page (#53845)

* add new POs and services

* split visualize_page

* refactor PO and tests

* lost changes

* more fixes

* fix tslint error

* refactor POs

* add vega_chart_page, refactor

* review fix

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../apps/dashboard/dashboard_state.js         |   31 +-
 .../apps/getting_started/_shakespeare.js      |   63 +-
 test/functional/apps/visualize/_area_chart.js |  121 +-
 test/functional/apps/visualize/_data_table.js |  243 +--
 .../visualize/_data_table_nontimeindex.js     |   64 +-
 .../apps/visualize/_embedding_chart.js        |   34 +-
 .../apps/visualize/_experimental_vis.js       |    2 +-
 .../functional/apps/visualize/_gauge_chart.js |   46 +-
 .../apps/visualize/_heatmap_chart.js          |   50 +-
 .../visualize/_histogram_request_start.js     |   26 +-
 test/functional/apps/visualize/_inspector.js  |   26 +-
 test/functional/apps/visualize/_line_chart.js |   76 +-
 .../apps/visualize/_linked_saved_searches.js  |   21 +-
 .../apps/visualize/_markdown_vis.js           |   18 +-
 .../apps/visualize/_metric_chart.js           |   84 +-
 test/functional/apps/visualize/_pie_chart.js  |  151 +-
 .../apps/visualize/_point_series_options.js   |   77 +-
 test/functional/apps/visualize/_region_map.js |   22 +-
 test/functional/apps/visualize/_tag_cloud.js  |   47 +-
 test/functional/apps/visualize/_tile_map.js   |   65 +-
 test/functional/apps/visualize/_tsvb_chart.ts |    6 +-
 test/functional/apps/visualize/_tsvb_table.ts |    8 +-
 test/functional/apps/visualize/_vega_chart.js |   12 +-
 .../apps/visualize/_vertical_bar_chart.js     |  169 +-
 .../_vertical_bar_chart_nontimeindex.js       |  112 +-
 .../apps/visualize/_visualize_listing.js      |   39 +-
 .../input_control_vis/chained_controls.js     |    4 +-
 .../input_control_vis/dynamic_options.js      |    4 +-
 .../input_control_options.js                  |   36 +-
 .../input_control_vis/input_control_range.ts  |   36 +-
 test/functional/page_objects/index.ts         |   12 +-
 .../page_objects/point_series_page.js         |    4 -
 test/functional/page_objects/share_page.ts    |    5 +-
 .../functional/page_objects/tag_cloud_page.ts |   52 +
 test/functional/page_objects/tile_map_page.ts |  102 ++
 .../page_objects/vega_chart_page.ts           |   91 ++
 .../page_objects/visual_builder_page.ts       |   22 +-
 .../page_objects/visualize_chart_page.ts      |  386 +++++
 .../page_objects/visualize_editor_page.ts     |  462 ++++++
 .../functional/page_objects/visualize_page.js | 1402 -----------------
 .../functional/page_objects/visualize_page.ts |  328 ++++
 .../services/dashboard/visualizations.js      |    6 +-
 test/functional/services/index.ts             |    4 +-
 ...lize_listing_table.ts => listing_table.ts} |   58 +-
 test/functional/services/screenshots.ts       |    2 +-
 test/functional/services/test_subjects.ts     |   19 +
 .../self_changing_vis.js                      |    8 +-
 .../functional/apps/security/rbac_phase1.js   |   11 +-
 .../apps/visualize/hybrid_visualization.ts    |    4 +-
 x-pack/test/reporting/functional/reporting.js |    7 +-
 50 files changed, 2419 insertions(+), 2259 deletions(-)
 create mode 100644 test/functional/page_objects/tag_cloud_page.ts
 create mode 100644 test/functional/page_objects/tile_map_page.ts
 create mode 100644 test/functional/page_objects/vega_chart_page.ts
 create mode 100644 test/functional/page_objects/visualize_chart_page.ts
 create mode 100644 test/functional/page_objects/visualize_editor_page.ts
 delete mode 100644 test/functional/page_objects/visualize_page.js
 create mode 100644 test/functional/page_objects/visualize_page.ts
 rename test/functional/services/{visualize_listing_table.ts => listing_table.ts} (50%)

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/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/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();

From f46e8e2f0be3b9f49d384d157c2d42ced5e670f4 Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Tue, 7 Jan 2020 15:56:13 +0100
Subject: [PATCH 17/96] [SIEM] Fix doubled drag handles in Timeline (#52679)

---
 .../drag_and_drop/draggable_wrapper.tsx       | 147 +--------------
 .../drag_and_drop/provider_container.tsx      | 154 +++++++++++++++
 .../components/event_details/columns.tsx      |  32 +---
 .../event_details/event_fields_browser.tsx    |  43 +++--
 .../public/components/skeleton_row/index.tsx  |  25 ++-
 .../__snapshots__/index.test.tsx.snap         | 156 +++++-----------
 .../formatted_field.test.tsx.snap             |   5 +-
 .../get_column_renderer.test.tsx.snap         |  26 +--
 .../plain_column_renderer.test.tsx.snap       |  26 +--
 .../body/renderers/formatted_field.test.tsx   | 175 ++++++++++--------
 .../body/renderers/formatted_field.tsx        |  92 +++++----
 .../body/renderers/plain_column_renderer.tsx  | 109 ++---------
 12 files changed, 453 insertions(+), 537 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/components/drag_and_drop/provider_container.tsx

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/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(),
 };

From 6a2fb61ae50b84836583dd91c5fe2f1121bca4d2 Mon Sep 17 00:00:00 2001
From: nnamdifrankie <56440728+nnamdifrankie@users.noreply.github.com>
Date: Tue, 7 Jan 2020 09:59:11 -0500
Subject: [PATCH 18/96] EMT-issue-65: add endpoint list api (#53861)

add endpoint list api
---
 x-pack/plugins/endpoint/server/config.test.ts |  15 +
 x-pack/plugins/endpoint/server/config.ts      |  22 ++
 x-pack/plugins/endpoint/server/index.ts       |   8 +-
 x-pack/plugins/endpoint/server/plugin.test.ts |  39 ++
 x-pack/plugins/endpoint/server/plugin.ts      |  27 +-
 .../endpoint/server/routes/endpoints.test.ts  | 123 +++++++
 .../endpoint/server/routes/endpoints.ts       |  87 +++++
 .../endpoint/endpoint_query_builders.test.ts  |  54 +++
 .../endpoint/endpoint_query_builders.ts       |  66 ++++
 .../server/test_data/all_endpoints_data.json  | 348 ++++++++++++++++++
 x-pack/plugins/endpoint/server/types.ts       |  54 +++
 .../apis/endpoint/endpoints.ts                |  68 ++++
 .../api_integration/apis/endpoint/index.ts    |   1 +
 .../endpoint/endpoints/data.json.gz           | Bin 0 -> 822 bytes
 .../endpoint/endpoints/mappings.json          | 104 ++++++
 15 files changed, 1009 insertions(+), 7 deletions(-)
 create mode 100644 x-pack/plugins/endpoint/server/config.test.ts
 create mode 100644 x-pack/plugins/endpoint/server/config.ts
 create mode 100644 x-pack/plugins/endpoint/server/plugin.test.ts
 create mode 100644 x-pack/plugins/endpoint/server/routes/endpoints.test.ts
 create mode 100644 x-pack/plugins/endpoint/server/routes/endpoints.ts
 create mode 100644 x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts
 create mode 100644 x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts
 create mode 100644 x-pack/plugins/endpoint/server/test_data/all_endpoints_data.json
 create mode 100644 x-pack/plugins/endpoint/server/types.ts
 create mode 100644 x-pack/test/api_integration/apis/endpoint/endpoints.ts
 create mode 100644 x-pack/test/functional/es_archives/endpoint/endpoints/data.json.gz
 create mode 100644 x-pack/test/functional/es_archives/endpoint/endpoints/mappings.json

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/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/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 0000000000000000000000000000000000000000..fda46096e1ab2465cf93d6c8b09dd111aa85d9f6
GIT binary patch
literal 822
zcmV-61Ihd!iwFP!000026YW`DPunmQeebWR^308F$N56yp(`+H54>yw#!KbK4p>T)
zEOvkj^}o+4{a#ksI$#AyYL)n2pKD*=9Np7Cbh=$fk4xbkb{$?M&OtM9%d)x|c`y&=
zQS!!mj=z^zB>Kb$pT}Q@p*oWzIdyM5axU&0Cz12AkhunSEpk0KtD>%wC7>BeD#5hi
z1E!l<1Q7%X10vsWa7g1rj9s6ESF`!uCGHA_8D)u<w_?C$B@$g!V{@mp%&%*yZVY(N
zM$>)u&yJF6Y5{z3+&>ccY*c2VxlM}EB1jwHO`-H0W`W_(0Njn)ycjW=Pt(xuAk|>V
zlo-g7NssYMS*FCAy~voBMZUI8W2nTBS|~kGn(0~@YhGvB!K%l?vVmz#b;*~xZYC~_
zla<(Ik;!Dd8Tj$&(d>ejulePy#hmBtSfs4Zw9^_=iCh)cX2?=h$|PFk(~8kmE!sD_
zI%(31UzgVv<6<+w?~}MCQ=JWXr>TtfYW$;Gk!9nCk&C_9d;*uyaMeCy$$)WQ38kiv
z4159HgMfk`KpL(3{t|T6SZwCXNzKL@_Y3pZ7I&)qRaCd4>Jo%W`yt-V9L*w~Eg3OO
zzLB}9?#G((z0^x6hLrFKXo!7aaeyJDB;w6jz~e`>25HinbUF{uC!>qgJtm`OSQR;-
z9mr^b@!`m*PkJ$my%RVgQ4F+?deG}p3Q^x9J&NgRFYL9~@rBek-IH5W3+7lp93?$j
zF$+rasEdi`5)^D<B$II-K!Rb&fIytK5z->$-x5-=osi60(eoLJ1ySG;KZ1Y{InX4g
z5Jw&Y!Td0wQAo&;?7&Fpd(22?N1|d7>_A9!2-_Ul=I99~da6{Gy-|o<>c-wS8VW&}
zH#&wC1EUbOHb(P+|3hEo`F@B~k^*5k0m`EkB2Ebqff!@MIEZ+(0}ExZ!a}|kX|^x2
zQtb_;+CS}#URbN)J?12<)hs7jt@h5e+U4mUGm_P6R;yX9_Bu55vSRJ>b$&9UR;<~^
z$ci=lzuI#sDcfU8vRchjlGSSOO{?KOW+bcCEFW3L)=EYgy{S<92_<*7SNSLa0Kz?$
Ad;kCd

literal 0
HcmV?d00001

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

From 865462a259050d1666e0e24502eda9a090611dbf Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Tue, 7 Jan 2020 10:46:32 -0500
Subject: [PATCH 19/96] [ML] DF Analytics job creation: Add 'excludes' input
 field to form (#53856)

* Add exclude fields input to df analytics creation form

* rename explain api endpoint to general explainDataFrameAnalytics

* wip: use explain api for exclude fields

* show error message if classification depVar has cardinality of > 2

* update types

* updates after conflict resolution

* prevent creation if more than 2 distinct classes for class job. create form field validation file
---
 .../data_frame_analytics/common/analytics.ts  |  17 ++
 .../create_analytics_form.test.tsx            |   2 +-
 .../create_analytics_form.tsx                 | 272 +++++++++++++-----
 .../form_options_validation.ts                |  43 +++
 .../create_analytics_form/job_type.tsx        |   6 +-
 .../use_create_analytics_form/reducer.ts      |  29 +-
 .../hooks/use_create_analytics_form/state.ts  |  23 +-
 .../ml_api_service/data_frame_analytics.js    |   2 +-
 .../services/ml_api_service/index.d.ts        |   4 +-
 .../ml/server/client/elasticsearch_ml.js      |   2 +-
 .../ml/server/routes/data_frame_analytics.ts  |   2 +-
 11 files changed, 316 insertions(+), 86 deletions(-)
 create mode 100644 x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/form_options_validation.ts

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.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 39c69d4bbbeba5..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
@@ -90,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(
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/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,
           }

From c02531a494a3c61a59393832995823b9e39b58e8 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Tue, 7 Jan 2020 16:53:16 +0100
Subject: [PATCH 20/96] NP Migration: Move doc views registry and existing doc
 views into discover plugin (#53465)

---
 .../core_plugins/kbn_doc_views/index.js       | 26 -------
 .../core_plugins/kbn_doc_views/package.json   |  4 --
 .../kbn_doc_views/public/kbn_doc_views.js     | 21 ------
 .../kbn_doc_views/public/views/json.tsx       | 33 ---------
 .../kbn_doc_views/public/views/table.ts       | 31 ---------
 .../kibana/public/discover/build_services.ts  | 21 ++++--
 .../kibana/public/discover/index.ts           | 18 +++--
 .../kibana/public/discover/kibana_services.ts |  8 +--
 .../np_ready/components/doc/doc.test.tsx      |  4 +-
 .../components/doc/use_es_doc_search.test.tsx |  8 +--
 .../components/doc_viewer/doc_viewer.test.tsx | 42 +++++------
 .../components/doc_viewer/doc_viewer.tsx      |  3 +-
 .../doc_viewer/doc_viewer_render_tab.test.tsx |  2 +-
 .../doc_viewer/doc_viewer_render_tab.tsx      |  2 +-
 .../components/doc_viewer/doc_viewer_tab.tsx  |  2 +-
 .../json_code_block.test.tsx.snap             |  0
 .../json_code_block}/json_code_block.test.tsx |  2 +-
 .../json_code_block}/json_code_block.tsx      |  4 +-
 .../np_ready/components}/table/table.test.tsx |  2 +-
 .../np_ready/components}/table/table.tsx      |  2 +-
 .../components}/table/table_helper.test.ts    |  0
 .../components}/table/table_helper.tsx        |  0
 .../np_ready/components}/table/table_row.tsx  |  6 +-
 .../table/table_row_btn_collapse.tsx          |  2 +-
 .../table/table_row_btn_filter_add.tsx        |  6 +-
 .../table/table_row_btn_filter_exists.tsx     | 15 ++--
 .../table/table_row_btn_filter_remove.tsx     |  6 +-
 .../table/table_row_btn_toggle_column.tsx     | 20 ++++--
 .../table/table_row_icon_no_mapping.tsx       | 20 ++++--
 .../table/table_row_icon_underscore.tsx       |  4 +-
 .../np_ready/doc_views}/doc_views_helpers.tsx | 12 ++--
 .../np_ready/doc_views/doc_views_registry.ts  | 50 ++++++++++++++
 .../np_ready/doc_views}/doc_views_types.ts    |  2 +-
 .../kibana/public/discover/plugin.ts          | 41 +++++++++--
 src/legacy/ui/public/registry/doc_views.ts    | 69 -------------------
 .../translations/translations/ja-JP.json      | 40 +++++------
 .../translations/translations/zh-CN.json      | 40 +++++------
 37 files changed, 244 insertions(+), 324 deletions(-)
 delete mode 100644 src/legacy/core_plugins/kbn_doc_views/index.js
 delete mode 100644 src/legacy/core_plugins/kbn_doc_views/package.json
 delete mode 100644 src/legacy/core_plugins/kbn_doc_views/public/kbn_doc_views.js
 delete mode 100644 src/legacy/core_plugins/kbn_doc_views/public/views/json.tsx
 delete mode 100644 src/legacy/core_plugins/kbn_doc_views/public/views/table.ts
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components/json_code_block}/__snapshots__/json_code_block.test.tsx.snap (100%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components/json_code_block}/json_code_block.test.tsx (94%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components/json_code_block}/json_code_block.tsx (88%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table.test.tsx (98%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table.tsx (97%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_helper.test.ts (100%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_helper.tsx (100%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_row.tsx (96%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_row_btn_collapse.tsx (94%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_row_btn_filter_add.tsx (87%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_row_btn_filter_exists.tsx (80%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_row_btn_filter_remove.tsx (87%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_row_btn_toggle_column.tsx (79%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_row_icon_no_mapping.tsx (74%)
 rename src/legacy/core_plugins/{kbn_doc_views/public/views => kibana/public/discover/np_ready/components}/table/table_row_icon_underscore.tsx (89%)
 rename src/legacy/{ui/public/registry => core_plugins/kibana/public/discover/np_ready/doc_views}/doc_views_helpers.tsx (92%)
 create mode 100644 src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts
 rename src/legacy/{ui/public/registry => core_plugins/kibana/public/discover/np_ready/doc_views}/doc_views_types.ts (97%)
 delete mode 100644 src/legacy/ui/public/registry/doc_views.ts

diff --git a/src/legacy/core_plugins/kbn_doc_views/index.js b/src/legacy/core_plugins/kbn_doc_views/index.js
deleted file mode 100644
index 9078a82d633811..00000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export default function(kibana) {
-  return new kibana.Plugin({
-    uiExports: {
-      docViews: ['plugins/kbn_doc_views/kbn_doc_views'],
-    },
-  });
-}
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/kbn_doc_views/public/views/table.ts b/src/legacy/core_plugins/kbn_doc_views/public/views/table.ts
deleted file mode 100644
index f90840f1950039..00000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table.ts
+++ /dev/null
@@ -1,31 +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 _ from 'lodash';
-import { addDocView } from 'ui/registry/doc_views';
-import { i18n } from '@kbn/i18n';
-import { DocViewTable } from './table/table';
-
-addDocView({
-  title: i18n.translate('kbnDocViews.table.tableTitle', {
-    defaultMessage: 'Table',
-  }),
-  order: 10,
-  component: DocViewTable,
-});
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/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/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index af43110a8ba5e8..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": "系列を分割",
@@ -12702,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 0306edcabd67d2..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": "拆分序列",
@@ -12791,4 +12791,4 @@
     "xpack.licensing.welcomeBanner.licenseIsExpiredDescription.updateYourLicenseLinkText": "更新您的许可",
     "xpack.licensing.welcomeBanner.licenseIsExpiredTitle": "您的{licenseType}许可已过期"
   }
-}
\ No newline at end of file
+}

From 28b6efa260e6170bd46e8d898fc1698b0437bde9 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Tue, 7 Jan 2020 11:31:15 -0500
Subject: [PATCH 21/96] Fix linting issues (#54068)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .eslintrc.js                                  | 21 -------------------
 x-pack/legacy/plugins/monitoring/index.js     |  2 +-
 .../public/components/chart/chart_target.js   |  2 +-
 .../components/chart/chart_target.test.js     |  4 ++--
 .../shard_allocation/components/assigned.js   |  3 +++
 .../pipeline_viewer/views/detail_drawer.js    |  6 +++---
 .../public/services/executor_provider.js      |  2 +-
 .../public/views/elasticsearch/nodes/index.js |  1 +
 .../views/logstash/node/pipelines/index.js    |  1 +
 .../public/views/logstash/pipelines/index.js  |  1 +
 .../monitoring/server/cloud/cloud_service.js  |  2 +-
 .../lib/metrics/elasticsearch/classes.js      |  2 +-
 .../server/lib/metrics/logstash/classes.js    |  4 ++--
 13 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 03a674993ab507..5892d20e61e8ce 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: {
@@ -814,21 +808,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/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);
 

From cca454f7aa11e894c0c12c3aca8d96c2bcb759a2 Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Tue, 7 Jan 2020 16:36:18 +0000
Subject: [PATCH 22/96] Changing background color to align with EUI color
 (#54060)

* Changing background color to align with EUI color

* Removing background-color from theme
---
 src/core/server/rendering/views/styles.tsx | 4 ----
 1 file changed, 4 deletions(-)

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;

From 91173525c39ea4ee149a78932f00fcc1327bcd27 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Tue, 7 Jan 2020 08:37:58 -0800
Subject: [PATCH 23/96] [DOCS][Reporting] Adds info about using a custom
 reporting index (#54052)

* [DOCS][Reporting] Adds info about using a custom reporting index

* [DOCS] Incorporates edits into reporting security doc
---
 docs/user/security/reporting.asciidoc | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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

From 6e1328b9f076bfa0a3c5c44cc0499c25833c329a Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Tue, 7 Jan 2020 17:46:56 +0100
Subject: [PATCH 24/96] [SIEM] Enable eslint react/no-children-prop (#53985)

---
 .eslintrc.js                                             | 9 +++------
 .../plugins/siem/public/components/draggables/index.tsx  | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 5892d20e61e8ce..55ae66c9e5e6aa 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -723,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',
@@ -745,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',
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>
           )
         }
       />

From 4b6c2f84e179c5ff016c2623f06962c15d056e62 Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Tue, 7 Jan 2020 11:50:08 -0500
Subject: [PATCH 25/96] Elasticsearch snapshots automation (#53706)

---
 .ci/es-snapshots/Jenkinsfile_build_es         | 162 +++++++++++++++
 .ci/es-snapshots/Jenkinsfile_trigger_build_es |  19 ++
 .ci/es-snapshots/Jenkinsfile_verify_es        |  72 +++++++
 packages/kbn-es/src/artifact.js               | 157 +++++++-------
 packages/kbn-es/src/artifact.test.js          | 191 ++++++++++++++++++
 packages/kbn-es/src/custom_snapshots.js       |   9 +-
 vars/esSnapshots.groovy                       |  50 +++++
 vars/kibanaPipeline.groovy                    |   9 +-
 vars/retryWithDelay.groovy                    |  16 ++
 9 files changed, 592 insertions(+), 93 deletions(-)
 create mode 100644 .ci/es-snapshots/Jenkinsfile_build_es
 create mode 100644 .ci/es-snapshots/Jenkinsfile_trigger_build_es
 create mode 100644 .ci/es-snapshots/Jenkinsfile_verify_es
 create mode 100644 packages/kbn-es/src/artifact.test.js
 create mode 100644 vars/esSnapshots.groovy
 create mode 100644 vars/retryWithDelay.groovy

diff --git a/.ci/es-snapshots/Jenkinsfile_build_es b/.ci/es-snapshots/Jenkinsfile_build_es
new file mode 100644
index 00000000000000..ad0ad54275e12d
--- /dev/null
+++ b/.ci/es-snapshots/Jenkinsfile_build_es
@@ -0,0 +1,162 @@
+#!/bin/groovy
+
+// This job effectively has two SCM configurations:
+// one for kibana, used to check out this Jenkinsfile (which means it's the job's main SCM configuration), as well as kick-off the downstream verification job
+// one for elasticsearch, used to check out the elasticsearch source before building it
+
+// There are two parameters that drive which branch is checked out for each of these, but they will typically be the same
+// 'branch_specifier' is for kibana / the job itself
+// ES_BRANCH is for elasticsearch
+
+library 'kibana-pipeline-library'
+kibanaLibrary.load()
+
+def ES_BRANCH = params.ES_BRANCH
+
+if (!ES_BRANCH) {
+  error "Parameter 'ES_BRANCH' must be specified."
+}
+
+currentBuild.displayName += " - ${ES_BRANCH}"
+currentBuild.description = "ES: ${ES_BRANCH}<br />Kibana: ${params.branch_specifier}"
+
+def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
+
+timeout(time: 120, unit: 'MINUTES') {
+  timestamps {
+    ansiColor('xterm') {
+      node('linux && immutable') {
+        catchError {
+          def VERSION
+          def SNAPSHOT_ID
+          def DESTINATION
+
+          def scmVars = checkoutEs(ES_BRANCH)
+          def GIT_COMMIT = scmVars.GIT_COMMIT
+          def GIT_COMMIT_SHORT = sh(script: "git rev-parse --short ${GIT_COMMIT}", returnStdout: true).trim()
+
+          buildArchives('to-archive')
+
+          dir('to-archive') {
+            def now = new Date()
+            def date = now.format("yyyyMMdd-HHmmss")
+
+            def filesRaw = sh(script: "ls -1", returnStdout: true).trim()
+            def files = filesRaw
+              .split("\n")
+              .collect { filename ->
+                // Filename examples
+                // elasticsearch-oss-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
+                // elasticsearch-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
+                def parts = filename.replace("elasticsearch-oss", "oss").split("-")
+
+                VERSION = VERSION ?: parts[1]
+                SNAPSHOT_ID = SNAPSHOT_ID ?: "${date}_${GIT_COMMIT_SHORT}"
+                DESTINATION = DESTINATION ?: "${VERSION}/archives/${SNAPSHOT_ID}"
+
+                return [
+                  filename: filename,
+                  checksum: filename + '.sha512',
+                  url: "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${DESTINATION}/${filename}".toString(),
+                  version: parts[1],
+                  platform: parts[3],
+                  architecture: parts[4].split('\\.')[0],
+                  license: parts[0] == 'oss' ? 'oss' : 'default',
+                ]
+              }
+
+            sh 'find * -exec bash -c "shasum -a 512 {} > {}.sha512" \\;'
+
+            def manifest = [
+              bucket: "kibana-ci-es-snapshots-daily/${DESTINATION}".toString(),
+              branch: ES_BRANCH,
+              sha: GIT_COMMIT,
+              sha_short: GIT_COMMIT_SHORT,
+              version: VERSION,
+              generated: now.format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC")),
+              archives: files,
+            ]
+            def manifestJson = toJSON(manifest).toString()
+            writeFile file: 'manifest.json', text: manifestJson
+
+            upload(DESTINATION, '*.*')
+
+            sh "cp manifest.json manifest-latest.json"
+            upload(VERSION, 'manifest-latest.json')
+          }
+
+          if (PROMOTE_WITHOUT_VERIFY) {
+            esSnapshots.promote(VERSION, SNAPSHOT_ID)
+
+            emailext(
+              to: 'build-kibana@elastic.co',
+              subject: "ES snapshot promoted without verification: ${params.ES_BRANCH}",
+              body: '${SCRIPT,template="groovy-html.template"}',
+              mimeType: 'text/html',
+            )
+          } else {
+            build(
+              propagate: false,
+              wait: false,
+              job: 'elasticsearch+snapshots+verify',
+              parameters: [
+                string(name: 'branch_specifier', value: branch_specifier),
+                string(name: 'SNAPSHOT_VERSION', value: VERSION),
+                string(name: 'SNAPSHOT_ID', value: SNAPSHOT_ID),
+              ]
+            )
+          }
+        }
+
+        kibanaPipeline.sendMail()
+      }
+    }
+  }
+}
+
+def checkoutEs(branch) {
+  retryWithDelay(8, 15) {
+    return checkout([
+      $class: 'GitSCM',
+      branches: [[name: branch]],
+      doGenerateSubmoduleConfigurations: false,
+      extensions: [],
+      submoduleCfg: [],
+      userRemoteConfigs: [[
+        credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba',
+        url: 'git@github.com:elastic/elasticsearch',
+      ]],
+    ])
+  }
+}
+
+def upload(destination, pattern) {
+  return googleStorageUpload(
+    credentialsId: 'kibana-ci-gcs-plugin',
+    bucket: "gs://kibana-ci-es-snapshots-daily/${destination}",
+    pattern: pattern,
+    sharedPublicly: false,
+    showInline: false,
+  )
+}
+
+def buildArchives(destination) {
+  def props = readProperties file: '.ci/java-versions.properties'
+  withEnv([
+    // Select the correct JDK for this branch
+    "PATH=/var/lib/jenkins/.java/${props.ES_BUILD_JAVA}/bin:${env.PATH}",
+
+    // These Jenkins env vars trigger some automation in the elasticsearch repo that we don't want
+    "BUILD_NUMBER=",
+    "JENKINS_URL=",
+    "BUILD_URL=",
+    "JOB_NAME=",
+    "NODE_NAME=",
+  ]) {
+    sh """
+      ./gradlew -p distribution/archives assemble --parallel
+      mkdir -p ${destination}
+      find distribution/archives -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -exec cp {} ${destination} \\;
+    """
+  }
+}
diff --git a/.ci/es-snapshots/Jenkinsfile_trigger_build_es b/.ci/es-snapshots/Jenkinsfile_trigger_build_es
new file mode 100644
index 00000000000000..186917e9678245
--- /dev/null
+++ b/.ci/es-snapshots/Jenkinsfile_trigger_build_es
@@ -0,0 +1,19 @@
+#!/bin/groovy
+
+if (!params.branches_yaml) {
+  error "'branches_yaml' parameter must be specified"
+}
+
+def branches = readYaml text: params.branches_yaml
+
+branches.each { branch ->
+  build(
+    propagate: false,
+    wait: false,
+    job: 'elasticsearch+snapshots+build',
+    parameters: [
+      string(name: 'branch_specifier', value: branch),
+      string(name: 'ES_BRANCH', value: branch),
+    ]
+  )
+}
diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
new file mode 100644
index 00000000000000..3d5ec75fa0e72a
--- /dev/null
+++ b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -0,0 +1,72 @@
+#!/bin/groovy
+
+library 'kibana-pipeline-library'
+kibanaLibrary.load()
+
+def SNAPSHOT_VERSION = params.SNAPSHOT_VERSION
+def SNAPSHOT_ID = params.SNAPSHOT_ID
+
+if (!SNAPSHOT_VERSION) {
+  error "Parameter SNAPSHOT_VERSION must be specified"
+}
+
+if (!SNAPSHOT_ID) {
+  error "Parameter SNAPSHOT_ID must be specified"
+}
+
+currentBuild.displayName += " - ${SNAPSHOT_VERSION}"
+currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch_specifier}"
+
+def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
+
+timeout(time: 120, unit: 'MINUTES') {
+  timestamps {
+    ansiColor('xterm') {
+      catchError {
+        withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
+          parallel([
+            // TODO we just need to run integration tests from intake?
+            'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
+            'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
+            'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
+              'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
+              'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
+              'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
+              'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
+              'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
+              'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
+              'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
+              'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
+              'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
+              'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
+              'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
+              'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
+            ]),
+            'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
+              'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
+              'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
+              'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
+              'xpack-ciGroup4': kibanaPipeline.getXpackCiGroupWorker(4),
+              'xpack-ciGroup5': kibanaPipeline.getXpackCiGroupWorker(5),
+              'xpack-ciGroup6': kibanaPipeline.getXpackCiGroupWorker(6),
+              'xpack-ciGroup7': kibanaPipeline.getXpackCiGroupWorker(7),
+              'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
+              'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
+              'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
+            ]),
+          ])
+        }
+
+        promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
+      }
+
+      kibanaPipeline.sendMail()
+    }
+  }
+}
+
+def promoteSnapshot(snapshotVersion, snapshotId) {
+  node('linux && immutable') {
+    esSnapshots.promote(snapshotVersion, snapshotId)
+  }
+}
diff --git a/packages/kbn-es/src/artifact.js b/packages/kbn-es/src/artifact.js
index 19d95e82fe4800..9ea78386269d93 100644
--- a/packages/kbn-es/src/artifact.js
+++ b/packages/kbn-es/src/artifact.js
@@ -27,16 +27,14 @@ const { createHash } = require('crypto');
 const path = require('path');
 
 const asyncPipeline = promisify(pipeline);
-const V1_VERSIONS_API = 'https://artifacts-api.elastic.co/v1/versions';
+const DAILY_SNAPSHOTS_BASE_URL = 'https://storage.googleapis.com/kibana-ci-es-snapshots-daily';
+const PERMANENT_SNAPSHOTS_BASE_URL =
+  'https://storage.googleapis.com/kibana-ci-es-snapshots-permanent';
 
 const { cache } = require('./utils');
 const { resolveCustomSnapshotUrl } = require('./custom_snapshots');
 const { createCliError, isCliError } = require('./errors');
 
-const TEST_ES_SNAPSHOT_VERSION = process.env.TEST_ES_SNAPSHOT_VERSION
-  ? process.env.TEST_ES_SNAPSHOT_VERSION
-  : 'latest';
-
 function getChecksumType(checksumUrl) {
   if (checksumUrl.endsWith('.sha512')) {
     return 'sha512';
@@ -45,20 +43,6 @@ function getChecksumType(checksumUrl) {
   throw new Error(`unable to determine checksum type: ${checksumUrl}`);
 }
 
-function getPlatform(key) {
-  if (key.includes('-linux-')) {
-    return 'linux';
-  }
-
-  if (key.includes('-windows-')) {
-    return 'win32';
-  }
-
-  if (key.includes('-darwin-')) {
-    return 'darwin';
-  }
-}
-
 function headersToString(headers, indent = '') {
   return [...headers.entries()].reduce(
     (acc, [key, value]) => `${acc}\n${indent}${key}: ${value}`,
@@ -85,6 +69,75 @@ async function retry(log, fn) {
   return await doAttempt(1);
 }
 
+// Setting this flag provides an easy way to run the latest un-promoted snapshot without having to look it up
+function shouldUseUnverifiedSnapshot() {
+  return !!process.env.KBN_ES_SNAPSHOT_USE_UNVERIFIED;
+}
+
+async function fetchSnapshotManifest(url, log) {
+  log.info('Downloading snapshot manifest from %s', chalk.bold(url));
+
+  const abc = new AbortController();
+  const resp = await retry(log, async () => await fetch(url, { signal: abc.signal }));
+  const json = await resp.text();
+
+  return { abc, resp, json };
+}
+
+async function getArtifactSpecForSnapshot(urlVersion, license, log) {
+  const desiredVersion = urlVersion.replace('-SNAPSHOT', '');
+  const desiredLicense = license === 'oss' ? 'oss' : 'default';
+
+  const customManifestUrl = process.env.ES_SNAPSHOT_MANIFEST;
+  const primaryManifestUrl = `${DAILY_SNAPSHOTS_BASE_URL}/${desiredVersion}/manifest-latest${
+    shouldUseUnverifiedSnapshot() ? '' : '-verified'
+  }.json`;
+  const secondaryManifestUrl = `${PERMANENT_SNAPSHOTS_BASE_URL}/${desiredVersion}/manifest.json`;
+
+  let { abc, resp, json } = await fetchSnapshotManifest(
+    customManifestUrl || primaryManifestUrl,
+    log
+  );
+
+  if (!customManifestUrl && !shouldUseUnverifiedSnapshot() && resp.status === 404) {
+    log.info('Daily snapshot manifest not found, falling back to permanent manifest');
+    ({ abc, resp, json } = await fetchSnapshotManifest(secondaryManifestUrl, log));
+  }
+
+  if (resp.status === 404) {
+    abc.abort();
+    throw createCliError(`Snapshots for ${desiredVersion} are not available`);
+  }
+
+  if (!resp.ok) {
+    abc.abort();
+    throw new Error(`Unable to read snapshot manifest: ${resp.statusText}\n  ${json}`);
+  }
+
+  const manifest = JSON.parse(json);
+
+  const platform = process.platform === 'win32' ? 'windows' : process.platform;
+  const archive = manifest.archives.find(
+    archive =>
+      archive.version === desiredVersion &&
+      archive.platform === platform &&
+      archive.license === desiredLicense
+  );
+
+  if (!archive) {
+    throw createCliError(
+      `Snapshots for ${desiredVersion} are available, but couldn't find an artifact in the manifest for [${desiredVersion}, ${desiredLicense}, ${platform}]`
+    );
+  }
+
+  return {
+    url: archive.url,
+    checksumUrl: archive.url + '.sha512',
+    checksumType: 'sha512',
+    filename: archive.filename,
+  };
+}
+
 exports.Artifact = class Artifact {
   /**
    * Fetch an Artifact from the Artifact API for a license level and version
@@ -100,71 +153,7 @@ exports.Artifact = class Artifact {
       return new Artifact(customSnapshotArtifactSpec, log);
     }
 
-    const urlBuild = encodeURIComponent(TEST_ES_SNAPSHOT_VERSION);
-    const url = `${V1_VERSIONS_API}/${urlVersion}/builds/${urlBuild}/projects/elasticsearch`;
-
-    const json = await retry(log, async () => {
-      log.info('downloading artifact info from %s', chalk.bold(url));
-
-      const abc = new AbortController();
-      const resp = await fetch(url, { signal: abc.signal });
-      const json = await resp.text();
-
-      if (resp.status === 404) {
-        abc.abort();
-        throw createCliError(
-          `Snapshots for ${version}/${TEST_ES_SNAPSHOT_VERSION} are not available`
-        );
-      }
-
-      if (!resp.ok) {
-        abc.abort();
-        throw new Error(`Unable to read artifact info from ${url}: ${resp.statusText}\n  ${json}`);
-      }
-
-      return json;
-    });
-
-    // parse the api response into an array of Artifact objects
-    const {
-      project: { packages: artifactInfoMap },
-    } = JSON.parse(json);
-    const filenames = Object.keys(artifactInfoMap);
-    const hasNoJdkVersions = filenames.some(filename => filename.includes('-no-jdk-'));
-    const artifactSpecs = filenames.map(filename => ({
-      filename,
-      url: artifactInfoMap[filename].url,
-      checksumUrl: artifactInfoMap[filename].sha_url,
-      checksumType: getChecksumType(artifactInfoMap[filename].sha_url),
-      type: artifactInfoMap[filename].type,
-      isOss: filename.includes('-oss-'),
-      platform: getPlatform(filename),
-      jdkRequired: hasNoJdkVersions ? filename.includes('-no-jdk-') : true,
-    }));
-
-    // pick the artifact we are going to use for this license/version combo
-    const reqOss = license === 'oss';
-    const reqPlatform = artifactSpecs.some(a => a.platform !== undefined)
-      ? process.platform
-      : undefined;
-    const reqJdkRequired = hasNoJdkVersions ? false : true;
-    const reqType = process.platform === 'win32' ? 'zip' : 'tar';
-
-    const artifactSpec = artifactSpecs.find(
-      spec =>
-        spec.isOss === reqOss &&
-        spec.type === reqType &&
-        spec.platform === reqPlatform &&
-        spec.jdkRequired === reqJdkRequired
-    );
-
-    if (!artifactSpec) {
-      throw new Error(
-        `Unable to determine artifact for license [${license}] and version [${version}]\n` +
-          `  options: ${filenames.join(',')}`
-      );
-    }
-
+    const artifactSpec = await getArtifactSpecForSnapshot(urlVersion, license, log);
     return new Artifact(artifactSpec, log);
   }
 
diff --git a/packages/kbn-es/src/artifact.test.js b/packages/kbn-es/src/artifact.test.js
new file mode 100644
index 00000000000000..985b65c7475634
--- /dev/null
+++ b/packages/kbn-es/src/artifact.test.js
@@ -0,0 +1,191 @@
+/*
+ * 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 { ToolingLog } from '@kbn/dev-utils';
+jest.mock('node-fetch');
+import fetch from 'node-fetch';
+const { Response } = jest.requireActual('node-fetch');
+
+import { Artifact } from './artifact';
+
+const log = new ToolingLog();
+let MOCKS;
+
+const PLATFORM = process.platform === 'win32' ? 'windows' : process.platform;
+const MOCK_VERSION = 'test-version';
+const MOCK_URL = 'http://127.0.0.1:12345';
+const MOCK_FILENAME = 'test-filename';
+
+const DAILY_SNAPSHOT_BASE_URL = 'https://storage.googleapis.com/kibana-ci-es-snapshots-daily';
+const PERMANENT_SNAPSHOT_BASE_URL =
+  'https://storage.googleapis.com/kibana-ci-es-snapshots-permanent';
+
+const createArchive = (params = {}) => {
+  const license = params.license || 'default';
+
+  return {
+    license: 'default',
+    version: MOCK_VERSION,
+    url: MOCK_URL + `/${license}`,
+    platform: PLATFORM,
+    filename: MOCK_FILENAME + `.${license}`,
+    ...params,
+  };
+};
+
+const mockFetch = mock =>
+  fetch.mockReturnValue(Promise.resolve(new Response(JSON.stringify(mock))));
+
+let previousSnapshotManifestValue = null;
+
+beforeAll(() => {
+  if ('ES_SNAPSHOT_MANIFEST' in process.env) {
+    previousSnapshotManifestValue = process.env.ES_SNAPSHOT_MANIFEST;
+    delete process.env.ES_SNAPSHOT_MANIFEST;
+  }
+});
+
+afterAll(() => {
+  if (previousSnapshotManifestValue !== null) {
+    process.env.ES_SNAPSHOT_MANIFEST = previousSnapshotManifestValue;
+  } else {
+    delete process.env.ES_SNAPSHOT_MANIFEST;
+  }
+});
+
+beforeEach(() => {
+  jest.resetAllMocks();
+
+  MOCKS = {
+    valid: {
+      archives: [createArchive({ license: 'oss' }), createArchive({ license: 'default' })],
+    },
+  };
+});
+
+const artifactTest = (requestedLicense, expectedLicense, fetchTimesCalled = 1) => {
+  return async () => {
+    const artifact = await Artifact.getSnapshot(requestedLicense, MOCK_VERSION, log);
+    expect(fetch).toHaveBeenCalledTimes(fetchTimesCalled);
+    expect(fetch.mock.calls[0][0]).toEqual(
+      `${DAILY_SNAPSHOT_BASE_URL}/${MOCK_VERSION}/manifest-latest-verified.json`
+    );
+    if (fetchTimesCalled === 2) {
+      expect(fetch.mock.calls[1][0]).toEqual(
+        `${PERMANENT_SNAPSHOT_BASE_URL}/${MOCK_VERSION}/manifest.json`
+      );
+    }
+    expect(artifact.getUrl()).toEqual(MOCK_URL + `/${expectedLicense}`);
+    expect(artifact.getChecksumUrl()).toEqual(MOCK_URL + `/${expectedLicense}.sha512`);
+    expect(artifact.getChecksumType()).toEqual('sha512');
+    expect(artifact.getFilename()).toEqual(MOCK_FILENAME + `.${expectedLicense}`);
+  };
+};
+
+describe('Artifact', () => {
+  describe('getSnapshot()', () => {
+    describe('with default snapshot', () => {
+      beforeEach(() => {
+        mockFetch(MOCKS.valid);
+      });
+
+      it('should return artifact metadata for a daily oss artifact', artifactTest('oss', 'oss'));
+
+      it(
+        'should return artifact metadata for a daily default artifact',
+        artifactTest('default', 'default')
+      );
+
+      it(
+        'should default to default license with anything other than "oss"',
+        artifactTest('INVALID_LICENSE', 'default')
+      );
+
+      it('should throw when an artifact cannot be found in the manifest for the specified parameters', async () => {
+        await expect(Artifact.getSnapshot('default', 'INVALID_VERSION', log)).rejects.toThrow(
+          "couldn't find an artifact"
+        );
+      });
+    });
+
+    describe('with missing default snapshot', () => {
+      beforeEach(() => {
+        fetch.mockReturnValueOnce(Promise.resolve(new Response('', { status: 404 })));
+        mockFetch(MOCKS.valid);
+      });
+
+      it(
+        'should return artifact metadata for a permanent oss artifact',
+        artifactTest('oss', 'oss', 2)
+      );
+
+      it(
+        'should return artifact metadata for a permanent default artifact',
+        artifactTest('default', 'default', 2)
+      );
+
+      it(
+        'should default to default license with anything other than "oss"',
+        artifactTest('INVALID_LICENSE', 'default', 2)
+      );
+
+      it('should throw when an artifact cannot be found in the manifest for the specified parameters', async () => {
+        await expect(Artifact.getSnapshot('default', 'INVALID_VERSION', log)).rejects.toThrow(
+          "couldn't find an artifact"
+        );
+      });
+    });
+
+    describe('with custom snapshot manifest URL', () => {
+      const CUSTOM_URL = 'http://www.creedthoughts.gov.www/creedthoughts';
+
+      beforeEach(() => {
+        process.env.ES_SNAPSHOT_MANIFEST = CUSTOM_URL;
+        mockFetch(MOCKS.valid);
+      });
+
+      it('should use the custom URL when looking for a snapshot', async () => {
+        await Artifact.getSnapshot('oss', MOCK_VERSION, log);
+        expect(fetch.mock.calls[0][0]).toEqual(CUSTOM_URL);
+      });
+
+      afterEach(() => {
+        delete process.env.ES_SNAPSHOT_MANIFEST;
+      });
+    });
+
+    describe('with latest unverified snapshot', () => {
+      beforeEach(() => {
+        process.env.KBN_ES_SNAPSHOT_USE_UNVERIFIED = 1;
+        mockFetch(MOCKS.valid);
+      });
+
+      it('should use the daily unverified URL when looking for a snapshot', async () => {
+        await Artifact.getSnapshot('oss', MOCK_VERSION, log);
+        expect(fetch.mock.calls[0][0]).toEqual(
+          `${DAILY_SNAPSHOT_BASE_URL}/${MOCK_VERSION}/manifest-latest.json`
+        );
+      });
+
+      afterEach(() => {
+        delete process.env.KBN_ES_SNAPSHOT_USE_UNVERIFIED;
+      });
+    });
+  });
+});
diff --git a/packages/kbn-es/src/custom_snapshots.js b/packages/kbn-es/src/custom_snapshots.js
index 74de3c2c792fdc..c6b00f77f0a881 100644
--- a/packages/kbn-es/src/custom_snapshots.js
+++ b/packages/kbn-es/src/custom_snapshots.js
@@ -25,8 +25,13 @@ function isVersionFlag(a) {
 
 function getCustomSnapshotUrl() {
   // force use of manually created snapshots until ReindexPutMappings fix
-  if (!process.env.KBN_ES_SNAPSHOT_URL && !process.argv.some(isVersionFlag)) {
-    return 'https://storage.googleapis.com/kibana-ci-tmp-artifacts/{name}-{version}-{os}-x86_64.{ext}';
+  if (
+    !process.env.ES_SNAPSHOT_MANIFEST &&
+    !process.env.KBN_ES_SNAPSHOT_URL &&
+    !process.argv.some(isVersionFlag)
+  ) {
+    // return 'https://storage.googleapis.com/kibana-ci-tmp-artifacts/{name}-{version}-{os}-x86_64.{ext}';
+    return;
   }
 
   if (process.env.KBN_ES_SNAPSHOT_URL && process.env.KBN_ES_SNAPSHOT_URL !== 'false') {
diff --git a/vars/esSnapshots.groovy b/vars/esSnapshots.groovy
new file mode 100644
index 00000000000000..884fbcdb17aebb
--- /dev/null
+++ b/vars/esSnapshots.groovy
@@ -0,0 +1,50 @@
+def promote(snapshotVersion, snapshotId) {
+  def snapshotDestination = "${snapshotVersion}/archives/${snapshotId}"
+  def MANIFEST_URL = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${snapshotDestination}/manifest.json"
+
+  dir('verified-manifest') {
+    def verifiedSnapshotFilename = 'manifest-latest-verified.json'
+
+    sh """
+      curl -O '${MANIFEST_URL}'
+      mv manifest.json ${verifiedSnapshotFilename}
+    """
+
+    googleStorageUpload(
+      credentialsId: 'kibana-ci-gcs-plugin',
+      bucket: "gs://kibana-ci-es-snapshots-daily/${snapshotVersion}",
+      pattern: verifiedSnapshotFilename,
+      sharedPublicly: false,
+      showInline: false,
+    )
+  }
+
+  // This would probably be more efficient if we could just copy using gsutil and specifying buckets for src and dest
+  // But we don't currently have access to the GCS credentials in a way that can be consumed easily from here...
+  dir('transfer-to-permanent') {
+    googleStorageDownload(
+      credentialsId: 'kibana-ci-gcs-plugin',
+      bucketUri: "gs://kibana-ci-es-snapshots-daily/${snapshotDestination}/*",
+      localDirectory: '.',
+      pathPrefix: snapshotDestination,
+    )
+
+    def manifestJson = readFile file: 'manifest.json'
+    writeFile(
+      file: 'manifest.json',
+      text: manifestJson.replace("kibana-ci-es-snapshots-daily/${snapshotDestination}", "kibana-ci-es-snapshots-permanent/${snapshotVersion}")
+    )
+
+    // Ideally we would have some delete logic here before uploading,
+    // But we don't currently have access to the GCS credentials in a way that can be consumed easily from here...
+    googleStorageUpload(
+      credentialsId: 'kibana-ci-gcs-plugin',
+      bucket: "gs://kibana-ci-es-snapshots-permanent/${snapshotVersion}",
+      pattern: '*.*',
+      sharedPublicly: false,
+      showInline: false,
+    )
+  }
+}
+
+return this
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 18f214554b444d..c778dd799f6e59 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -137,13 +137,8 @@ def jobRunner(label, useRamDisk, closure) {
     def scmVars
 
     // Try to clone from Github up to 8 times, waiting 15 secs between attempts
-    retry(8) {
-      try {
-        scmVars = checkout scm
-      } catch (ex) {
-        sleep 15
-        throw ex
-      }
+    retryWithDelay(8, 15) {
+      scmVars = checkout scm
     }
 
     withEnv([
diff --git a/vars/retryWithDelay.groovy b/vars/retryWithDelay.groovy
new file mode 100644
index 00000000000000..70d6f86a63ab2d
--- /dev/null
+++ b/vars/retryWithDelay.groovy
@@ -0,0 +1,16 @@
+def call(retryTimes, delaySecs, closure) {
+  retry(retryTimes) {
+    try {
+      closure()
+    } catch (ex) {
+      sleep delaySecs
+      throw ex
+    }
+  }
+}
+
+def call(retryTimes, Closure closure) {
+  call(retryTimes, 15, closure)
+}
+
+return this

From 677670b929613cda90f6ac39f0b10cd7a99a3d55 Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Tue, 7 Jan 2020 18:02:32 +0100
Subject: [PATCH 26/96] [SIEM] Enable eslint prefer-template rule (#53983)

* [SIEM] Enable eslint prefer-template rule

* cleanup

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .eslintrc.js                                                | 3 +--
 .../dev_tools/circular_deps/run_check_circular_deps_cli.js  | 4 +---
 .../public/components/filters_global/filters_global.tsx     | 2 +-
 .../components/timeline/body/column_headers/index.tsx       | 4 ++--
 .../components/timeline/body/data_driven_columns/index.tsx  | 2 +-
 .../plugins/siem/public/components/timeline/body/index.tsx  | 2 +-
 .../plugins/siem/public/components/timeline/styles.tsx      | 6 +++---
 .../plugins/siem/scripts/convert_saved_search_to_rules.js   | 2 +-
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 55ae66c9e5e6aa..7832bba89a66cd 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -737,8 +737,7 @@ module.exports = {
         'prefer-promise-reject-errors': 'error',
         'prefer-rest-params': 'error',
         'prefer-spread': 'error',
-        // This style will be turned on after most bugs are fixed
-        // 'prefer-template': 'warn',
+        'prefer-template': 'error',
         'react/boolean-prop-naming': 'error',
         'react/button-has-type': 'error',
         'react/forbid-dom-props': 'error',
diff --git a/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js b/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js
index a4a9532f0e8e49..7d76b1dd921aaf 100644
--- a/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js
+++ b/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js
@@ -24,9 +24,7 @@ run(
     // We can only care about SIEM code, we should not be penalyze for others
     if (circularFound.filter(cf => cf.includes('siem')).length !== 0) {
       throw createFailError(
-        'SIEM circular dependencies of imports has been found:' +
-          '\n - ' +
-          circularFound.join('\n - ')
+        `SIEM circular dependencies of imports has been found:\n - ${circularFound.join('\n - ')}`
       );
     } else {
       log.success('No circular deps 👍');
diff --git a/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.tsx b/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.tsx
index edf6f7f01ab2e9..b4d8c790002b2f 100644
--- a/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.tsx
@@ -13,7 +13,7 @@ import { gutterTimeline } from '../../lib/helpers';
 
 const offsetChrome = 49;
 
-const disableSticky = 'screen and (max-width: ' + euiLightVars.euiBreakpoints.s + ')';
+const disableSticky = `screen and (max-width: ${euiLightVars.euiBreakpoints.s})`;
 const disableStickyMq = window.matchMedia(disableSticky);
 
 const Wrapper = styled.aside<{ isSticky?: boolean }>`
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
index 95a7ae52b0f23c..6b53b763b77835 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
@@ -165,7 +165,7 @@ export const ColumnHeadersComponent = ({
                       position="relative"
                       // Passing the styles directly to the component because the width is being calculated and is recommended by Styled Components for performance: https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
                       style={{
-                        flexBasis: header.width + 'px',
+                        flexBasis: `${header.width}px`,
                         ...dragProvided.draggableProps.style,
                       }}
                     >
@@ -186,7 +186,7 @@ export const ColumnHeadersComponent = ({
                         <DragEffects>
                           <DraggableFieldBadge
                             fieldId={header.id}
-                            fieldWidth={header.width + 'px'}
+                            fieldWidth={`${header.width}px`}
                           />
                         </DragEffects>
                       )}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx
index 2b2401519eb322..03900e1745236d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx
@@ -30,7 +30,7 @@ export const DataDrivenColumns = React.memo<Props>(
     return (
       <EventsTdGroupData data-test-subj="data-driven-columns">
         {columnHeaders.map((header, index) => (
-          <EventsTd key={header.id} style={{ flexBasis: header.width + 'px' }}>
+          <EventsTd key={header.id} style={{ flexBasis: `${header.width}px` }}>
             <EventsTdContent data-test-subj="cell-container">
               {getColumnRenderer(header.id, columnRenderers, data).renderColumn({
                 columnName: header.id,
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx
index 23406f1b5f35fe..c4ad532f76fc42 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx
@@ -116,7 +116,7 @@ export const Body = React.memo<BodyProps>(
           <EventsTable
             data-test-subj="events-table"
             // Passing the styles directly to the component because the width is being calculated and is recommended by Styled Components for performance: https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
-            style={{ minWidth: columnWidths + 'px' }}
+            style={{ minWidth: `${columnWidths}px` }}
           >
             <ColumnHeaders
               actionsColumnWidth={actionsColumnWidth}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
index db5d27626fc6dc..f0f41fc1f674fd 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
@@ -30,7 +30,7 @@ export const TimelineBodyGlobalStyle = createGlobalStyle`
 export const TimelineBody = styled.div.attrs(({ className }) => ({
   className: `siemTimeline__body ${className}`,
 }))<{ bodyHeight: number }>`
-  height: ${({ bodyHeight }) => bodyHeight + 'px'};
+  height: ${({ bodyHeight }) => `${bodyHeight}px`};
   overflow: auto;
   scrollbar-width: thin;
 
@@ -89,7 +89,7 @@ export const EventsThGroupActions = styled.div.attrs(({ className }) => ({
   className: `siemEventsTable__thGroupActions ${className}`,
 }))<{ actionsColumnWidth: number; justifyContent: string }>`
   display: flex;
-  flex: 0 0 ${({ actionsColumnWidth }) => actionsColumnWidth + 'px'};
+  flex: 0 0 ${({ actionsColumnWidth }) => `${actionsColumnWidth}px`};
   justify-content: ${({ justifyContent }) => justifyContent};
   min-width: 0;
 `;
@@ -182,7 +182,7 @@ export const EventsTdGroupActions = styled.div.attrs(({ className }) => ({
 }))<{ actionsColumnWidth: number }>`
   display: flex;
   justify-content: space-between;
-  flex: 0 0 ${({ actionsColumnWidth }) => actionsColumnWidth + 'px'};
+  flex: 0 0 ${({ actionsColumnWidth }) => `${actionsColumnWidth}px`};
   min-width: 0;
 `;
 EventsTdGroupActions.displayName = 'EventsTdGroupActions';
diff --git a/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_rules.js b/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_rules.js
index 9e24e93b0c3911..0da44eec3aaa30 100644
--- a/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_rules.js
+++ b/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_rules.js
@@ -61,7 +61,7 @@ const allRulesNdJson = 'index.ts';
 const walk = dir => {
   const list = fs.readdirSync(dir);
   return list.reduce((accum, file) => {
-    const fileWithDir = dir + '/' + file;
+    const fileWithDir = `${dir}/${file}`;
     const stat = fs.statSync(fileWithDir);
     if (stat && stat.isDirectory()) {
       return [...accum, ...walk(fileWithDir)];

From 23a0513469502f2e6aaa05728ceafd214bebe4d9 Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Tue, 7 Jan 2020 18:05:04 +0100
Subject: [PATCH 27/96] [SIEM] Add react/display-name eslint rule (#53107)

---
 .eslintrc.js                                  |   1 +
 .../plugins/siem/public/apps/start_app.tsx    | 103 ++++--
 .../components/alerts_viewer/alerts_table.tsx |  58 ++-
 .../components/event_details/columns.tsx      |   2 +
 .../fields_browser/category_columns.tsx       |   2 +
 .../fields_browser/field_browser.tsx          | 256 ++++++-------
 .../components/fields_browser/field_items.tsx |   2 +
 .../siem/public/components/markdown/index.tsx |   2 +
 .../matrix_histogram/index.test.tsx           |   2 +
 .../get_anomalies_host_table_columns.tsx      |   2 +
 .../get_anomalies_network_table_columns.tsx   |   2 +
 .../ml_popover/jobs_table/jobs_table.tsx      |   2 +
 .../siem/public/components/notes/columns.tsx  |   2 +
 .../timelines_table/actions_columns.tsx       |   2 +
 .../timelines_table/common_columns.tsx        |   2 +
 .../timelines_table/extended_columns.tsx      |   2 +
 .../timelines_table/icon_header_columns.tsx   |   2 +
 .../hosts/authentications_table/index.tsx     |   2 +
 .../hosts/uncommon_process_table/index.tsx    |   2 +
 .../page/network/kpi_network/index.tsx        |   2 +
 .../network/network_http_table/columns.tsx    |   2 +
 .../page/network/tls_table/columns.tsx        |   2 +
 .../components/stat_items/index.test.tsx      |   2 +
 .../timeline/body/events/stateful_event.tsx   | 338 +++++++++---------
 .../renderers/auditd/generic_row_renderer.tsx |   2 +
 .../body/renderers/empty_column_renderer.tsx  |   2 +
 .../netflow/netflow_row_renderer.tsx          |   2 +
 .../body/renderers/plain_row_renderer.tsx     |   2 +
 .../suricata/suricata_row_renderer.tsx        |   2 +
 .../renderers/system/generic_row_renderer.tsx |   2 +
 .../body/renderers/zeek/zeek_row_renderer.tsx |   2 +
 .../components/timeline/refetch_timeline.tsx  |  27 +-
 .../components/timeline/timeline_context.tsx  |  51 +--
 .../public/components/url_state/index.tsx     |  30 +-
 .../public/containers/global_time/index.tsx   |  57 +--
 .../public/containers/timeline/all/index.tsx  |  64 ++--
 .../containers/timeline/details/index.tsx     |  66 ++--
 .../plugins/siem/public/mock/kibana_react.ts  |   2 +
 .../siem/public/mock/test_providers.tsx       |  47 +--
 .../components/activity_monitor/columns.tsx   |   2 +
 .../components/signals/default_config.tsx     |   2 +
 .../signals/signals_filter_group/index.tsx    |  77 ++--
 .../signals/signals_utility_bar/index.tsx     | 183 +++++-----
 .../components/signals_chart/index.tsx        |   6 +-
 .../detection_engine/rules/all/columns.tsx    |   2 +
 .../components/accordion_title/index.tsx      |   8 +-
 .../description_step/filter_label.tsx         |   6 +-
 .../components/description_step/index.tsx     |  55 +--
 .../rules/components/status_icon/index.tsx    |   6 +-
 .../rules/components/step_panel/index.tsx     |  20 +-
 .../public/pages/timelines/timelines_page.tsx |   7 +-
 x-pack/legacy/plugins/siem/public/routes.tsx  |   6 +-
 .../public/utils/route/manage_spy_routes.tsx  |   8 +-
 53 files changed, 837 insertions(+), 703 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 7832bba89a66cd..8a9d4da6178e90 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -740,6 +740,7 @@ module.exports = {
         'prefer-template': 'error',
         'react/boolean-prop-naming': 'error',
         'react/button-has-type': 'error',
+        'react/display-name': 'error',
         'react/forbid-dom-props': 'error',
         'react/no-access-state-in-setstate': 'error',
         'react/no-children-prop': 'error',
diff --git a/x-pack/legacy/plugins/siem/public/apps/start_app.tsx b/x-pack/legacy/plugins/siem/public/apps/start_app.tsx
index 54180b51fe0398..100f10aaf2e7bb 100644
--- a/x-pack/legacy/plugins/siem/public/apps/start_app.tsx
+++ b/x-pack/legacy/plugins/siem/public/apps/start_app.tsx
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createHashHistory } from 'history';
-import React, { memo, FC } from 'react';
+import { createHashHistory, History } from 'history';
+import React, { memo, useMemo, FC } from 'react';
 import { ApolloProvider } from 'react-apollo';
+import { Store } from 'redux';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 import { ThemeProvider } from 'styled-components';
 
@@ -23,7 +24,7 @@ import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { DEFAULT_DARK_MODE } from '../../common/constants';
 import { ErrorToastDispatcher } from '../components/error_toast_dispatcher';
 import { compose } from '../lib/compose/kibana_compose';
-import { AppFrontendLibs } from '../lib/lib';
+import { AppFrontendLibs, AppApolloClient } from '../lib/lib';
 import { StartCore, StartPlugins } from './plugin';
 import { PageRouter } from '../routes';
 import { createStore } from '../store';
@@ -32,48 +33,70 @@ import { MlCapabilitiesProvider } from '../components/ml/permissions/ml_capabili
 
 import { ApolloClientContext } from '../utils/apollo_context';
 
-const StartApp: FC<AppFrontendLibs> = memo(libs => {
-  const history = createHashHistory();
+interface AppPluginRootComponentProps {
+  apolloClient: AppApolloClient;
+  history: History;
+  store: Store;
+  theme: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+}
 
-  const libs$ = new BehaviorSubject(libs);
+const AppPluginRootComponent: React.FC<AppPluginRootComponentProps> = ({
+  theme,
+  store,
+  apolloClient,
+  history,
+}) => (
+  <EuiErrorBoundary>
+    <I18nContext>
+      <ManageGlobalToaster>
+        <ReduxStoreProvider store={store}>
+          <ApolloProvider client={apolloClient}>
+            <ApolloClientContext.Provider value={apolloClient}>
+              <ThemeProvider theme={theme}>
+                <MlCapabilitiesProvider>
+                  <PageRouter history={history} />
+                </MlCapabilitiesProvider>
+              </ThemeProvider>
+              <ErrorToastDispatcher />
+              <GlobalToaster />
+            </ApolloClientContext.Provider>
+          </ApolloProvider>
+        </ReduxStoreProvider>
+      </ManageGlobalToaster>
+    </I18nContext>
+  </EuiErrorBoundary>
+);
 
+const AppPluginRoot = memo(AppPluginRootComponent);
+
+const StartAppComponent: FC<AppFrontendLibs> = libs => {
+  const history = createHashHistory();
+  const libs$ = new BehaviorSubject(libs);
   const store = createStore(undefined, libs$.pipe(pluck('apolloClient')));
+  const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
+  const theme = useMemo(
+    () => ({
+      eui: darkMode ? euiDarkVars : euiLightVars,
+      darkMode,
+    }),
+    [darkMode]
+  );
+
+  return (
+    <AppPluginRoot store={store} apolloClient={libs.apolloClient} history={history} theme={theme} />
+  );
+};
 
-  const AppPluginRoot = memo(() => {
-    const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
-    return (
-      <EuiErrorBoundary>
-        <I18nContext>
-          <ManageGlobalToaster>
-            <ReduxStoreProvider store={store}>
-              <ApolloProvider client={libs.apolloClient}>
-                <ApolloClientContext.Provider value={libs.apolloClient}>
-                  <ThemeProvider
-                    theme={() => ({
-                      eui: darkMode ? euiDarkVars : euiLightVars,
-                      darkMode,
-                    })}
-                  >
-                    <MlCapabilitiesProvider>
-                      <PageRouter history={history} />
-                    </MlCapabilitiesProvider>
-                  </ThemeProvider>
-                  <ErrorToastDispatcher />
-                  <GlobalToaster />
-                </ApolloClientContext.Provider>
-              </ApolloProvider>
-            </ReduxStoreProvider>
-          </ManageGlobalToaster>
-        </I18nContext>
-      </EuiErrorBoundary>
-    );
-  });
-  return <AppPluginRoot />;
-});
+const StartApp = memo(StartAppComponent);
 
 export const ROOT_ELEMENT_ID = 'react-siem-root';
 
-export const SiemApp = memo<{ core: StartCore; plugins: StartPlugins }>(({ core, plugins }) => (
+interface SiemAppComponentProps {
+  core: StartCore;
+  plugins: StartPlugins;
+}
+
+const SiemAppComponent: React.FC<SiemAppComponentProps> = ({ core, plugins }) => (
   <KibanaContextProvider
     services={{
       appName: 'siem',
@@ -84,4 +107,6 @@ export const SiemApp = memo<{ core: StartCore; plugins: StartPlugins }>(({ core,
   >
     <StartApp {...compose()} />
   </KibanaContextProvider>
-));
+);
+
+export const SiemApp = memo(SiemAppComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx
index 8fa4f3625c34f7..179474ee6e9d4a 100644
--- a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx
@@ -51,33 +51,31 @@ const defaultAlertsFilters: esFilters.Filter[] = [
   },
 ];
 
-export const AlertsTable = React.memo(
-  ({
-    endDate,
-    startDate,
-    pageFilters = [],
-  }: {
-    endDate: number;
-    startDate: number;
-    pageFilters?: esFilters.Filter[];
-  }) => {
-    const alertsFilter = useMemo(() => [...defaultAlertsFilters, ...pageFilters], [pageFilters]);
-    return (
-      <StatefulEventsViewer
-        pageFilters={alertsFilter}
-        defaultModel={alertsDefaultModel}
-        end={endDate}
-        id={ALERTS_TABLE_ID}
-        start={startDate}
-        timelineTypeContext={useMemo(
-          () => ({
-            documentType: i18n.ALERTS_DOCUMENT_TYPE,
-            footerText: i18n.TOTAL_COUNT_OF_ALERTS,
-            title: i18n.ALERTS_TABLE_TITLE,
-          }),
-          []
-        )}
-      />
-    );
-  }
-);
+interface Props {
+  endDate: number;
+  startDate: number;
+  pageFilters?: esFilters.Filter[];
+}
+
+const AlertsTableComponent: React.FC<Props> = ({ endDate, startDate, pageFilters = [] }) => {
+  const alertsFilter = useMemo(() => [...defaultAlertsFilters, ...pageFilters], [pageFilters]);
+  return (
+    <StatefulEventsViewer
+      pageFilters={alertsFilter}
+      defaultModel={alertsDefaultModel}
+      end={endDate}
+      id={ALERTS_TABLE_ID}
+      start={startDate}
+      timelineTypeContext={useMemo(
+        () => ({
+          documentType: i18n.ALERTS_DOCUMENT_TYPE,
+          footerText: i18n.TOTAL_COUNT_OF_ALERTS,
+          title: i18n.ALERTS_TABLE_TITLE,
+        }),
+        []
+      )}
+    />
+  );
+};
+
+export const AlertsTable = React.memo(AlertsTableComponent);
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 77f03f05554548..18404c2263b1c5 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
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import {
   EuiCheckbox,
   EuiFlexGroup,
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.tsx
index a4a53a5a51435c..0c7dd7e908ce33 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import {
   EuiIcon,
   EuiFlexGroup,
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.tsx
index c23908c396386a..c8a0eb9da688b0 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.tsx
@@ -102,138 +102,138 @@ type Props = Pick<
  * This component has no internal state, but it uses lifecycle methods to
  * set focus to the search input, scroll to the selected category, etc
  */
-export const FieldsBrowser = React.memo<Props>(
-  ({
-    browserFields,
-    columnHeaders,
-    filteredBrowserFields,
-    isEventViewer,
-    isSearching,
-    onCategorySelected,
-    onFieldSelected,
-    onHideFieldBrowser,
-    onSearchInputChange,
-    onOutsideClick,
-    onUpdateColumns,
-    searchInput,
-    selectedCategoryId,
-    timelineId,
-    toggleColumn,
-    width,
-  }) => {
-    /** Focuses the input that filters the field browser */
-    const focusInput = () => {
-      const elements = document.getElementsByClassName(
-        getFieldBrowserSearchInputClassName(timelineId)
-      );
+const FieldsBrowserComponent: React.FC<Props> = ({
+  browserFields,
+  columnHeaders,
+  filteredBrowserFields,
+  isEventViewer,
+  isSearching,
+  onCategorySelected,
+  onFieldSelected,
+  onHideFieldBrowser,
+  onSearchInputChange,
+  onOutsideClick,
+  onUpdateColumns,
+  searchInput,
+  selectedCategoryId,
+  timelineId,
+  toggleColumn,
+  width,
+}) => {
+  /** Focuses the input that filters the field browser */
+  const focusInput = () => {
+    const elements = document.getElementsByClassName(
+      getFieldBrowserSearchInputClassName(timelineId)
+    );
 
-      if (elements.length > 0) {
-        (elements[0] as HTMLElement).focus(); // this cast is required because focus() does not exist on every `Element` returned by `getElementsByClassName`
+    if (elements.length > 0) {
+      (elements[0] as HTMLElement).focus(); // this cast is required because focus() does not exist on every `Element` returned by `getElementsByClassName`
+    }
+  };
+
+  /** Invoked when the user types in the input to filter the field browser */
+  const onInputChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      onSearchInputChange(event.target.value);
+    },
+    [onSearchInputChange]
+  );
+
+  const selectFieldAndHide = useCallback(
+    (fieldId: string) => {
+      if (onFieldSelected != null) {
+        onFieldSelected(fieldId);
       }
-    };
-
-    /** Invoked when the user types in the input to filter the field browser */
-    const onInputChange = useCallback(
-      (event: React.ChangeEvent<HTMLInputElement>) => {
-        onSearchInputChange(event.target.value);
-      },
-      [onSearchInputChange]
-    );
 
-    const selectFieldAndHide = useCallback(
-      (fieldId: string) => {
-        if (onFieldSelected != null) {
-          onFieldSelected(fieldId);
-        }
+      onHideFieldBrowser();
+    },
+    [onFieldSelected, onHideFieldBrowser]
+  );
+
+  const scrollViews = () => {
+    if (selectedCategoryId !== '') {
+      const categoryPaneTitles = document.getElementsByClassName(
+        getCategoryPaneCategoryClassName({
+          categoryId: selectedCategoryId,
+          timelineId,
+        })
+      );
 
-        onHideFieldBrowser();
-      },
-      [onFieldSelected, onHideFieldBrowser]
-    );
+      if (categoryPaneTitles.length > 0) {
+        categoryPaneTitles[0].scrollIntoView();
+      }
+
+      const fieldPaneTitles = document.getElementsByClassName(
+        getFieldBrowserCategoryTitleClassName({
+          categoryId: selectedCategoryId,
+          timelineId,
+        })
+      );
 
-    const scrollViews = () => {
-      if (selectedCategoryId !== '') {
-        const categoryPaneTitles = document.getElementsByClassName(
-          getCategoryPaneCategoryClassName({
-            categoryId: selectedCategoryId,
-            timelineId,
-          })
-        );
-
-        if (categoryPaneTitles.length > 0) {
-          categoryPaneTitles[0].scrollIntoView();
-        }
-
-        const fieldPaneTitles = document.getElementsByClassName(
-          getFieldBrowserCategoryTitleClassName({
-            categoryId: selectedCategoryId,
-            timelineId,
-          })
-        );
-
-        if (fieldPaneTitles.length > 0) {
-          fieldPaneTitles[0].scrollIntoView();
-        }
+      if (fieldPaneTitles.length > 0) {
+        fieldPaneTitles[0].scrollIntoView();
       }
+    }
+
+    focusInput(); // always re-focus the input to enable additional filtering
+  };
+
+  useEffect(() => {
+    scrollViews();
+  }, [selectedCategoryId, timelineId]);
+
+  return (
+    <EuiOutsideClickDetector
+      data-test-subj="outside-click-detector"
+      onOutsideClick={onFieldSelected != null ? noop : onOutsideClick}
+      isDisabled={false}
+    >
+      <FieldsBrowserContainer data-test-subj="fields-browser-container" width={width}>
+        <Header
+          data-test-subj="header"
+          filteredBrowserFields={filteredBrowserFields}
+          isEventViewer={isEventViewer}
+          isSearching={isSearching}
+          onOutsideClick={onOutsideClick}
+          onSearchInputChange={onInputChange}
+          onUpdateColumns={onUpdateColumns}
+          searchInput={searchInput}
+          timelineId={timelineId}
+        />
+
+        <PanesFlexGroup alignItems="flexStart" gutterSize="none" justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <CategoriesPane
+              browserFields={browserFields}
+              data-test-subj="left-categories-pane"
+              filteredBrowserFields={filteredBrowserFields}
+              width={CATEGORY_PANE_WIDTH}
+              onCategorySelected={onCategorySelected}
+              onUpdateColumns={onUpdateColumns}
+              selectedCategoryId={selectedCategoryId}
+              timelineId={timelineId}
+            />
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false}>
+            <FieldsPane
+              columnHeaders={columnHeaders}
+              data-test-subj="fields-pane"
+              filteredBrowserFields={filteredBrowserFields}
+              onCategorySelected={onCategorySelected}
+              onFieldSelected={selectFieldAndHide}
+              onUpdateColumns={onUpdateColumns}
+              searchInput={searchInput}
+              selectedCategoryId={selectedCategoryId}
+              timelineId={timelineId}
+              toggleColumn={toggleColumn}
+              width={FIELDS_PANE_WIDTH}
+            />
+          </EuiFlexItem>
+        </PanesFlexGroup>
+      </FieldsBrowserContainer>
+    </EuiOutsideClickDetector>
+  );
+};
 
-      focusInput(); // always re-focus the input to enable additional filtering
-    };
-
-    useEffect(() => {
-      scrollViews();
-    }, [selectedCategoryId, timelineId]);
-
-    return (
-      <EuiOutsideClickDetector
-        data-test-subj="outside-click-detector"
-        onOutsideClick={onFieldSelected != null ? noop : onOutsideClick}
-        isDisabled={false}
-      >
-        <FieldsBrowserContainer data-test-subj="fields-browser-container" width={width}>
-          <Header
-            data-test-subj="header"
-            filteredBrowserFields={filteredBrowserFields}
-            isEventViewer={isEventViewer}
-            isSearching={isSearching}
-            onOutsideClick={onOutsideClick}
-            onSearchInputChange={onInputChange}
-            onUpdateColumns={onUpdateColumns}
-            searchInput={searchInput}
-            timelineId={timelineId}
-          />
-
-          <PanesFlexGroup alignItems="flexStart" gutterSize="none" justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              <CategoriesPane
-                browserFields={browserFields}
-                data-test-subj="left-categories-pane"
-                filteredBrowserFields={filteredBrowserFields}
-                width={CATEGORY_PANE_WIDTH}
-                onCategorySelected={onCategorySelected}
-                onUpdateColumns={onUpdateColumns}
-                selectedCategoryId={selectedCategoryId}
-                timelineId={timelineId}
-              />
-            </EuiFlexItem>
-
-            <EuiFlexItem grow={false}>
-              <FieldsPane
-                columnHeaders={columnHeaders}
-                data-test-subj="fields-pane"
-                filteredBrowserFields={filteredBrowserFields}
-                onCategorySelected={onCategorySelected}
-                onFieldSelected={selectFieldAndHide}
-                onUpdateColumns={onUpdateColumns}
-                searchInput={searchInput}
-                selectedCategoryId={selectedCategoryId}
-                timelineId={timelineId}
-                toggleColumn={toggleColumn}
-                width={FIELDS_PANE_WIDTH}
-              />
-            </EuiFlexItem>
-          </PanesFlexGroup>
-        </FieldsBrowserContainer>
-      </EuiOutsideClickDetector>
-    );
-  }
-);
+export const FieldsBrowser = React.memo(FieldsBrowserComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
index dc902b792d6013..17553c79b643cd 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiCheckbox, EuiIcon, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { uniqBy } from 'lodash/fp';
 import * as React from 'react';
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
index 16e065ae721c91..0727b6794f48ce 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiLink, EuiTableRow, EuiTableRowCell, EuiText, EuiToolTip } from '@elastic/eui';
 import * as React from 'react';
 import ReactMarkdown from 'react-markdown';
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
index 87d4e072e42990..fd72fcd7322b04 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { shallow } from 'enzyme';
 import * as React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx
index daac4835adb285..4e6484c23613f1 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import { Columns } from '../../paginated_table';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx
index 2113d3b82f52e7..0c823ef75cf26d 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx
index 73451d574d841e..0d243a84aa1928 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import chrome from 'ui/chrome';
 import React, { useEffect, useState } from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx b/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
index 0c7a18d6076aa6..fbcb3c13be67ac 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import * as React from 'react';
 
 import { EuiTableDataType } from '@elastic/eui';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
index 3a8bc83fdc98a5..6934e69bd0f7fa 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import * as React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
index e4ab42bb37c55c..743754842c6a8a 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiButtonIcon, EuiLink } from '@elastic/eui';
 import { omit } from 'lodash/fp';
 import * as React from 'react';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
index 63f6b8b674a3d4..aa80a2b4e78a14 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import * as React from 'react';
 
 import { defaultToEmptyTag } from '../../empty_value';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
index 6d8a792e91b028..7649b1a8ce01cf 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiIcon, EuiToolTip } from '@elastic/eui';
 import * as React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.tsx
index ad5755068e6625..f5485922647ca3 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { has } from 'lodash/fp';
 import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx
index a8b9b2a1f61cea..b4c01053f0e9c4 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
index d59d4ccd60c607..73602fe3400a9a 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
@@ -146,6 +146,8 @@ export const KpiNetworkBaseComponent = React.memo<{
   );
 });
 
+KpiNetworkBaseComponent.displayName = 'KpiNetworkBaseComponent';
+
 export const KpiNetworkComponent = React.memo<KpiNetworkProps>(
   ({ data, from, id, loading, to, narrowDateRange }) => {
     return loading ? (
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/columns.tsx
index 6a47a58c85f319..bffc7235b6804c 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import numeral from '@elastic/numeral';
 import { NetworkHttpEdges, NetworkHttpFields, NetworkHttpItem } from '../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
index aea8ee9e6b9e14..44a538871d9512 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import moment from 'moment';
 import { TlsNode } from '../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
index ed3eaa6cf1e917..7dac5ff2e9bb66 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, ReactWrapper } from 'enzyme';
 import toJson from 'enzyme-to-json';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event.tsx
index baa5c35880d68d..b93b0531c740f1 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event.tsx
@@ -9,7 +9,7 @@ import uuid from 'uuid';
 import VisibilitySensor from 'react-visibility-sensor';
 
 import { BrowserFields } from '../../../../containers/source';
-import { TimelineDetailsComponentQuery } from '../../../../containers/timeline/details';
+import { TimelineDetailsQuery } from '../../../../containers/timeline/details';
 import { TimelineItem, DetailItem, TimelineNonEcsData } from '../../../../graphql/types';
 import { requestIdleCallbackViaScheduler } from '../../../../lib/helpers/scheduler';
 import { Note } from '../../../../lib/note';
@@ -91,7 +91,7 @@ interface AttributesProps {
   children: React.ReactNode;
 }
 
-const Attributes = React.memo<AttributesProps>(({ children }) => {
+const AttributesComponent: React.FC<AttributesProps> = ({ children }) => {
   const width = useTimelineWidthContext();
 
   // Passing the styles directly to the component because the width is
@@ -106,187 +106,187 @@ const Attributes = React.memo<AttributesProps>(({ children }) => {
       {children}
     </EventsTrSupplement>
   );
-});
+};
 
-export const StatefulEvent = React.memo<Props>(
-  ({
-    actionsColumnWidth,
-    addNoteToEvent,
-    browserFields,
-    columnHeaders,
-    columnRenderers,
-    event,
-    eventIdToNoteIds,
-    getNotesByIds,
-    isEventViewer = false,
-    isEventPinned = false,
-    loadingEventIds,
-    maxDelay = 0,
-    onColumnResized,
-    onPinEvent,
-    onRowSelected,
-    onUnPinEvent,
-    onUpdateColumns,
-    rowRenderers,
-    selectedEventIds,
-    showCheckboxes,
-    timelineId,
-    toggleColumn,
-    updateNote,
-  }) => {
-    const [expanded, setExpanded] = useState<{ [eventId: string]: boolean }>({});
-    const [initialRender, setInitialRender] = useState(false);
-    const [showNotes, setShowNotes] = useState<{ [eventId: string]: boolean }>({});
+const Attributes = React.memo(AttributesComponent);
 
-    const divElement = useRef<HTMLDivElement | null>(null);
+const StatefulEventComponent: React.FC<Props> = ({
+  actionsColumnWidth,
+  addNoteToEvent,
+  browserFields,
+  columnHeaders,
+  columnRenderers,
+  event,
+  eventIdToNoteIds,
+  getNotesByIds,
+  isEventViewer = false,
+  isEventPinned = false,
+  loadingEventIds,
+  maxDelay = 0,
+  onColumnResized,
+  onPinEvent,
+  onRowSelected,
+  onUnPinEvent,
+  onUpdateColumns,
+  rowRenderers,
+  selectedEventIds,
+  showCheckboxes,
+  timelineId,
+  toggleColumn,
+  updateNote,
+}) => {
+  const [expanded, setExpanded] = useState<{ [eventId: string]: boolean }>({});
+  const [initialRender, setInitialRender] = useState(false);
+  const [showNotes, setShowNotes] = useState<{ [eventId: string]: boolean }>({});
 
-    const onToggleShowNotes = useCallback(() => {
-      const eventId = event._id;
-      setShowNotes({ ...showNotes, [eventId]: !showNotes[eventId] });
-    }, [event, showNotes]);
+  const divElement = useRef<HTMLDivElement | null>(null);
 
-    const onToggleExpanded = useCallback(() => {
-      const eventId = event._id;
-      setExpanded({
-        ...expanded,
-        [eventId]: !expanded[eventId],
-      });
-    }, [event, expanded]);
+  const onToggleShowNotes = useCallback(() => {
+    const eventId = event._id;
+    setShowNotes({ ...showNotes, [eventId]: !showNotes[eventId] });
+  }, [event, showNotes]);
 
-    const associateNote = useCallback(
-      (noteId: string) => {
-        addNoteToEvent({ eventId: event._id, noteId });
-        if (!isEventPinned) {
-          onPinEvent(event._id); // pin the event, because it has notes
-        }
-      },
-      [addNoteToEvent, event, isEventPinned, onPinEvent]
-    );
+  const onToggleExpanded = useCallback(() => {
+    const eventId = event._id;
+    setExpanded({
+      ...expanded,
+      [eventId]: !expanded[eventId],
+    });
+  }, [event, expanded]);
 
-    /**
-     * Incrementally loads the events when it mounts by trying to
-     * see if it resides within a window frame and if it is it will
-     * indicate to React that it should render its self by setting
-     * its initialRender to true.
-     */
-    useEffect(() => {
-      let _isMounted = true;
+  const associateNote = useCallback(
+    (noteId: string) => {
+      addNoteToEvent({ eventId: event._id, noteId });
+      if (!isEventPinned) {
+        onPinEvent(event._id); // pin the event, because it has notes
+      }
+    },
+    [addNoteToEvent, event, isEventPinned, onPinEvent]
+  );
 
-      requestIdleCallbackViaScheduler(
-        () => {
-          if (!initialRender && _isMounted) {
-            setInitialRender(true);
-          }
-        },
-        { timeout: maxDelay }
-      );
-      return () => {
-        _isMounted = false;
-      };
-    }, []);
+  /**
+   * Incrementally loads the events when it mounts by trying to
+   * see if it resides within a window frame and if it is it will
+   * indicate to React that it should render its self by setting
+   * its initialRender to true.
+   */
+  useEffect(() => {
+    let _isMounted = true;
 
-    // Number of current columns plus one for actions.
-    const columnCount = columnHeaders.length + 1;
+    requestIdleCallbackViaScheduler(
+      () => {
+        if (!initialRender && _isMounted) {
+          setInitialRender(true);
+        }
+      },
+      { timeout: maxDelay }
+    );
+    return () => {
+      _isMounted = false;
+    };
+  }, []);
 
-    // If we are not ready to render yet, just return null
-    // see useEffect() for when it schedules the first
-    // time this stateful component should be rendered.
-    if (!initialRender) {
-      return <SkeletonRow cellCount={columnCount} />;
-    }
+  // Number of current columns plus one for actions.
+  const columnCount = columnHeaders.length + 1;
 
-    return (
-      <VisibilitySensor
-        partialVisibility={true}
-        scrollCheck={true}
-        offset={{ top: TOP_OFFSET, bottom: BOTTOM_OFFSET }}
-      >
-        {({ isVisible }) => {
-          if (isVisible) {
-            return (
-              <TimelineDetailsComponentQuery
-                sourceId="default"
-                indexName={event._index!}
-                eventId={event._id}
-                executeQuery={!!expanded[event._id]}
-              >
-                {({ detailsData, loading }) => (
-                  <EventsTrGroup
-                    className={STATEFUL_EVENT_CSS_CLASS_NAME}
-                    data-test-subj="event"
-                    ref={c => {
-                      if (c != null) {
-                        divElement.current = c;
-                      }
-                    }}
-                  >
-                    {getRowRenderer(event.ecs, rowRenderers).renderRow({
-                      browserFields,
-                      data: event.ecs,
-                      children: (
-                        <StatefulEventChild
-                          actionsColumnWidth={actionsColumnWidth}
-                          addNoteToEvent={addNoteToEvent}
-                          associateNote={associateNote}
-                          columnHeaders={columnHeaders}
-                          columnRenderers={columnRenderers}
-                          data={event.data}
-                          eventIdToNoteIds={eventIdToNoteIds}
-                          expanded={!!expanded[event._id]}
-                          getNotesByIds={getNotesByIds}
-                          id={event._id}
-                          isEventPinned={isEventPinned}
-                          isEventViewer={isEventViewer}
-                          loading={loading}
-                          loadingEventIds={loadingEventIds}
-                          onColumnResized={onColumnResized}
-                          onPinEvent={onPinEvent}
-                          onRowSelected={onRowSelected}
-                          onToggleExpanded={onToggleExpanded}
-                          onToggleShowNotes={onToggleShowNotes}
-                          onUnPinEvent={onUnPinEvent}
-                          selectedEventIds={selectedEventIds}
-                          showCheckboxes={showCheckboxes}
-                          showNotes={!!showNotes[event._id]}
-                          timelineId={timelineId}
-                          updateNote={updateNote}
-                        />
-                      ),
-                      timelineId,
-                    })}
+  // If we are not ready to render yet, just return null
+  // see useEffect() for when it schedules the first
+  // time this stateful component should be rendered.
+  if (!initialRender) {
+    return <SkeletonRow cellCount={columnCount} />;
+  }
 
-                    <Attributes>
-                      <ExpandableEvent
-                        browserFields={browserFields}
+  return (
+    <VisibilitySensor
+      partialVisibility={true}
+      scrollCheck={true}
+      offset={{ top: TOP_OFFSET, bottom: BOTTOM_OFFSET }}
+    >
+      {({ isVisible }) => {
+        if (isVisible) {
+          return (
+            <TimelineDetailsQuery
+              sourceId="default"
+              indexName={event._index!}
+              eventId={event._id}
+              executeQuery={!!expanded[event._id]}
+            >
+              {({ detailsData, loading }) => (
+                <EventsTrGroup
+                  className={STATEFUL_EVENT_CSS_CLASS_NAME}
+                  data-test-subj="event"
+                  ref={c => {
+                    if (c != null) {
+                      divElement.current = c;
+                    }
+                  }}
+                >
+                  {getRowRenderer(event.ecs, rowRenderers).renderRow({
+                    browserFields,
+                    data: event.ecs,
+                    children: (
+                      <StatefulEventChild
+                        actionsColumnWidth={actionsColumnWidth}
+                        addNoteToEvent={addNoteToEvent}
+                        associateNote={associateNote}
                         columnHeaders={columnHeaders}
-                        event={detailsData || emptyDetails}
-                        forceExpand={!!expanded[event._id] && !loading}
+                        columnRenderers={columnRenderers}
+                        data={event.data}
+                        eventIdToNoteIds={eventIdToNoteIds}
+                        expanded={!!expanded[event._id]}
+                        getNotesByIds={getNotesByIds}
                         id={event._id}
-                        onUpdateColumns={onUpdateColumns}
+                        isEventPinned={isEventPinned}
+                        isEventViewer={isEventViewer}
+                        loading={loading}
+                        loadingEventIds={loadingEventIds}
+                        onColumnResized={onColumnResized}
+                        onPinEvent={onPinEvent}
+                        onRowSelected={onRowSelected}
+                        onToggleExpanded={onToggleExpanded}
+                        onToggleShowNotes={onToggleShowNotes}
+                        onUnPinEvent={onUnPinEvent}
+                        selectedEventIds={selectedEventIds}
+                        showCheckboxes={showCheckboxes}
+                        showNotes={!!showNotes[event._id]}
                         timelineId={timelineId}
-                        toggleColumn={toggleColumn}
+                        updateNote={updateNote}
                       />
-                    </Attributes>
-                  </EventsTrGroup>
-                )}
-              </TimelineDetailsComponentQuery>
-            );
-          } else {
-            // Height place holder for visibility detection as well as re-rendering sections.
-            const height =
-              divElement.current != null
-                ? `${divElement.current.clientHeight}px`
-                : DEFAULT_ROW_HEIGHT;
+                    ),
+                    timelineId,
+                  })}
 
-            // height is being inlined directly in here because of performance with StyledComponents
-            // involving quick and constant changes to the DOM.
-            // https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
-            return <SkeletonRow cellCount={columnCount} style={{ height }} />;
-          }
-        }}
-      </VisibilitySensor>
-    );
-  }
-);
+                  <Attributes>
+                    <ExpandableEvent
+                      browserFields={browserFields}
+                      columnHeaders={columnHeaders}
+                      event={detailsData || emptyDetails}
+                      forceExpand={!!expanded[event._id] && !loading}
+                      id={event._id}
+                      onUpdateColumns={onUpdateColumns}
+                      timelineId={timelineId}
+                      toggleColumn={toggleColumn}
+                    />
+                  </Attributes>
+                </EventsTrGroup>
+              )}
+            </TimelineDetailsQuery>
+          );
+        } else {
+          // Height place holder for visibility detection as well as re-rendering sections.
+          const height =
+            divElement.current != null
+              ? `${divElement.current.clientHeight}px`
+              : DEFAULT_ROW_HEIGHT;
+
+          // height is being inlined directly in here because of performance with StyledComponents
+          // involving quick and constant changes to the DOM.
+          // https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
+          return <SkeletonRow cellCount={columnCount} style={{ height }} />;
+        }
+      }}
+    </VisibilitySensor>
+  );
+};
 
-StatefulEvent.displayName = 'StatefulEvent';
+export const StatefulEvent = React.memo(StatefulEventComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
index 71d56d641037d8..bcf464ab6da15d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { IconType } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
index 67554cc764486f..8e046342abd42c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import * as React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
index 3ae154a14aaf53..754d6ad99b7fe5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { get } from 'lodash/fp';
 import React from 'react';
 import styled from 'styled-components';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx
index 1eed05e6d2a7e9..6725830c97d0a1 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 
 import { RowRenderer } from './row_renderer';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
index 0bafe54b715fd6..b227326551e018 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { get } from 'lodash/fp';
 import React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx
index f8930fdca7ba2a..3e64248d39876c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { get } from 'lodash/fp';
 import React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
index 83d1c4347f57cf..fc528e33b5ab69 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { get } from 'lodash/fp';
 import React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/refetch_timeline.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/refetch_timeline.tsx
index 8a78d04c883117..c804ccf6582969 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/refetch_timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/refetch_timeline.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { memo, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
@@ -33,18 +33,23 @@ export interface TimelineRefetchProps {
 
 type OwnProps = TimelineRefetchProps & TimelineRefetchDispatch;
 
-const TimelineRefetchComponent = memo<OwnProps>(
-  ({ id, inputId, inspect, loading, refetch, setTimelineQuery }) => {
-    useEffect(() => {
-      setTimelineQuery({ id, inputId, inspect, loading, refetch });
-    }, [id, inputId, loading, refetch, inspect]);
-
-    return null;
-  }
-);
+const TimelineRefetchComponent: React.FC<OwnProps> = ({
+  id,
+  inputId,
+  inspect,
+  loading,
+  refetch,
+  setTimelineQuery,
+}) => {
+  useEffect(() => {
+    setTimelineQuery({ id, inputId, inspect, loading, refetch });
+  }, [id, inputId, loading, refetch, inspect]);
+
+  return null;
+};
 
 export const TimelineRefetch = compose<React.ComponentClass<TimelineRefetchProps>>(
   connect(null, {
     setTimelineQuery: inputsActions.setQuery,
   })
-)(TimelineRefetchComponent);
+)(React.memo(TimelineRefetchComponent));
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline_context.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline_context.tsx
index d3251e1d331e39..611452cc7ccd13 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline_context.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline_context.tsx
@@ -45,30 +45,35 @@ interface ManageTimelineContextProps {
 
 // todo we need to refactor this as more complex context/reducer with useReducer
 // to avoid so many Context, at least the separation of code is there now
-export const ManageTimelineContext = memo<ManageTimelineContextProps>(
-  ({ children, loading, width, type = initTimelineType }) => {
-    const [myLoading, setLoading] = useState(initTimelineContext);
-    const [myWidth, setWidth] = useState(initTimelineWidth);
-    const [myType, setType] = useState(initTimelineType);
+const ManageTimelineContextComponent: React.FC<ManageTimelineContextProps> = ({
+  children,
+  loading,
+  width,
+  type = initTimelineType,
+}) => {
+  const [myLoading, setLoading] = useState(initTimelineContext);
+  const [myWidth, setWidth] = useState(initTimelineWidth);
+  const [myType, setType] = useState(initTimelineType);
 
-    useEffect(() => {
-      setLoading(loading);
-    }, [loading]);
+  useEffect(() => {
+    setLoading(loading);
+  }, [loading]);
 
-    useEffect(() => {
-      setType(type);
-    }, [type]);
+  useEffect(() => {
+    setType(type);
+  }, [type]);
 
-    useEffect(() => {
-      setWidth(width);
-    }, [width]);
+  useEffect(() => {
+    setWidth(width);
+  }, [width]);
 
-    return (
-      <TimelineContext.Provider value={myLoading}>
-        <TimelineWidthContext.Provider value={myWidth}>
-          <TimelineTypeContext.Provider value={myType}>{children}</TimelineTypeContext.Provider>
-        </TimelineWidthContext.Provider>
-      </TimelineContext.Provider>
-    );
-  }
-);
+  return (
+    <TimelineContext.Provider value={myLoading}>
+      <TimelineWidthContext.Provider value={myWidth}>
+        <TimelineTypeContext.Provider value={myType}>{children}</TimelineTypeContext.Provider>
+      </TimelineWidthContext.Provider>
+    </TimelineContext.Provider>
+  );
+};
+
+export const ManageTimelineContext = memo(ManageTimelineContextComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/index.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/index.tsx
index a7e7729de2e27e..e656ec3496d8dc 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/index.tsx
@@ -19,16 +19,12 @@ import { dispatchUpdateTimeline } from '../open_timeline/helpers';
 import { dispatchSetInitialStateFromUrl } from './initialize_redux_by_url';
 import { makeMapStateToProps } from './helpers';
 
-export const UrlStateContainer = React.memo<UrlStateContainerPropTypes>(
-  (props: UrlStateContainerPropTypes) => {
-    useUrlStateHooks(props);
-    return null;
-  },
-  (prevProps, nextProps) =>
-    prevProps.pathName === nextProps.pathName && isEqual(prevProps.urlState, nextProps.urlState)
-);
-
-UrlStateContainer.displayName = 'UrlStateContainer';
+export const UrlStateContainer: React.FC<UrlStateContainerPropTypes> = (
+  props: UrlStateContainerPropTypes
+) => {
+  useUrlStateHooks(props);
+  return null;
+};
 
 const mapDispatchToProps = (dispatch: Dispatch) => ({
   setInitialStateFromUrl: dispatchSetInitialStateFromUrl(dispatch),
@@ -39,13 +35,21 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
 
 export const UrlStateRedux = compose<React.ComponentClass<UrlStateProps & RouteSpyState>>(
   connect(makeMapStateToProps, mapDispatchToProps)
-)(UrlStateContainer);
+)(
+  React.memo(
+    UrlStateContainer,
+    (prevProps, nextProps) =>
+      prevProps.pathName === nextProps.pathName && isEqual(prevProps.urlState, nextProps.urlState)
+  )
+);
 
-export const UseUrlState = React.memo<UrlStateProps>(props => {
+const UseUrlStateComponent: React.FC<UrlStateProps> = props => {
   const [routeProps] = useRouteSpy();
   const urlStateReduxProps: RouteSpyState & UrlStateProps = {
     ...routeProps,
     ...props,
   };
   return <UrlStateRedux {...urlStateReduxProps} />;
-});
+};
+
+export const UseUrlState = React.memo(UseUrlStateComponent);
diff --git a/x-pack/legacy/plugins/siem/public/containers/global_time/index.tsx b/x-pack/legacy/plugins/siem/public/containers/global_time/index.tsx
index 665148b7ad650f..d77e0215f83536 100644
--- a/x-pack/legacy/plugins/siem/public/containers/global_time/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/global_time/index.tsx
@@ -47,33 +47,38 @@ interface OwnProps {
 
 type GlobalTimeProps = OwnProps & GlobalTimeReduxState & GlobalTimeDispatch;
 
-export const GlobalTimeComponent = React.memo(
-  ({ children, deleteAllQuery, deleteOneQuery, from, to, setGlobalQuery }: GlobalTimeProps) => {
-    const [isInitializing, setIsInitializing] = useState(true);
+export const GlobalTimeComponent: React.FC<GlobalTimeProps> = ({
+  children,
+  deleteAllQuery,
+  deleteOneQuery,
+  from,
+  to,
+  setGlobalQuery,
+}) => {
+  const [isInitializing, setIsInitializing] = useState(true);
 
-    useEffect(() => {
-      if (isInitializing) {
-        setIsInitializing(false);
-      }
-      return () => {
-        deleteAllQuery({ id: 'global' });
-      };
-    }, []);
+  useEffect(() => {
+    if (isInitializing) {
+      setIsInitializing(false);
+    }
+    return () => {
+      deleteAllQuery({ id: 'global' });
+    };
+  }, []);
 
-    return (
-      <>
-        {children({
-          isInitializing,
-          from,
-          to,
-          setQuery: ({ id, inspect, loading, refetch }: SetQuery) =>
-            setGlobalQuery({ inputId: 'global', id, inspect, loading, refetch }),
-          deleteQuery: ({ id }: { id: string }) => deleteOneQuery({ inputId: 'global', id }),
-        })}
-      </>
-    );
-  }
-);
+  return (
+    <>
+      {children({
+        isInitializing,
+        from,
+        to,
+        setQuery: ({ id, inspect, loading, refetch }: SetQuery) =>
+          setGlobalQuery({ inputId: 'global', id, inspect, loading, refetch }),
+        deleteQuery: ({ id }: { id: string }) => deleteOneQuery({ inputId: 'global', id }),
+      })}
+    </>
+  );
+};
 
 const mapStateToProps = (state: State) => {
   const timerange: inputsModel.TimeRange = inputsSelectors.globalTimeRangeSelector(state);
@@ -87,4 +92,4 @@ export const GlobalTime = connect(mapStateToProps, {
   deleteAllQuery: inputsActions.deleteAllQuery,
   deleteOneQuery: inputsActions.deleteOneQuery,
   setGlobalQuery: inputsActions.setQuery,
-})(GlobalTimeComponent);
+})(React.memo(GlobalTimeComponent));
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/all/index.tsx b/x-pack/legacy/plugins/siem/public/containers/timeline/all/index.tsx
index 5ff28480f1b3f9..22c7b03f34dd58 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/all/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/all/index.tsx
@@ -71,32 +71,38 @@ const getAllTimeline = memoizeOne(
     }))
 );
 
-export const AllTimelinesQuery = React.memo<OwnProps>(
-  ({ children, onlyUserFavorite, pageInfo, search, sort }) => {
-    const variables: GetAllTimeline.Variables = {
-      onlyUserFavorite,
-      pageInfo,
-      search,
-      sort,
-    };
-    return (
-      <Query<GetAllTimeline.Query, GetAllTimeline.Variables>
-        query={allTimelinesQuery}
-        fetchPolicy="network-only"
-        notifyOnNetworkStatusChange
-        variables={variables}
-      >
-        {({ data, loading }) => {
-          return children!({
-            loading,
-            totalCount: getOr(0, 'getAllTimeline.totalCount', data),
-            timelines: getAllTimeline(
-              JSON.stringify(variables),
-              getOr([], 'getAllTimeline.timeline', data)
-            ),
-          });
-        }}
-      </Query>
-    );
-  }
-);
+const AllTimelinesQueryComponent: React.FC<OwnProps> = ({
+  children,
+  onlyUserFavorite,
+  pageInfo,
+  search,
+  sort,
+}) => {
+  const variables: GetAllTimeline.Variables = {
+    onlyUserFavorite,
+    pageInfo,
+    search,
+    sort,
+  };
+  return (
+    <Query<GetAllTimeline.Query, GetAllTimeline.Variables>
+      query={allTimelinesQuery}
+      fetchPolicy="network-only"
+      notifyOnNetworkStatusChange
+      variables={variables}
+    >
+      {({ data, loading }) =>
+        children!({
+          loading,
+          totalCount: getOr(0, 'getAllTimeline.totalCount', data),
+          timelines: getAllTimeline(
+            JSON.stringify(variables),
+            getOr([], 'getAllTimeline.timeline', data)
+          ),
+        })
+      }
+    </Query>
+  );
+};
+
+export const AllTimelinesQuery = React.memo(AllTimelinesQueryComponent);
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx b/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
index 721cfefe01780a..cf1b8954307e7b 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
@@ -32,33 +32,39 @@ const getDetailsEvent = memoizeOne(
   (variables: string, detail: DetailItem[]): DetailItem[] => detail
 );
 
-export const TimelineDetailsComponentQuery = React.memo<TimelineDetailsProps>(
-  ({ children, indexName, eventId, executeQuery, sourceId }) => {
-    const variables: GetTimelineDetailsQuery.Variables = {
-      sourceId,
-      indexName,
-      eventId,
-      defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
-    };
-    return executeQuery ? (
-      <Query<GetTimelineDetailsQuery.Query, GetTimelineDetailsQuery.Variables>
-        query={timelineDetailsQuery}
-        fetchPolicy="network-only"
-        notifyOnNetworkStatusChange
-        variables={variables}
-      >
-        {({ data, loading, refetch }) => {
-          return children!({
-            loading,
-            detailsData: getDetailsEvent(
-              JSON.stringify(variables),
-              getOr([], 'source.TimelineDetails.data', data)
-            ),
-          });
-        }}
-      </Query>
-    ) : (
-      children!({ loading: false, detailsData: null })
-    );
-  }
-);
+const TimelineDetailsQueryComponent: React.FC<TimelineDetailsProps> = ({
+  children,
+  indexName,
+  eventId,
+  executeQuery,
+  sourceId,
+}) => {
+  const variables: GetTimelineDetailsQuery.Variables = {
+    sourceId,
+    indexName,
+    eventId,
+    defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
+  };
+  return executeQuery ? (
+    <Query<GetTimelineDetailsQuery.Query, GetTimelineDetailsQuery.Variables>
+      query={timelineDetailsQuery}
+      fetchPolicy="network-only"
+      notifyOnNetworkStatusChange
+      variables={variables}
+    >
+      {({ data, loading, refetch }) =>
+        children!({
+          loading,
+          detailsData: getDetailsEvent(
+            JSON.stringify(variables),
+            getOr([], 'source.TimelineDetails.data', data)
+          ),
+        })
+      }
+    </Query>
+  ) : (
+    children!({ loading: false, detailsData: null })
+  );
+};
+
+export const TimelineDetailsQuery = React.memo(TimelineDetailsQueryComponent);
diff --git a/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts b/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
index 15944df1822b35..a6b4fe664efba0 100644
--- a/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
+++ b/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
 
diff --git a/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx b/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
index 6c0a85e3ef7783..f0f719a60a7088 100644
--- a/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
+++ b/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
@@ -61,26 +61,33 @@ Object.defineProperty(window, 'localStorage', {
 const MockKibanaContextProvider = createKibanaContextProviderMock();
 
 /** A utility for wrapping children in the providers required to run most tests */
-export const TestProviders = React.memo<Props>(
-  ({ children, store = createStore(state, apolloClientObservable), onDragEnd = jest.fn() }) => (
-    <I18nProvider>
-      <MockKibanaContextProvider>
-        <ApolloProvider client={apolloClient}>
-          <ReduxStoreProvider store={store}>
-            <ThemeProvider theme={() => ({ eui: euiDarkVars, darkMode: true })}>
-              <DragDropContext onDragEnd={onDragEnd}>{children}</DragDropContext>
-            </ThemeProvider>
-          </ReduxStoreProvider>
-        </ApolloProvider>
-      </MockKibanaContextProvider>
-    </I18nProvider>
-  )
+const TestProvidersComponent: React.FC<Props> = ({
+  children,
+  store = createStore(state, apolloClientObservable),
+  onDragEnd = jest.fn(),
+}) => (
+  <I18nProvider>
+    <MockKibanaContextProvider>
+      <ApolloProvider client={apolloClient}>
+        <ReduxStoreProvider store={store}>
+          <ThemeProvider theme={() => ({ eui: euiDarkVars, darkMode: true })}>
+            <DragDropContext onDragEnd={onDragEnd}>{children}</DragDropContext>
+          </ThemeProvider>
+        </ReduxStoreProvider>
+      </ApolloProvider>
+    </MockKibanaContextProvider>
+  </I18nProvider>
 );
 
-export const TestProviderWithoutDragAndDrop = React.memo<Props>(
-  ({ children, store = createStore(state, apolloClientObservable) }) => (
-    <I18nProvider>
-      <ReduxStoreProvider store={store}>{children}</ReduxStoreProvider>
-    </I18nProvider>
-  )
+export const TestProviders = React.memo(TestProvidersComponent);
+
+const TestProviderWithoutDragAndDropComponent: React.FC<Props> = ({
+  children,
+  store = createStore(state, apolloClientObservable),
+}) => (
+  <I18nProvider>
+    <ReduxStoreProvider store={store}>{children}</ReduxStoreProvider>
+  </I18nProvider>
 );
+
+export const TestProviderWithoutDragAndDrop = React.memo(TestProviderWithoutDragAndDropComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx
index 41dd50120f345d..2ad37960d04230 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import {
   EuiIconTip,
   EuiLink,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx
index ea9a3ccef05b45..6b8cd5521c5337 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx
index 2a47cb5f1b0554..3c1317d463f8e4 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx
@@ -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 { EuiFilterButton, EuiFilterGroup } from '@elastic/eui';
 import React, { useCallback, useState } from 'react';
 import * as i18n from '../translations';
@@ -11,41 +12,41 @@ export const FILTER_OPEN = 'open';
 export const FILTER_CLOSED = 'closed';
 export type SignalFilterOption = typeof FILTER_OPEN | typeof FILTER_CLOSED;
 
-export const SignalsTableFilterGroup = React.memo(
-  ({
-    onFilterGroupChanged,
-  }: {
-    onFilterGroupChanged: (filterGroup: SignalFilterOption) => void;
-  }) => {
-    const [filterGroup, setFilterGroup] = useState(FILTER_OPEN);
-
-    const onClickOpenFilterCallback = useCallback(() => {
-      setFilterGroup(FILTER_OPEN);
-      onFilterGroupChanged(FILTER_OPEN);
-    }, [setFilterGroup, onFilterGroupChanged]);
-
-    const onClickCloseFilterCallback = useCallback(() => {
-      setFilterGroup(FILTER_CLOSED);
-      onFilterGroupChanged(FILTER_CLOSED);
-    }, [setFilterGroup, onFilterGroupChanged]);
-
-    return (
-      <EuiFilterGroup>
-        <EuiFilterButton
-          hasActiveFilters={filterGroup === FILTER_OPEN}
-          onClick={onClickOpenFilterCallback}
-          withNext
-        >
-          {i18n.OPEN_SIGNALS}
-        </EuiFilterButton>
-
-        <EuiFilterButton
-          hasActiveFilters={filterGroup === FILTER_CLOSED}
-          onClick={onClickCloseFilterCallback}
-        >
-          {i18n.CLOSED_SIGNALS}
-        </EuiFilterButton>
-      </EuiFilterGroup>
-    );
-  }
-);
+interface Props {
+  onFilterGroupChanged: (filterGroup: SignalFilterOption) => void;
+}
+
+const SignalsTableFilterGroupComponent: React.FC<Props> = ({ onFilterGroupChanged }) => {
+  const [filterGroup, setFilterGroup] = useState(FILTER_OPEN);
+
+  const onClickOpenFilterCallback = useCallback(() => {
+    setFilterGroup(FILTER_OPEN);
+    onFilterGroupChanged(FILTER_OPEN);
+  }, [setFilterGroup, onFilterGroupChanged]);
+
+  const onClickCloseFilterCallback = useCallback(() => {
+    setFilterGroup(FILTER_CLOSED);
+    onFilterGroupChanged(FILTER_CLOSED);
+  }, [setFilterGroup, onFilterGroupChanged]);
+
+  return (
+    <EuiFilterGroup>
+      <EuiFilterButton
+        hasActiveFilters={filterGroup === FILTER_OPEN}
+        onClick={onClickOpenFilterCallback}
+        withNext
+      >
+        {i18n.OPEN_SIGNALS}
+      </EuiFilterButton>
+
+      <EuiFilterButton
+        hasActiveFilters={filterGroup === FILTER_CLOSED}
+        onClick={onClickCloseFilterCallback}
+      >
+        {i18n.CLOSED_SIGNALS}
+      </EuiFilterButton>
+    </EuiFilterGroup>
+  );
+};
+
+export const SignalsTableFilterGroup = React.memo(SignalsTableFilterGroupComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx
index 72b250470d19b0..f80de053b59bdf 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx
@@ -33,103 +33,100 @@ interface SignalsUtilityBarProps {
   updateSignalsStatus: UpdateSignalsStatus;
 }
 
-export const SignalsUtilityBar = React.memo<SignalsUtilityBarProps>(
-  ({
-    areEventsLoading,
-    clearSelection,
-    totalCount,
-    selectedEventIds,
-    isFilteredToOpen,
-    selectAll,
-    showClearSelection,
-    updateSignalsStatus,
-    sendSignalsToTimeline,
-  }) => {
-    const [defaultNumberFormat] = useUiSetting$<string>(DEFAULT_NUMBER_FORMAT);
+const SignalsUtilityBarComponent: React.FC<SignalsUtilityBarProps> = ({
+  areEventsLoading,
+  clearSelection,
+  totalCount,
+  selectedEventIds,
+  isFilteredToOpen,
+  selectAll,
+  showClearSelection,
+  updateSignalsStatus,
+  sendSignalsToTimeline,
+}) => {
+  const [defaultNumberFormat] = useUiSetting$<string>(DEFAULT_NUMBER_FORMAT);
 
-    const getBatchItemsPopoverContent = useCallback(
-      (closePopover: () => void) => (
-        <EuiContextMenuPanel
-          items={getBatchItems(
-            areEventsLoading,
-            showClearSelection,
-            selectedEventIds,
-            updateSignalsStatus,
-            sendSignalsToTimeline,
-            closePopover,
-            isFilteredToOpen
-          )}
-        />
-      ),
-      [
-        areEventsLoading,
-        selectedEventIds,
-        updateSignalsStatus,
-        sendSignalsToTimeline,
-        isFilteredToOpen,
-      ]
-    );
+  const getBatchItemsPopoverContent = useCallback(
+    (closePopover: () => void) => (
+      <EuiContextMenuPanel
+        items={getBatchItems(
+          areEventsLoading,
+          showClearSelection,
+          selectedEventIds,
+          updateSignalsStatus,
+          sendSignalsToTimeline,
+          closePopover,
+          isFilteredToOpen
+        )}
+      />
+    ),
+    [
+      areEventsLoading,
+      selectedEventIds,
+      updateSignalsStatus,
+      sendSignalsToTimeline,
+      isFilteredToOpen,
+    ]
+  );
 
-    const formattedTotalCount = numeral(totalCount).format(defaultNumberFormat);
-    const formattedSelectedEventsCount = numeral(Object.keys(selectedEventIds).length).format(
-      defaultNumberFormat
-    );
+  const formattedTotalCount = numeral(totalCount).format(defaultNumberFormat);
+  const formattedSelectedEventsCount = numeral(Object.keys(selectedEventIds).length).format(
+    defaultNumberFormat
+  );
 
-    return (
-      <>
-        <UtilityBar>
-          <UtilityBarSection>
-            <UtilityBarGroup>
-              <UtilityBarText>
-                {i18n.SHOWING_SIGNALS(formattedTotalCount, totalCount)}
-              </UtilityBarText>
-            </UtilityBarGroup>
+  return (
+    <>
+      <UtilityBar>
+        <UtilityBarSection>
+          <UtilityBarGroup>
+            <UtilityBarText>{i18n.SHOWING_SIGNALS(formattedTotalCount, totalCount)}</UtilityBarText>
+          </UtilityBarGroup>
 
-            <UtilityBarGroup>
-              {totalCount > 0 && (
-                <>
-                  <UtilityBarText>
-                    {i18n.SELECTED_SIGNALS(
-                      showClearSelection ? formattedTotalCount : formattedSelectedEventsCount,
-                      showClearSelection ? totalCount : Object.keys(selectedEventIds).length
-                    )}
-                  </UtilityBarText>
+          <UtilityBarGroup>
+            {totalCount > 0 && (
+              <>
+                <UtilityBarText>
+                  {i18n.SELECTED_SIGNALS(
+                    showClearSelection ? formattedTotalCount : formattedSelectedEventsCount,
+                    showClearSelection ? totalCount : Object.keys(selectedEventIds).length
+                  )}
+                </UtilityBarText>
 
-                  <UtilityBarAction
-                    iconSide="right"
-                    iconType="arrowDown"
-                    popoverContent={getBatchItemsPopoverContent}
-                  >
-                    {i18n.BATCH_ACTIONS}
-                  </UtilityBarAction>
+                <UtilityBarAction
+                  iconSide="right"
+                  iconType="arrowDown"
+                  popoverContent={getBatchItemsPopoverContent}
+                >
+                  {i18n.BATCH_ACTIONS}
+                </UtilityBarAction>
 
-                  <UtilityBarAction
-                    iconType="listAdd"
-                    onClick={() => {
-                      if (!showClearSelection) {
-                        selectAll();
-                      } else {
-                        clearSelection();
-                      }
-                    }}
-                  >
-                    {showClearSelection
-                      ? i18n.CLEAR_SELECTION
-                      : i18n.SELECT_ALL_SIGNALS(formattedTotalCount, totalCount)}
-                  </UtilityBarAction>
-                </>
-              )}
-            </UtilityBarGroup>
-          </UtilityBarSection>
-        </UtilityBar>
-      </>
-    );
-  },
-  (prevProps, nextProps) => {
-    return (
-      prevProps.selectedEventIds === nextProps.selectedEventIds &&
-      prevProps.totalCount === nextProps.totalCount &&
-      prevProps.showClearSelection === nextProps.showClearSelection
-    );
-  }
+                <UtilityBarAction
+                  iconType="listAdd"
+                  onClick={() => {
+                    if (!showClearSelection) {
+                      selectAll();
+                    } else {
+                      clearSelection();
+                    }
+                  }}
+                >
+                  {showClearSelection
+                    ? i18n.CLEAR_SELECTION
+                    : i18n.SELECT_ALL_SIGNALS(formattedTotalCount, totalCount)}
+                </UtilityBarAction>
+              </>
+            )}
+          </UtilityBarGroup>
+        </UtilityBarSection>
+      </UtilityBar>
+    </>
+  );
+};
+
+export const SignalsUtilityBar = React.memo(
+  SignalsUtilityBarComponent,
+  (prevProps, nextProps) =>
+    prevProps.selectedEventIds === nextProps.selectedEventIds &&
+    prevProps.totalCount === nextProps.totalCount &&
+    prevProps.showClearSelection === nextProps.showClearSelection
 );
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_chart/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_chart/index.tsx
index 094f17922af1ac..01ebafdccfefdb 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_chart/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_chart/index.tsx
@@ -23,7 +23,7 @@ export const sampleChartOptions = [
   { text: 'Top users', value: 'users' },
 ];
 
-export const SignalsCharts = memo(() => (
+const SignalsChartsComponent = () => (
   <EuiPanel>
     <HeaderSection title="Signal detection frequency">
       <EuiSelect
@@ -36,4 +36,6 @@ export const SignalsCharts = memo(() => (
 
     <HistogramSignals />
   </EuiPanel>
-));
+);
+
+export const SignalsCharts = memo(SignalsChartsComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
index ad5d210efa42d5..1fcd8c7da82569 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import {
   EuiBadge,
   EuiHealth,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.tsx
index 66353a9613650a..77a30b70705ff0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
-import React, { memo } from 'react';
+import React from 'react';
 
 import { RuleStatusIcon, RuleStatusIconProps } from '../status_icon';
 
@@ -13,7 +13,7 @@ interface AccordionTitleProps extends RuleStatusIconProps {
   title: string;
 }
 
-export const AccordionTitle = memo<AccordionTitleProps>(({ name, title, type }) => (
+const AccordionTitleComponent: React.FC<AccordionTitleProps> = ({ name, title, type }) => (
   <EuiFlexGroup alignItems="center" gutterSize="m" responsive={false}>
     <EuiFlexItem grow={false}>
       <RuleStatusIcon name={name} type={type} />
@@ -24,4 +24,6 @@ export const AccordionTitle = memo<AccordionTitleProps>(({ name, title, type })
       </EuiTitle>
     </EuiFlexItem>
   </EuiFlexGroup>
-));
+);
+
+export const AccordionTitle = React.memo(AccordionTitleComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_label.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_label.tsx
index 15844f50122910..bc2cd39da44be7 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_label.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_label.tsx
@@ -16,7 +16,7 @@ interface Props {
   valueLabel?: string;
 }
 
-export const FilterLabel = memo<Props>(({ filter, valueLabel }) => {
+const FilterLabelComponent: React.FC<Props> = ({ filter, valueLabel }) => {
   const prefixText = filter.meta.negate
     ? ` ${i18n.translate('xpack.siem.detectionEngine.createRule.filterLabel.negatedFilterPrefix', {
         defaultMessage: 'NOT ',
@@ -90,4 +90,6 @@ export const FilterLabel = memo<Props>(({ filter, valueLabel }) => {
         </>
       );
   }
-});
+};
+
+export const FilterLabel = memo(FilterLabelComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
index 39c660a0079a6f..a05f43579e6694 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
@@ -68,34 +68,35 @@ const MyEuiTextArea = styled(EuiTextArea)`
   height: 80px;
 `;
 
-export const StepRuleDescription = memo<StepRuleDescriptionProps>(
-  ({ data, direction = 'row', indexPatterns, schema }) => {
-    const kibana = useKibana();
-    const [filterManager] = useState<FilterManager>(new FilterManager(kibana.services.uiSettings));
+const StepRuleDescriptionComponent: React.FC<StepRuleDescriptionProps> = ({
+  data,
+  direction = 'row',
+  indexPatterns,
+  schema,
+}) => {
+  const kibana = useKibana();
+  const [filterManager] = useState<FilterManager>(new FilterManager(kibana.services.uiSettings));
 
-    const keys = Object.keys(schema);
-    const listItems = keys.reduce(
-      (acc: ListItems[], key: string) => [
-        ...acc,
-        ...buildListItems(data, pick(key, schema), filterManager, indexPatterns),
-      ],
-      []
-    );
-    return (
-      <EuiFlexGroup gutterSize="none" direction={direction} justifyContent="spaceAround">
-        {chunk(Math.ceil(listItems.length / 2), listItems).map((chunckListItems, index) => (
-          <EuiFlexItemWidth
-            direction={direction}
-            key={`description-step-rule-${index}`}
-            grow={false}
-          >
-            <EuiDescriptionList listItems={chunckListItems} compressed />
-          </EuiFlexItemWidth>
-        ))}
-      </EuiFlexGroup>
-    );
-  }
-);
+  const keys = Object.keys(schema);
+  const listItems = keys.reduce(
+    (acc: ListItems[], key: string) => [
+      ...acc,
+      ...buildListItems(data, pick(key, schema), filterManager, indexPatterns),
+    ],
+    []
+  );
+  return (
+    <EuiFlexGroup gutterSize="none" direction={direction} justifyContent="spaceAround">
+      {chunk(Math.ceil(listItems.length / 2), listItems).map((chunckListItems, index) => (
+        <EuiFlexItemWidth direction={direction} key={`description-step-rule-${index}`} grow={false}>
+          <EuiDescriptionList listItems={chunckListItems} compressed />
+        </EuiFlexItemWidth>
+      ))}
+    </EuiFlexGroup>
+  );
+};
+
+export const StepRuleDescription = memo(StepRuleDescriptionComponent);
 
 interface ListItems {
   title: NonNullable<ReactNode>;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx
index 22b116557ae6e5..48ff0d80d0398f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx
@@ -25,7 +25,7 @@ const RuleStatusIconStyled = styled.div`
   }
 `;
 
-export const RuleStatusIcon = memo<RuleStatusIconProps>(({ name, type }) => {
+const RuleStatusIconComponent: React.FC<RuleStatusIconProps> = ({ name, type }) => {
   const theme = useEuiTheme();
   const color = type === 'passive' ? theme.euiColorLightestShade : theme.euiColorDarkestShade;
   return (
@@ -34,4 +34,6 @@ export const RuleStatusIcon = memo<RuleStatusIconProps>(({ name, type }) => {
       {type === 'valid' ? <EuiIcon type="check" color={theme.euiColorEmptyShade} size="l" /> : null}
     </RuleStatusIconStyled>
   );
-});
+};
+
+export const RuleStatusIcon = memo(RuleStatusIconComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx
index 21b38a83dad9da..88cecadb8b137d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx
@@ -17,15 +17,15 @@ interface StepPanelProps {
 }
 
 const MyPanel = styled(EuiPanel)`
-  poistion: relative;
+  position: relative;
 `;
 
-export const StepPanel = memo<StepPanelProps>(({ children, loading, title }) => {
-  return (
-    <MyPanel>
-      {loading && <EuiProgress size="xs" color="accent" position="absolute" />}
-      <HeaderSection title={title} />
-      {children}
-    </MyPanel>
-  );
-});
+const StepPanelComponent: React.FC<StepPanelProps> = ({ children, loading, title }) => (
+  <MyPanel>
+    {loading && <EuiProgress size="xs" color="accent" position="absolute" />}
+    <HeaderSection title={title} />
+    {children}
+  </MyPanel>
+);
+
+export const StepPanel = memo(StepPanelComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx b/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
index 4dec9278ed6b02..86f702a8ad8a46 100644
--- a/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
@@ -17,7 +17,6 @@ import * as i18n from './translations';
 const TimelinesContainer = styled.div`
   width: 100%;
 `;
-TimelinesContainer.displayName = 'TimelinesContainer';
 
 interface TimelinesProps<TCache = object> {
   apolloClient: ApolloClient<TCache>;
@@ -27,7 +26,7 @@ type OwnProps = TimelinesProps;
 
 export const DEFAULT_SEARCH_RESULTS_PER_PAGE = 10;
 
-export const TimelinesPage = React.memo<OwnProps>(({ apolloClient }) => (
+const TimelinesPageComponent: React.FC<OwnProps> = ({ apolloClient }) => (
   <>
     <WrapperPage>
       <HeaderPage border title={i18n.PAGE_TITLE} />
@@ -44,4 +43,6 @@ export const TimelinesPage = React.memo<OwnProps>(({ apolloClient }) => (
 
     <SpyRoute />
   </>
-));
+);
+
+export const TimelinesPage = React.memo(TimelinesPageComponent);
diff --git a/x-pack/legacy/plugins/siem/public/routes.tsx b/x-pack/legacy/plugins/siem/public/routes.tsx
index 0e9bcf5dc5bfad..cbb58a473e8ea0 100644
--- a/x-pack/legacy/plugins/siem/public/routes.tsx
+++ b/x-pack/legacy/plugins/siem/public/routes.tsx
@@ -16,7 +16,7 @@ interface RouterProps {
   history: History;
 }
 
-export const PageRouter: FC<RouterProps> = memo(({ history }) => (
+const PageRouterComponent: FC<RouterProps> = ({ history }) => (
   <ManageRoutesSpy>
     <Router history={history}>
       <Switch>
@@ -25,4 +25,6 @@ export const PageRouter: FC<RouterProps> = memo(({ history }) => (
       </Switch>
     </Router>
   </ManageRoutesSpy>
-));
+);
+
+export const PageRouter = memo(PageRouterComponent);
diff --git a/x-pack/legacy/plugins/siem/public/utils/route/manage_spy_routes.tsx b/x-pack/legacy/plugins/siem/public/utils/route/manage_spy_routes.tsx
index 87b40c565c7585..d1e76f75fca81c 100644
--- a/x-pack/legacy/plugins/siem/public/utils/route/manage_spy_routes.tsx
+++ b/x-pack/legacy/plugins/siem/public/utils/route/manage_spy_routes.tsx
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { memo, useReducer } from 'react';
+import React, { FC, memo, useReducer } from 'react';
 
 import { ManageRoutesSpyProps, RouteSpyState, RouteSpyAction } from './types';
 import { RouterSpyStateContext, initRouteSpy } from './helpers';
 
-export const ManageRoutesSpy = memo(({ children }: ManageRoutesSpyProps) => {
+const ManageRoutesSpyComponent: FC<ManageRoutesSpyProps> = ({ children }) => {
   const reducerSpyRoute = (state: RouteSpyState, action: RouteSpyAction) => {
     switch (action.type) {
       case 'updateRoute':
@@ -28,4 +28,6 @@ export const ManageRoutesSpy = memo(({ children }: ManageRoutesSpyProps) => {
       {children}
     </RouterSpyStateContext.Provider>
   );
-});
+};
+
+export const ManageRoutesSpy = memo(ManageRoutesSpyComponent);

From 334dff37d4b55655e704dac0e97558787ae9e315 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Tue, 7 Jan 2020 18:47:00 +0100
Subject: [PATCH 28/96] [Uptime] Added date range filter into expanded list
 query (#52609)

* added filters into expanded list query

* update filters

* update query

* update snap

* update tests

* update filters

* update test

* remove side effect

* ignore typcehck

* update to remove location filter from query

* update filter groups

* remove code

* update test
---
 package.json                                  |  4 +-
 .../__tests__/monitor_list_drawer.test.tsx    |  3 +-
 .../monitor_list_drawer.tsx                   | 29 +++++-----
 .../uptime/public/state/actions/monitor.ts    | 10 ++--
 .../uptime/public/state/actions/types.ts      |  7 +++
 .../plugins/uptime/public/state/actions/ui.ts | 48 +++-------------
 .../uptime/public/state/api/monitor.ts        | 18 +++++-
 .../plugins/uptime/public/state/api/types.ts  | 14 +++++
 .../uptime/public/state/effects/monitor.ts    | 10 +++-
 .../__tests__/__snapshots__/ui.test.ts.snap   |  2 +-
 .../state/reducers/__tests__/ui.test.ts       | 35 ++++++------
 .../uptime/public/state/reducers/index.ts     |  1 +
 .../uptime/public/state/reducers/ui.ts        | 54 ++++++++----------
 .../state/selectors/__tests__/index.test.ts   |  6 +-
 .../uptime/public/state/selectors/index.ts    |  2 +
 .../lib/adapters/monitors/adapter_types.ts    |  2 +
 .../elasticsearch_monitors_adapter.ts         | 26 ++++++---
 .../pings/elasticsearch_pings_adapter.ts      |  8 +--
 .../server/lib/helper/get_filter_clause.ts    | 13 +----
 .../rest_api/monitors/monitors_details.ts     | 14 +++--
 x-pack/package.json                           |  4 +-
 yarn.lock                                     | 56 +++++++++++++------
 22 files changed, 205 insertions(+), 161 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/api/types.ts

diff --git a/package.json b/package.json
index 99151f33962c44..0a389a3a08c57e 100644
--- a/package.json
+++ b/package.json
@@ -240,7 +240,7 @@
     "react-use": "^13.13.0",
     "reactcss": "1.2.3",
     "redux": "4.0.0",
-    "redux-actions": "2.2.1",
+    "redux-actions": "2.6.5",
     "redux-thunk": "2.3.0",
     "regenerator-runtime": "^0.13.3",
     "regression": "2.0.1",
@@ -353,7 +353,7 @@
     "@types/react-router-dom": "^5.1.3",
     "@types/react-virtualized": "^9.18.7",
     "@types/redux": "^3.6.31",
-    "@types/redux-actions": "^2.2.1",
+    "@types/redux-actions": "^2.6.1",
     "@types/request": "^2.48.2",
     "@types/selenium-webdriver": "^4.0.5",
     "@types/semver": "^5.5.0",
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
index aca43f550aa146..5c606f2356dfca 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
@@ -8,11 +8,12 @@ import { MonitorSummary, Check } from '../../../../../../common/graphql/types';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import React from 'react';
 import { MonitorListDrawerComponent } from '../monitor_list_drawer';
+import { MonitorDetails } from '../../../../../../common/runtime_types';
 
 describe('MonitorListDrawer component', () => {
   let summary: MonitorSummary;
   let loadMonitorDetails: any;
-  let monitorDetails: any;
+  let monitorDetails: MonitorDetails;
 
   beforeEach(() => {
     summary = {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
index d793e60dcd089b..35b649fa357953 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
@@ -6,7 +6,6 @@
 
 import React, { useEffect } from 'react';
 import { EuiLink, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
-import { get } from 'lodash';
 import styled from 'styled-components';
 import { connect } from 'react-redux';
 import { MonitorSummary } from '../../../../../common/graphql/types';
@@ -16,6 +15,8 @@ import { MostRecentError } from './most_recent_error';
 import { getMonitorDetails } from '../../../../state/selectors';
 import { MonitorStatusList } from './monitor_status_list';
 import { MonitorDetails } from '../../../../../common/runtime_types';
+import { useUrlParams } from '../../../../hooks';
+import { MonitorDetailsActionPayload } from '../../../../state/actions/types';
 import { MonitorListActionsPopover } from '../monitor_list_actions_popover';
 
 const ContainerDiv = styled.div`
@@ -50,19 +51,20 @@ export function MonitorListDrawerComponent({
   monitorDetails,
 }: MonitorListDrawerProps) {
   const monitorId = summary?.monitor_id;
-  useEffect(() => {
-    if (monitorId) {
-      loadMonitorDetails(monitorId);
-    }
-  }, [loadMonitorDetails, monitorId]);
+  const [getUrlParams] = useUrlParams();
+  const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = getUrlParams();
 
-  if (!summary || !summary.state.checks) {
-    return null;
-  }
+  useEffect(() => {
+    loadMonitorDetails({
+      dateStart,
+      dateEnd,
+      monitorId,
+    });
+  }, [dateStart, dateEnd, monitorId, loadMonitorDetails]);
 
-  const monitorUrl: string | undefined = get(summary.state.url, 'full', undefined);
+  const monitorUrl = summary?.state?.url?.full || '';
 
-  return (
+  return summary && summary.state.checks ? (
     <ContainerDiv>
       <EuiFlexGroup>
         <EuiFlexItem grow={true}>
@@ -87,7 +89,7 @@ export function MonitorListDrawerComponent({
         />
       )}
     </ContainerDiv>
-  );
+  ) : null;
 }
 
 const mapStateToProps = (state: AppState, { summary }: any) => ({
@@ -95,7 +97,8 @@ const mapStateToProps = (state: AppState, { summary }: any) => ({
 });
 
 const mapDispatchToProps = (dispatch: any) => ({
-  loadMonitorDetails: (monitorId: string) => dispatch(fetchMonitorDetails(monitorId)),
+  loadMonitorDetails: (actionPayload: MonitorDetailsActionPayload) =>
+    dispatch(fetchMonitorDetails(actionPayload)),
 });
 
 export const MonitorListDrawer = connect(
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts b/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts
index 99855bb8c8df31..cf4525a08e43cd 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { MonitorDetailsActionPayload } from './types';
+import { MonitorError } from '../../../common/runtime_types';
 import { MonitorLocations } from '../../../common/runtime_types';
 import { QueryParams } from './types';
 
@@ -17,12 +19,12 @@ export const FETCH_MONITOR_LOCATIONS_FAIL = 'FETCH_MONITOR_LOCATIONS_FAIL';
 
 export interface MonitorDetailsState {
   monitorId: string;
-  error: Error;
+  error: MonitorError;
 }
 
 interface GetMonitorDetailsAction {
   type: typeof FETCH_MONITOR_DETAILS;
-  payload: string;
+  payload: MonitorDetailsActionPayload;
 }
 
 interface GetMonitorDetailsSuccessAction {
@@ -54,10 +56,10 @@ interface GetMonitorLocationsFailAction {
   payload: any;
 }
 
-export function fetchMonitorDetails(monitorId: string): GetMonitorDetailsAction {
+export function fetchMonitorDetails(payload: MonitorDetailsActionPayload): GetMonitorDetailsAction {
   return {
     type: FETCH_MONITOR_DETAILS,
-    payload: monitorId,
+    payload,
   };
 }
 
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
index 7ec288583f9feb..8419aaadc74bdd 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
@@ -10,3 +10,10 @@ export interface QueryParams {
   filters?: string;
   statusFilter?: string;
 }
+
+export interface MonitorDetailsActionPayload {
+  monitorId: string;
+  dateStart: string;
+  dateEnd: string;
+  location?: string;
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts b/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts
index 0bb2d8447419b4..fb38599495d845 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts
@@ -3,53 +3,19 @@
  * 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 SET_INTEGRATION_POPOVER_STATE = 'SET_INTEGRATION_POPOVER_STATE';
-export const SET_BASE_PATH = 'SET_BASE_PATH';
-export const REFRESH_APP = 'REFRESH_APP';
+import { createAction } from 'redux-actions';
 
 export interface PopoverState {
   id: string;
   open: boolean;
 }
 
-interface SetBasePathAction {
-  type: typeof SET_BASE_PATH;
-  payload: string;
-}
-
-interface SetIntegrationPopoverAction {
-  type: typeof SET_INTEGRATION_POPOVER_STATE;
-  payload: PopoverState;
-}
-
-interface TriggerAppRefreshAction {
-  type: typeof REFRESH_APP;
-  payload: number;
-}
+export type UiPayload = PopoverState & string & number & Map<string, string[]>;
 
-export type UiActionTypes =
-  | SetIntegrationPopoverAction
-  | SetBasePathAction
-  | TriggerAppRefreshAction;
+export const setBasePath = createAction<string>('SET BASE PATH');
 
-export function toggleIntegrationsPopover(popoverState: PopoverState): SetIntegrationPopoverAction {
-  return {
-    type: SET_INTEGRATION_POPOVER_STATE,
-    payload: popoverState,
-  };
-}
+export const triggerAppRefresh = createAction<number>('REFRESH APP');
 
-export function setBasePath(basePath: string): SetBasePathAction {
-  return {
-    type: SET_BASE_PATH,
-    payload: basePath,
-  };
-}
-
-export function triggerAppRefresh(refreshTime: number): TriggerAppRefreshAction {
-  return {
-    type: REFRESH_APP,
-    payload: refreshTime,
-  };
-}
+export const toggleIntegrationsPopover = createAction<PopoverState>(
+  'TOGGLE INTEGRATION POPOVER STATE'
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts b/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts
index 0fb00b935342e6..8b1220830f091b 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts
@@ -6,6 +6,7 @@
 
 import { ThrowReporter } from 'io-ts/lib/ThrowReporter';
 import { getApiPath } from '../../lib/helper';
+import { BaseParams } from './types';
 import {
   MonitorDetailsType,
   MonitorDetails,
@@ -19,12 +20,23 @@ interface ApiRequest {
   basePath: string;
 }
 
+export type MonitorQueryParams = BaseParams & ApiRequest;
+
 export const fetchMonitorDetails = async ({
   monitorId,
   basePath,
-}: ApiRequest): Promise<MonitorDetails> => {
-  const url = getApiPath(`/api/uptime/monitor/details?monitorId=${monitorId}`, basePath);
-  const response = await fetch(url);
+  dateStart,
+  dateEnd,
+}: MonitorQueryParams): Promise<MonitorDetails> => {
+  const url = getApiPath(`/api/uptime/monitor/details`, basePath);
+  const params = {
+    monitorId,
+    dateStart,
+    dateEnd,
+  };
+  const urlParams = new URLSearchParams(params).toString();
+  const response = await fetch(`${url}?${urlParams}`);
+
   if (!response.ok) {
     throw new Error(response.statusText);
   }
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/types.ts b/x-pack/legacy/plugins/uptime/public/state/api/types.ts
new file mode 100644
index 00000000000000..278cfce29986f0
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/api/types.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface BaseParams {
+  basePath: string;
+  dateStart: string;
+  dateEnd: string;
+  filters?: string;
+  statusFilter?: string;
+  location?: string;
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts b/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts
index 210004bb343bbe..1cac7424b4e5ba 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts
@@ -16,12 +16,18 @@ import {
 } from '../actions/monitor';
 import { fetchMonitorDetails, fetchMonitorLocations } from '../api';
 import { getBasePath } from '../selectors';
+import { MonitorDetailsActionPayload } from '../actions/types';
 
 function* monitorDetailsEffect(action: Action<any>) {
-  const monitorId: string = action.payload;
+  const { monitorId, dateStart, dateEnd }: MonitorDetailsActionPayload = action.payload;
   try {
     const basePath = yield select(getBasePath);
-    const response = yield call(fetchMonitorDetails, { monitorId, basePath });
+    const response = yield call(fetchMonitorDetails, {
+      monitorId,
+      basePath,
+      dateStart,
+      dateEnd,
+    });
     yield put({ type: FETCH_MONITOR_DETAILS_SUCCESS, payload: response });
   } catch (error) {
     yield put({ type: FETCH_MONITOR_DETAILS_FAIL, payload: error.message });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
index 75516da18c6336..155f7edbcbf33c 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
@@ -21,7 +21,7 @@ Object {
 
 exports[`ui reducer updates the refresh value 1`] = `
 Object {
-  "basePath": "",
+  "basePath": "abc",
   "integrationsPopoverOpen": null,
   "lastRefresh": 125,
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
index 9be863f0b700d5..ff9b7c3f9e8a47 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
@@ -4,15 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UiActionTypes } from '../../actions';
+import { setBasePath, toggleIntegrationsPopover, triggerAppRefresh } from '../../actions';
 import { uiReducer } from '../ui';
+import { Action } from 'redux-actions';
 
 describe('ui reducer', () => {
   it(`sets the application's base path`, () => {
-    const action: UiActionTypes = {
-      type: 'SET_BASE_PATH',
-      payload: 'yyz',
-    };
+    const action = setBasePath('yyz') as Action<never>;
     expect(
       uiReducer(
         {
@@ -26,13 +24,10 @@ describe('ui reducer', () => {
   });
 
   it('adds integration popover status to state', () => {
-    const action: UiActionTypes = {
-      type: 'SET_INTEGRATION_POPOVER_STATE',
-      payload: {
-        id: 'popover-2',
-        open: true,
-      },
-    };
+    const action = toggleIntegrationsPopover({
+      id: 'popover-2',
+      open: true,
+    }) as Action<never>;
     expect(
       uiReducer(
         {
@@ -46,10 +41,16 @@ describe('ui reducer', () => {
   });
 
   it('updates the refresh value', () => {
-    const action: UiActionTypes = {
-      type: 'REFRESH_APP',
-      payload: 125,
-    };
-    expect(uiReducer(undefined, action)).toMatchSnapshot();
+    const action = triggerAppRefresh(125) as Action<never>;
+    expect(
+      uiReducer(
+        {
+          basePath: 'abc',
+          integrationsPopoverOpen: null,
+          lastRefresh: 125,
+        },
+        action
+      )
+    ).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
index f0c3d1c2cbecf6..b588feaf8a75a6 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
@@ -12,5 +12,6 @@ import { uiReducer } from './ui';
 export const rootReducer = combineReducers({
   monitor: monitorReducer,
   snapshot: snapshotReducer,
+  // @ts-ignore for now TODO: refactor to use redux-action
   ui: uiReducer,
 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts
index be95c8fff6bec2..b23245aa65fcaa 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { handleActions, Action } from 'redux-actions';
 import {
-  UiActionTypes,
   PopoverState,
-  SET_INTEGRATION_POPOVER_STATE,
-  SET_BASE_PATH,
-  REFRESH_APP,
+  toggleIntegrationsPopover,
+  setBasePath,
+  triggerAppRefresh,
+  UiPayload,
 } from '../actions/ui';
 
 export interface UiState {
@@ -24,29 +25,22 @@ const initialState: UiState = {
   lastRefresh: Date.now(),
 };
 
-export function uiReducer(state = initialState, action: UiActionTypes): UiState {
-  switch (action.type) {
-    case REFRESH_APP:
-      return {
-        ...state,
-        lastRefresh: action.payload,
-      };
-    case SET_INTEGRATION_POPOVER_STATE:
-      const popoverState = action.payload;
-      return {
-        ...state,
-        integrationsPopoverOpen: {
-          id: popoverState.id,
-          open: popoverState.open,
-        },
-      };
-    case SET_BASE_PATH:
-      const basePath = action.payload;
-      return {
-        ...state,
-        basePath,
-      };
-    default:
-      return state;
-  }
-}
+export const uiReducer = handleActions<UiState, UiPayload>(
+  {
+    [String(toggleIntegrationsPopover)]: (state, action: Action<PopoverState>) => ({
+      ...state,
+      integrationsPopoverOpen: action.payload as PopoverState,
+    }),
+
+    [String(setBasePath)]: (state, action: Action<string>) => ({
+      ...state,
+      basePath: action.payload as string,
+    }),
+
+    [String(triggerAppRefresh)]: (state, action: Action<number>) => ({
+      ...state,
+      lastRefresh: action.payload as number,
+    }),
+  },
+  initialState
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index b61ed836634354..33b6400c56c608 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -25,7 +25,11 @@ describe('state selectors', () => {
       errors: [],
       loading: false,
     },
-    ui: { basePath: 'yyz', integrationsPopoverOpen: null, lastRefresh: 125 },
+    ui: {
+      basePath: 'yyz',
+      integrationsPopoverOpen: null,
+      lastRefresh: 125,
+    },
   };
 
   it('selects base path from state', () => {
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
index 1792c84c45220e..08d1e8c8ca36d7 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
@@ -6,11 +6,13 @@
 
 import { AppState } from '../../state';
 
+// UI Selectors
 export const getBasePath = ({ ui: { basePath } }: AppState) => basePath;
 
 export const isIntegrationsPopupOpen = ({ ui: { integrationsPopoverOpen } }: AppState) =>
   integrationsPopoverOpen;
 
+// Monitor Selectors
 export const getMonitorDetails = (state: AppState, summary: any) => {
   return state.monitor.monitorDetailsList[summary.monitor_id];
 };
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
index b3d8cb855d55a1..99d346e5d666eb 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
@@ -27,6 +27,8 @@ export interface GetFilterBarParams {
 
 export interface GetMonitorDetailsParams {
   monitorId: string;
+  dateStart: string;
+  dateEnd: string;
 }
 
 export interface GetMonitorPageTitleParams {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
index b3352054589659..5f4c2e45d97597 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
@@ -231,7 +231,23 @@ export const elasticsearchMonitorsAdapter: UMMonitorsAdapter = {
     };
   },
 
-  getMonitorDetails: async ({ callES, monitorId }) => {
+  getMonitorDetails: async ({ callES, monitorId, dateStart, dateEnd }) => {
+    const queryFilters: any = [
+      {
+        range: {
+          '@timestamp': {
+            gte: dateStart,
+            lte: dateEnd,
+          },
+        },
+      },
+      {
+        term: {
+          'monitor.id': monitorId,
+        },
+      },
+    ];
+
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
       body: {
@@ -246,13 +262,7 @@ export const elasticsearchMonitorsAdapter: UMMonitorsAdapter = {
                 },
               },
             ],
-            filter: [
-              {
-                term: {
-                  'monitor.id': monitorId,
-                },
-              },
-            ],
+            filter: queryFilters,
           },
         },
         sort: [
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
index 6862bed8d2bdd5..d05cb5758ca364 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
@@ -157,14 +157,14 @@ export const elasticsearchPingsAdapter: UMPingsAdapter = {
     statusFilter,
   }) => {
     const boolFilters = parseFilterQuery(filters);
-    const additionaFilters = [];
+    const additionalFilters = [];
     if (monitorId) {
-      additionaFilters.push({ match: { 'monitor.id': monitorId } });
+      additionalFilters.push({ match: { 'monitor.id': monitorId } });
     }
     if (boolFilters) {
-      additionaFilters.push(boolFilters);
+      additionalFilters.push(boolFilters);
     }
-    const filter = getFilterClause(dateRangeStart, dateRangeEnd, additionaFilters);
+    const filter = getFilterClause(dateRangeStart, dateRangeEnd, additionalFilters);
     const interval = getHistogramInterval(dateRangeStart, dateRangeEnd);
     const intervalFormatted = getHistogramIntervalFormatted(dateRangeStart, dateRangeEnd);
 
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/get_filter_clause.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/get_filter_clause.ts
index 5259aa1d617116..c81fec933cb227 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/get_filter_clause.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/get_filter_clause.ts
@@ -4,14 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-const getRange = (dateRangeStart: string, dateRangeEnd: string) => ({
-  range: {
-    '@timestamp': {
-      gte: dateRangeStart,
-      lte: dateRangeEnd,
-    },
-  },
-});
+import { makeDateRangeFilter } from './make_date_rate_filter';
 
 export const getFilterClause = (
   dateRangeStart: string,
@@ -19,5 +12,5 @@ export const getFilterClause = (
   additionalKeys?: Array<{ [key: string]: any }>
 ) =>
   additionalKeys && additionalKeys.length > 0
-    ? [getRange(dateRangeStart, dateRangeEnd), ...additionalKeys]
-    : [getRange(dateRangeStart, dateRangeEnd)];
+    ? [makeDateRangeFilter(dateRangeStart, dateRangeEnd), ...additionalKeys]
+    : [makeDateRangeFilter(dateRangeStart, dateRangeEnd)];
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
index a57e5ec469c59d..9e1bc6f0d6a96b 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
@@ -13,18 +13,24 @@ export const createGetMonitorDetailsRoute: UMRestApiRouteFactory = (libs: UMServ
   path: '/api/uptime/monitor/details',
   validate: {
     query: schema.object({
-      monitorId: schema.maybe(schema.string()),
+      monitorId: schema.string(),
+      dateStart: schema.maybe(schema.string()),
+      dateEnd: schema.maybe(schema.string()),
     }),
   },
   options: {
     tags: ['access:uptime'],
   },
   handler: async ({ callES }, _context, request, response): Promise<any> => {
-    const { monitorId } = request.query;
-
+    const { monitorId, dateStart, dateEnd } = request.query;
     return response.ok({
       body: {
-        ...(await libs.monitors.getMonitorDetails({ callES, monitorId })),
+        ...(await libs.monitors.getMonitorDetails({
+          callES,
+          monitorId,
+          dateStart,
+          dateEnd,
+        })),
       },
     });
   },
diff --git a/x-pack/package.json b/x-pack/package.json
index 110db56c5d4ed4..d513e4ed349654 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -96,7 +96,7 @@
     "@types/react-test-renderer": "^16.9.1",
     "@types/recompose": "^0.30.6",
     "@types/reduce-reducers": "^0.3.0",
-    "@types/redux-actions": "^2.2.1",
+    "@types/redux-actions": "^2.6.1",
     "@types/sinon": "^7.0.13",
     "@types/styled-components": "^4.4.1",
     "@types/supertest": "^2.0.5",
@@ -313,7 +313,7 @@
     "recompose": "^0.26.0",
     "reduce-reducers": "^0.4.3",
     "redux": "4.0.0",
-    "redux-actions": "2.2.1",
+    "redux-actions": "2.6.5",
     "redux-observable": "^1.0.0",
     "redux-saga": "^0.16.0",
     "redux-thunk": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 0026370927fe10..e44b03df711fd8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4148,10 +4148,10 @@
   dependencies:
     redux "^4.0.0"
 
-"@types/redux-actions@^2.2.1":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@types/redux-actions/-/redux-actions-2.3.0.tgz#d28d7913ec86ee9e20ecb33a1fed887ecb538149"
-  integrity sha512-N5gZT7Tg5HGRbQH56D6umLhv1R4koEFjfz5+2TFo/tjAz3Y3Aj+hjQBum3UUO4D53hYO439UlWP5Q+S63vujrQ==
+"@types/redux-actions@^2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@types/redux-actions/-/redux-actions-2.6.1.tgz#0940e97fa35ad3004316bddb391d8e01d2efa605"
+  integrity sha512-zKgK+ATp3sswXs6sOYo1tk8xdXTy4CTaeeYrVQlClCjeOpag5vzPo0ASWiiBJ7vsiQRAdb3VkuFLnDoBimF67g==
 
 "@types/redux@^3.6.31":
   version "3.6.31"
@@ -17629,6 +17629,11 @@ jszip@^3.1.5:
     readable-stream "~2.3.6"
     set-immediate-shim "~1.0.1"
 
+just-curry-it@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/just-curry-it/-/just-curry-it-3.1.0.tgz#ab59daed308a58b847ada166edd0a2d40766fbc5"
+  integrity sha512-mjzgSOFzlrurlURaHVjnQodyPNvrHrf1TbQP2XU9NSqBtHQPuHZ+Eb6TAJP7ASeJN9h9K0KXoRTs8u6ouHBKvg==
+
 just-debounce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea"
@@ -18346,7 +18351,7 @@ locutus@^2.0.5:
   resolved "https://registry.yarnpkg.com/locutus/-/locutus-2.0.10.tgz#f903619466a98a4ab76e8b87a5854b55a743b917"
   integrity sha512-AZg2kCqrquMJ5FehDsBidV0qHl98NrsYtseUClzjAQ3HFnsDBJTCwGVplSQ82t9/QfgahqvTjaKcZqZkHmS0wQ==
 
-lodash-es@^4.17.11, lodash-es@^4.17.4, lodash-es@^4.17.5, lodash-es@^4.2.1:
+lodash-es@^4.17.11, lodash-es@^4.17.5, lodash-es@^4.2.1:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
   integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
@@ -24085,25 +24090,21 @@ redeyed@~2.1.0:
   dependencies:
     esprima "~4.0.0"
 
-reduce-reducers@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.2.tgz#fa1b4718bc5292a71ddd1e5d839c9bea9770f14b"
-  integrity sha1-+htHGLxSkqcd3R5dg5yb6pdw8Us=
-
 reduce-reducers@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.4.3.tgz#8e052618801cd8fc2714b4915adaa8937eb6d66c"
   integrity sha512-+CNMnI8QhgVMtAt54uQs3kUxC3Sybpa7Y63HR14uGLgI9/QR5ggHvpxwhGGe3wmx5V91YwqQIblN9k5lspAmGw==
 
-redux-actions@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.2.1.tgz#d64186b25649a13c05478547d7cd7537b892410d"
-  integrity sha1-1kGGslZJoTwFR4VH1811N7iSQQ0=
+redux-actions@2.6.5:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.6.5.tgz#bdca548768ee99832a63910c276def85e821a27e"
+  integrity sha512-pFhEcWFTYNk7DhQgxMGnbsB1H2glqhQJRQrtPb96kD3hWiZRzXHwwmFPswg6V2MjraXRXWNmuP9P84tvdLAJmw==
   dependencies:
-    invariant "^2.2.1"
-    lodash "^4.13.1"
-    lodash-es "^4.17.4"
-    reduce-reducers "^0.1.0"
+    invariant "^2.2.4"
+    just-curry-it "^3.1.0"
+    loose-envify "^1.4.0"
+    reduce-reducers "^0.4.3"
+    to-camel-case "^1.0.0"
 
 redux-observable@^1.0.0:
   version "1.0.0"
@@ -27681,6 +27682,13 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
+to-camel-case@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz#1a56054b2f9d696298ce66a60897322b6f423e46"
+  integrity sha1-GlYFSy+daWKYzmamCJcyK29CPkY=
+  dependencies:
+    to-space-case "^1.0.0"
+
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -27691,6 +27699,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-no-case@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/to-no-case/-/to-no-case-1.0.2.tgz#c722907164ef6b178132c8e69930212d1b4aa16a"
+  integrity sha1-xyKQcWTvaxeBMsjmmTAhLRtKoWo=
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -27739,6 +27752,13 @@ to-source-code@^1.0.0:
   dependencies:
     is-nil "^1.0.0"
 
+to-space-case@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz#b052daafb1b2b29dc770cea0163e5ec0ebc9fc17"
+  integrity sha1-sFLar7Gysp3HcM6gFj5ewOvJ/Bc=
+  dependencies:
+    to-no-case "^1.0.0"
+
 to-through@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"

From 49d6a457889c45913abe355d1948301ae31f4998 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2020 19:08:36 +0100
Subject: [PATCH 29/96] Update eslint related packages (#54107)

---
 package.json                                  |   28 +-
 packages/eslint-config-kibana/package.json    |   18 +-
 .../kbn-eslint-plugin-eslint/package.json     |    4 +-
 packages/kbn-pm/dist/index.js                 | 1079 +++++++++++++++--
 x-pack/legacy/plugins/reporting/index.test.js |    1 +
 yarn.lock                                     |  303 ++---
 6 files changed, 1135 insertions(+), 298 deletions(-)

diff --git a/package.json b/package.json
index 0a389a3a08c57e..db5764e6e91bac 100644
--- a/package.json
+++ b/package.json
@@ -314,7 +314,7 @@
     "@types/delete-empty": "^2.0.0",
     "@types/elasticsearch": "^5.0.33",
     "@types/enzyme": "^3.9.0",
-    "@types/eslint": "^6.1.2",
+    "@types/eslint": "^6.1.3",
     "@types/fetch-mock": "^7.3.1",
     "@types/getopts": "^2.0.1",
     "@types/glob": "^7.1.1",
@@ -368,8 +368,8 @@
     "@types/uuid": "^3.4.4",
     "@types/vinyl-fs": "^2.4.11",
     "@types/zen-observable": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^2.12.0",
-    "@typescript-eslint/parser": "^2.12.0",
+    "@typescript-eslint/eslint-plugin": "^2.15.0",
+    "@typescript-eslint/parser": "^2.15.0",
     "angular-mocks": "^1.7.8",
     "archiver": "^3.1.1",
     "axe-core": "^3.3.2",
@@ -389,21 +389,21 @@
     "enzyme-adapter-react-16": "^1.15.1",
     "enzyme-adapter-utils": "^1.12.1",
     "enzyme-to-json": "^3.4.3",
-    "eslint": "^6.5.1",
-    "eslint-config-prettier": "^6.4.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.9.0",
     "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-ban": "^1.3.0",
-    "eslint-plugin-cypress": "^2.7.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^22.19.0",
+    "eslint-plugin-ban": "^1.4.0",
+    "eslint-plugin-cypress": "^2.8.1",
+    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-jest": "^23.3.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-mocha": "^6.2.0",
+    "eslint-plugin-mocha": "^6.2.2",
     "eslint-plugin-no-unsanitized": "^3.0.2",
-    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-prettier": "^3.1.1",
-    "eslint-plugin-react": "^7.16.0",
-    "eslint-plugin-react-hooks": "^2.1.2",
+    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-react": "^7.17.0",
+    "eslint-plugin-react-hooks": "^2.3.0",
     "exit-hook": "^2.2.0",
     "faker": "1.1.0",
     "fetch-mock": "^7.3.9",
diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json
index 04602d196a7f36..34b1b0fec376f6 100644
--- a/packages/eslint-config-kibana/package.json
+++ b/packages/eslint-config-kibana/package.json
@@ -15,19 +15,19 @@
   },
   "homepage": "https://github.com/elastic/eslint-config-kibana#readme",
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.12.0",
-    "@typescript-eslint/parser": "^2.12.0",
+    "@typescript-eslint/eslint-plugin": "^2.15.0",
+    "@typescript-eslint/parser": "^2.15.0",
     "babel-eslint": "^10.0.3",
-    "eslint": "^6.5.1",
+    "eslint": "^6.8.0",
     "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-ban": "^1.3.0",
+    "eslint-plugin-ban": "^1.4.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^22.19.0",
-    "eslint-plugin-mocha": "^6.2.0",
+    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-jest": "^23.3.0",
+    "eslint-plugin-mocha": "^6.2.2",
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-react": "^7.16.0",
-    "eslint-plugin-react-hooks": "^2.1.2"
+    "eslint-plugin-react": "^7.17.0",
+    "eslint-plugin-react-hooks": "^2.3.0"
   }
 }
diff --git a/packages/kbn-eslint-plugin-eslint/package.json b/packages/kbn-eslint-plugin-eslint/package.json
index badcf13187cafb..026938213ac83a 100644
--- a/packages/kbn-eslint-plugin-eslint/package.json
+++ b/packages/kbn-eslint-plugin-eslint/package.json
@@ -4,12 +4,12 @@
   "private": true,
   "license": "Apache-2.0",
   "peerDependencies": {
-    "eslint": "6.5.1",
+    "eslint": "6.8.0",
     "babel-eslint": "^10.0.3"
   },
   "dependencies": {
     "micromatch": "3.1.10",
     "dedent": "^0.7.0",
-    "eslint-module-utils": "2.4.1"
+    "eslint-module-utils": "2.5.0"
   }
 }
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 7c5937af441a2e..b81308e8309cf8 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -79815,7 +79815,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(704);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _build_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildProductionProjects"]; });
 
-/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(909);
+/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(914);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
 
 /*
@@ -79997,8 +79997,8 @@ const EventEmitter = __webpack_require__(379);
 const path = __webpack_require__(16);
 const arrify = __webpack_require__(706);
 const globby = __webpack_require__(707);
-const cpFile = __webpack_require__(900);
-const CpyError = __webpack_require__(907);
+const cpFile = __webpack_require__(905);
+const CpyError = __webpack_require__(912);
 
 const preprocessSrcPath = (srcPath, options) => options.cwd ? path.resolve(options.cwd, srcPath) : srcPath;
 
@@ -80127,8 +80127,8 @@ const fs = __webpack_require__(23);
 const arrayUnion = __webpack_require__(708);
 const glob = __webpack_require__(502);
 const fastGlob = __webpack_require__(710);
-const dirGlob = __webpack_require__(893);
-const gitignore = __webpack_require__(896);
+const dirGlob = __webpack_require__(898);
+const gitignore = __webpack_require__(901);
 
 const DEFAULT_FILTER = () => false;
 
@@ -80379,11 +80379,11 @@ module.exports.generateTasks = pkg.generateTasks;
 Object.defineProperty(exports, "__esModule", { value: true });
 var optionsManager = __webpack_require__(712);
 var taskManager = __webpack_require__(713);
-var reader_async_1 = __webpack_require__(864);
-var reader_stream_1 = __webpack_require__(888);
-var reader_sync_1 = __webpack_require__(889);
-var arrayUtils = __webpack_require__(891);
-var streamUtils = __webpack_require__(892);
+var reader_async_1 = __webpack_require__(869);
+var reader_stream_1 = __webpack_require__(893);
+var reader_sync_1 = __webpack_require__(894);
+var arrayUtils = __webpack_require__(896);
+var streamUtils = __webpack_require__(897);
 /**
  * Synchronous API.
  */
@@ -81023,9 +81023,9 @@ var extend = __webpack_require__(830);
  */
 
 var compilers = __webpack_require__(833);
-var parsers = __webpack_require__(860);
-var cache = __webpack_require__(861);
-var utils = __webpack_require__(862);
+var parsers = __webpack_require__(865);
+var cache = __webpack_require__(866);
+var utils = __webpack_require__(867);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -99558,9 +99558,9 @@ var toRegex = __webpack_require__(721);
  */
 
 var compilers = __webpack_require__(850);
-var parsers = __webpack_require__(856);
-var Extglob = __webpack_require__(859);
-var utils = __webpack_require__(858);
+var parsers = __webpack_require__(861);
+var Extglob = __webpack_require__(864);
+var utils = __webpack_require__(863);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -100070,7 +100070,7 @@ var parsers = __webpack_require__(854);
  * Module dependencies
  */
 
-var debug = __webpack_require__(793)('expand-brackets');
+var debug = __webpack_require__(856)('expand-brackets');
 var extend = __webpack_require__(730);
 var Snapdragon = __webpack_require__(760);
 var toRegex = __webpack_require__(721);
@@ -100664,12 +100664,839 @@ exports.createRegex = function(pattern, include) {
 /* 856 */
 /***/ (function(module, exports, __webpack_require__) {
 
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
+ */
+
+if (typeof process !== 'undefined' && process.type === 'renderer') {
+  module.exports = __webpack_require__(857);
+} else {
+  module.exports = __webpack_require__(860);
+}
+
+
+/***/ }),
+/* 857 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = __webpack_require__(858);
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+exports.storage = 'undefined' != typeof chrome
+               && 'undefined' != typeof chrome.storage
+                  ? chrome.storage.local
+                  : localstorage();
+
+/**
+ * Colors.
+ */
+
+exports.colors = [
+  'lightseagreen',
+  'forestgreen',
+  'goldenrod',
+  'dodgerblue',
+  'darkorchid',
+  'crimson'
+];
+
+/**
+ * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+ * and the Firebug extension (any Firefox version) are known
+ * to support "%c" CSS customizations.
+ *
+ * TODO: add a `localStorage` variable to explicitly enable/disable colors
+ */
+
+function useColors() {
+  // NB: In an Electron preload script, document will be defined but not fully
+  // initialized. Since we know we're in Chrome, we'll just detect this case
+  // explicitly
+  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
+    return true;
+  }
+
+  // is webkit? http://stackoverflow.com/a/16459606/376773
+  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
+    // is firebug? http://stackoverflow.com/a/398120/376773
+    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
+    // is firefox >= v31?
+    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
+    // double check webkit in userAgent just in case we are in a worker
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
+}
+
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
+
+exports.formatters.j = function(v) {
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
+  }
+};
+
+
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs(args) {
+  var useColors = this.useColors;
+
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
+
+  if (!useColors) return;
+
+  var c = 'color: ' + this.color;
+  args.splice(1, 0, c, 'color: inherit')
+
+  // the final "%c" is somewhat tricky, because there could be other
+  // arguments passed either before or after the %c, so we need to
+  // figure out the correct index to insert the CSS into
+  var index = 0;
+  var lastC = 0;
+  args[0].replace(/%[a-zA-Z%]/g, function(match) {
+    if ('%%' === match) return;
+    index++;
+    if ('%c' === match) {
+      // we only are interested in the *last* %c
+      // (the user may have provided their own)
+      lastC = index;
+    }
+  });
+
+  args.splice(lastC, 0, c);
+}
+
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
+
+function log() {
+  // this hackery is required for IE8/9, where
+  // the `console.log` function doesn't have 'apply'
+  return 'object' === typeof console
+    && console.log
+    && Function.prototype.apply.call(console.log, console, arguments);
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
+
+  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
+  if (!r && typeof process !== 'undefined' && 'env' in process) {
+    r = process.env.DEBUG;
+  }
+
+  return r;
+}
+
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
+
+exports.enable(load());
+
+/**
+ * Localstorage attempts to return the localstorage.
+ *
+ * This is necessary because safari throws
+ * when a user disables cookies/localstorage
+ * and you attempt to access it.
+ *
+ * @return {LocalStorage}
+ * @api private
+ */
+
+function localstorage() {
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
+
+
+/***/ }),
+/* 858 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = __webpack_require__(859);
+
+/**
+ * The currently active debug mode names, and names to skip.
+ */
+
+exports.names = [];
+exports.skips = [];
+
+/**
+ * Map of special "%n" handling functions, for the debug "format" argument.
+ *
+ * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
+ */
+
+exports.formatters = {};
+
+/**
+ * Previous log timestamp.
+ */
+
+var prevTime;
+
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
+
+function selectColor(namespace) {
+  var hash = 0, i;
+
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
+  }
+
+  return exports.colors[Math.abs(hash) % exports.colors.length];
+}
+
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
+
+function createDebug(namespace) {
+
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
+
+    var self = debug;
+
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
+
+    // turn the `arguments` into a proper Array
+    var args = new Array(arguments.length);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i];
+    }
+
+    args[0] = exports.coerce(args[0]);
+
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
+    }
+
+    // apply any `formatters` transformations
+    var index = 0;
+    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
+      // if we encounter an escaped % then don't increase the array index
+      if (match === '%%') return match;
+      index++;
+      var formatter = exports.formatters[format];
+      if ('function' === typeof formatter) {
+        var val = args[index];
+        match = formatter.call(self, val);
+
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
+
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
+
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
+
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
+
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
+  }
+
+  return debug;
+}
+
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
+
+function enable(namespaces) {
+  exports.save(namespaces);
+
+  exports.names = [];
+  exports.skips = [];
+
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (var i = 0; i < len; i++) {
+    if (!split[i]) continue; // ignore empty strings
+    namespaces = split[i].replace(/\*/g, '.*?');
+    if (namespaces[0] === '-') {
+      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+    } else {
+      exports.names.push(new RegExp('^' + namespaces + '$'));
+    }
+  }
+}
+
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
+
+function disable() {
+  exports.enable('');
+}
+
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
+
+function enabled(name) {
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
+    }
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
+
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
+
+
+/***/ }),
+/* 859 */
+/***/ (function(module, exports) {
+
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} [options]
+ * @throws {Error} throw an error if val is not a non-empty string or a number
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options) {
+  options = options || {};
+  var type = typeof val;
+  if (type === 'string' && val.length > 0) {
+    return parse(val);
+  } else if (type === 'number' && isNaN(val) === false) {
+    return options.long ? fmtLong(val) : fmtShort(val);
+  }
+  throw new Error(
+    'val is not a non-empty string or a valid number. val=' +
+      JSON.stringify(val)
+  );
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  str = String(str);
+  if (str.length > 100) {
+    return;
+  }
+  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
+    str
+  );
+  if (!match) {
+    return;
+  }
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtShort(ms) {
+  if (ms >= d) {
+    return Math.round(ms / d) + 'd';
+  }
+  if (ms >= h) {
+    return Math.round(ms / h) + 'h';
+  }
+  if (ms >= m) {
+    return Math.round(ms / m) + 'm';
+  }
+  if (ms >= s) {
+    return Math.round(ms / s) + 's';
+  }
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, n, name) {
+  if (ms < n) {
+    return;
+  }
+  if (ms < n * 1.5) {
+    return Math.floor(ms / n) + ' ' + name;
+  }
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
+
+
+/***/ }),
+/* 860 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * Module dependencies.
+ */
+
+var tty = __webpack_require__(480);
+var util = __webpack_require__(29);
+
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = __webpack_require__(858);
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+
+/**
+ * Colors.
+ */
+
+exports.colors = [6, 2, 3, 4, 5, 1];
+
+/**
+ * Build up the default `inspectOpts` object from the environment variables.
+ *
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
+ */
+
+exports.inspectOpts = Object.keys(process.env).filter(function (key) {
+  return /^debug_/i.test(key);
+}).reduce(function (obj, key) {
+  // camel-case
+  var prop = key
+    .substring(6)
+    .toLowerCase()
+    .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
+
+  // coerce string value into JS value
+  var val = process.env[key];
+  if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
+  else if (/^(no|off|false|disabled)$/i.test(val)) val = false;
+  else if (val === 'null') val = null;
+  else val = Number(val);
+
+  obj[prop] = val;
+  return obj;
+}, {});
+
+/**
+ * The file descriptor to write the `debug()` calls to.
+ * Set the `DEBUG_FD` env variable to override with another value. i.e.:
+ *
+ *   $ DEBUG_FD=3 node script.js 3>debug.log
+ */
+
+var fd = parseInt(process.env.DEBUG_FD, 10) || 2;
+
+if (1 !== fd && 2 !== fd) {
+  util.deprecate(function(){}, 'except for stderr(2) and stdout(1), any other usage of DEBUG_FD is deprecated. Override debug.log if you want to use a different log function (https://git.io/debug_fd)')()
+}
+
+var stream = 1 === fd ? process.stdout :
+             2 === fd ? process.stderr :
+             createWritableStdioStream(fd);
+
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
+
+function useColors() {
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(fd);
+}
+
+/**
+ * Map %o to `util.inspect()`, all on a single line.
+ */
+
+exports.formatters.o = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts)
+    .split('\n').map(function(str) {
+      return str.trim()
+    }).join(' ');
+};
+
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
+
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
+};
+
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs(args) {
+  var name = this.namespace;
+  var useColors = this.useColors;
+
+  if (useColors) {
+    var c = this.color;
+    var prefix = '  \u001b[3' + c + ';1m' + name + ' ' + '\u001b[0m';
+
+    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
+    args.push('\u001b[3' + c + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
+  } else {
+    args[0] = new Date().toUTCString()
+      + ' ' + name + ' ' + args[0];
+  }
+}
+
+/**
+ * Invokes `util.format()` with the specified arguments and writes to `stream`.
+ */
+
+function log() {
+  return stream.write(util.format.apply(util, arguments) + '\n');
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  if (null == namespaces) {
+    // If you set a process.env field to null or undefined, it gets cast to the
+    // string 'null' or 'undefined'. Just delete instead.
+    delete process.env.DEBUG;
+  } else {
+    process.env.DEBUG = namespaces;
+  }
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  return process.env.DEBUG;
+}
+
+/**
+ * Copied from `node/src/node.js`.
+ *
+ * XXX: It's lame that node doesn't expose this API out-of-the-box. It also
+ * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame.
+ */
+
+function createWritableStdioStream (fd) {
+  var stream;
+  var tty_wrap = process.binding('tty_wrap');
+
+  // Note stream._type is used for test-module-load-list.js
+
+  switch (tty_wrap.guessHandleType(fd)) {
+    case 'TTY':
+      stream = new tty.WriteStream(fd);
+      stream._type = 'tty';
+
+      // Hack to have stream not keep the event loop alive.
+      // See https://github.com/joyent/node/issues/1726
+      if (stream._handle && stream._handle.unref) {
+        stream._handle.unref();
+      }
+      break;
+
+    case 'FILE':
+      var fs = __webpack_require__(23);
+      stream = new fs.SyncWriteStream(fd, { autoClose: false });
+      stream._type = 'fs';
+      break;
+
+    case 'PIPE':
+    case 'TCP':
+      var net = __webpack_require__(798);
+      stream = new net.Socket({
+        fd: fd,
+        readable: false,
+        writable: true
+      });
+
+      // FIXME Should probably have an option in net.Socket to create a
+      // stream from an existing fd which is writable only. But for now
+      // we'll just add this hack and set the `readable` member to false.
+      // Test: ./node test/fixtures/echo.js < /etc/passwd
+      stream.readable = false;
+      stream.read = null;
+      stream._type = 'pipe';
+
+      // FIXME Hack to have stream not keep the event loop alive.
+      // See https://github.com/joyent/node/issues/1726
+      if (stream._handle && stream._handle.unref) {
+        stream._handle.unref();
+      }
+      break;
+
+    default:
+      // Probably an error on in uv_guess_handle()
+      throw new Error('Implement me. Unknown stream file type!');
+  }
+
+  // For supporting legacy API we put the FD here.
+  stream.fd = fd;
+
+  stream._isStdio = true;
+
+  return stream;
+}
+
+/**
+ * Init logic for `debug` instances.
+ *
+ * Create a new `inspectOpts` object in case `useColors` is set
+ * differently for a particular `debug` instance.
+ */
+
+function init (debug) {
+  debug.inspectOpts = {};
+
+  var keys = Object.keys(exports.inspectOpts);
+  for (var i = 0; i < keys.length; i++) {
+    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+  }
+}
+
+/**
+ * Enable namespaces listed in `process.env.DEBUG` initially.
+ */
+
+exports.enable(load());
+
+
+/***/ }),
+/* 861 */
+/***/ (function(module, exports, __webpack_require__) {
+
 "use strict";
 
 
 var brackets = __webpack_require__(851);
-var define = __webpack_require__(857);
-var utils = __webpack_require__(858);
+var define = __webpack_require__(862);
+var utils = __webpack_require__(863);
 
 /**
  * Characters to use in text regex (we want to "not" match
@@ -100824,7 +101651,7 @@ module.exports = parsers;
 
 
 /***/ }),
-/* 857 */
+/* 862 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100862,7 +101689,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 858 */
+/* 863 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100938,7 +101765,7 @@ utils.createRegex = function(str) {
 
 
 /***/ }),
-/* 859 */
+/* 864 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100949,7 +101776,7 @@ utils.createRegex = function(str) {
  */
 
 var Snapdragon = __webpack_require__(760);
-var define = __webpack_require__(857);
+var define = __webpack_require__(862);
 var extend = __webpack_require__(730);
 
 /**
@@ -100957,7 +101784,7 @@ var extend = __webpack_require__(730);
  */
 
 var compilers = __webpack_require__(850);
-var parsers = __webpack_require__(856);
+var parsers = __webpack_require__(861);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -101023,7 +101850,7 @@ module.exports = Extglob;
 
 
 /***/ }),
-/* 860 */
+/* 865 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101113,14 +101940,14 @@ function textRegex(pattern) {
 
 
 /***/ }),
-/* 861 */
+/* 866 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = new (__webpack_require__(842))();
 
 
 /***/ }),
-/* 862 */
+/* 867 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101138,7 +101965,7 @@ utils.define = __webpack_require__(829);
 utils.diff = __webpack_require__(846);
 utils.extend = __webpack_require__(830);
 utils.pick = __webpack_require__(847);
-utils.typeOf = __webpack_require__(863);
+utils.typeOf = __webpack_require__(868);
 utils.unique = __webpack_require__(733);
 
 /**
@@ -101436,7 +102263,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 863 */
+/* 868 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -101571,7 +102398,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 864 */
+/* 869 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101590,9 +102417,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(865);
-var reader_1 = __webpack_require__(878);
-var fs_stream_1 = __webpack_require__(882);
+var readdir = __webpack_require__(870);
+var reader_1 = __webpack_require__(883);
+var fs_stream_1 = __webpack_require__(887);
 var ReaderAsync = /** @class */ (function (_super) {
     __extends(ReaderAsync, _super);
     function ReaderAsync() {
@@ -101653,15 +102480,15 @@ exports.default = ReaderAsync;
 
 
 /***/ }),
-/* 865 */
+/* 870 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const readdirSync = __webpack_require__(866);
-const readdirAsync = __webpack_require__(874);
-const readdirStream = __webpack_require__(877);
+const readdirSync = __webpack_require__(871);
+const readdirAsync = __webpack_require__(879);
+const readdirStream = __webpack_require__(882);
 
 module.exports = exports = readdirAsyncPath;
 exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
@@ -101745,7 +102572,7 @@ function readdirStreamStat (dir, options) {
 
 
 /***/ }),
-/* 866 */
+/* 871 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101753,11 +102580,11 @@ function readdirStreamStat (dir, options) {
 
 module.exports = readdirSync;
 
-const DirectoryReader = __webpack_require__(867);
+const DirectoryReader = __webpack_require__(872);
 
 let syncFacade = {
-  fs: __webpack_require__(872),
-  forEach: __webpack_require__(873),
+  fs: __webpack_require__(877),
+  forEach: __webpack_require__(878),
   sync: true
 };
 
@@ -101786,7 +102613,7 @@ function readdirSync (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 867 */
+/* 872 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101795,9 +102622,9 @@ function readdirSync (dir, options, internalOptions) {
 const Readable = __webpack_require__(27).Readable;
 const EventEmitter = __webpack_require__(379).EventEmitter;
 const path = __webpack_require__(16);
-const normalizeOptions = __webpack_require__(868);
-const stat = __webpack_require__(870);
-const call = __webpack_require__(871);
+const normalizeOptions = __webpack_require__(873);
+const stat = __webpack_require__(875);
+const call = __webpack_require__(876);
 
 /**
  * Asynchronously reads the contents of a directory and streams the results
@@ -102173,14 +103000,14 @@ module.exports = DirectoryReader;
 
 
 /***/ }),
-/* 868 */
+/* 873 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(16);
-const globToRegExp = __webpack_require__(869);
+const globToRegExp = __webpack_require__(874);
 
 module.exports = normalizeOptions;
 
@@ -102357,7 +103184,7 @@ function normalizeOptions (options, internalOptions) {
 
 
 /***/ }),
-/* 869 */
+/* 874 */
 /***/ (function(module, exports) {
 
 module.exports = function (glob, opts) {
@@ -102494,13 +103321,13 @@ module.exports = function (glob, opts) {
 
 
 /***/ }),
-/* 870 */
+/* 875 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const call = __webpack_require__(871);
+const call = __webpack_require__(876);
 
 module.exports = stat;
 
@@ -102575,7 +103402,7 @@ function symlinkStat (fs, path, lstats, callback) {
 
 
 /***/ }),
-/* 871 */
+/* 876 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102636,14 +103463,14 @@ function callOnce (fn) {
 
 
 /***/ }),
-/* 872 */
+/* 877 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const fs = __webpack_require__(23);
-const call = __webpack_require__(871);
+const call = __webpack_require__(876);
 
 /**
  * A facade around {@link fs.readdirSync} that allows it to be called
@@ -102707,7 +103534,7 @@ exports.lstat = function (path, callback) {
 
 
 /***/ }),
-/* 873 */
+/* 878 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102736,7 +103563,7 @@ function syncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 874 */
+/* 879 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102744,12 +103571,12 @@ function syncForEach (array, iterator, done) {
 
 module.exports = readdirAsync;
 
-const maybe = __webpack_require__(875);
-const DirectoryReader = __webpack_require__(867);
+const maybe = __webpack_require__(880);
+const DirectoryReader = __webpack_require__(872);
 
 let asyncFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(876),
+  forEach: __webpack_require__(881),
   async: true
 };
 
@@ -102791,7 +103618,7 @@ function readdirAsync (dir, options, callback, internalOptions) {
 
 
 /***/ }),
-/* 875 */
+/* 880 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102818,7 +103645,7 @@ module.exports = function maybe (cb, promise) {
 
 
 /***/ }),
-/* 876 */
+/* 881 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102854,7 +103681,7 @@ function asyncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 877 */
+/* 882 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102862,11 +103689,11 @@ function asyncForEach (array, iterator, done) {
 
 module.exports = readdirStream;
 
-const DirectoryReader = __webpack_require__(867);
+const DirectoryReader = __webpack_require__(872);
 
 let streamFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(876),
+  forEach: __webpack_require__(881),
   async: true
 };
 
@@ -102886,16 +103713,16 @@ function readdirStream (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 878 */
+/* 883 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var deep_1 = __webpack_require__(879);
-var entry_1 = __webpack_require__(881);
-var pathUtil = __webpack_require__(880);
+var deep_1 = __webpack_require__(884);
+var entry_1 = __webpack_require__(886);
+var pathUtil = __webpack_require__(885);
 var Reader = /** @class */ (function () {
     function Reader(options) {
         this.options = options;
@@ -102961,13 +103788,13 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 879 */
+/* 884 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(880);
+var pathUtils = __webpack_require__(885);
 var patternUtils = __webpack_require__(714);
 var DeepFilter = /** @class */ (function () {
     function DeepFilter(options, micromatchOptions) {
@@ -103051,7 +103878,7 @@ exports.default = DeepFilter;
 
 
 /***/ }),
-/* 880 */
+/* 885 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103082,13 +103909,13 @@ exports.makeAbsolute = makeAbsolute;
 
 
 /***/ }),
-/* 881 */
+/* 886 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(880);
+var pathUtils = __webpack_require__(885);
 var patternUtils = __webpack_require__(714);
 var EntryFilter = /** @class */ (function () {
     function EntryFilter(options, micromatchOptions) {
@@ -103174,7 +104001,7 @@ exports.default = EntryFilter;
 
 
 /***/ }),
-/* 882 */
+/* 887 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103194,8 +104021,8 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(27);
-var fsStat = __webpack_require__(883);
-var fs_1 = __webpack_require__(887);
+var fsStat = __webpack_require__(888);
+var fs_1 = __webpack_require__(892);
 var FileSystemStream = /** @class */ (function (_super) {
     __extends(FileSystemStream, _super);
     function FileSystemStream() {
@@ -103245,14 +104072,14 @@ exports.default = FileSystemStream;
 
 
 /***/ }),
-/* 883 */
+/* 888 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(884);
-const statProvider = __webpack_require__(886);
+const optionsManager = __webpack_require__(889);
+const statProvider = __webpack_require__(891);
 /**
  * Asynchronous API.
  */
@@ -103283,13 +104110,13 @@ exports.statSync = statSync;
 
 
 /***/ }),
-/* 884 */
+/* 889 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(885);
+const fsAdapter = __webpack_require__(890);
 function prepare(opts) {
     const options = Object.assign({
         fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
@@ -103302,7 +104129,7 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 885 */
+/* 890 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103325,7 +104152,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter;
 
 
 /***/ }),
-/* 886 */
+/* 891 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103377,7 +104204,7 @@ exports.isFollowedSymlink = isFollowedSymlink;
 
 
 /***/ }),
-/* 887 */
+/* 892 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103408,7 +104235,7 @@ exports.default = FileSystem;
 
 
 /***/ }),
-/* 888 */
+/* 893 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103428,9 +104255,9 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(27);
-var readdir = __webpack_require__(865);
-var reader_1 = __webpack_require__(878);
-var fs_stream_1 = __webpack_require__(882);
+var readdir = __webpack_require__(870);
+var reader_1 = __webpack_require__(883);
+var fs_stream_1 = __webpack_require__(887);
 var TransformStream = /** @class */ (function (_super) {
     __extends(TransformStream, _super);
     function TransformStream(reader) {
@@ -103498,7 +104325,7 @@ exports.default = ReaderStream;
 
 
 /***/ }),
-/* 889 */
+/* 894 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103517,9 +104344,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(865);
-var reader_1 = __webpack_require__(878);
-var fs_sync_1 = __webpack_require__(890);
+var readdir = __webpack_require__(870);
+var reader_1 = __webpack_require__(883);
+var fs_sync_1 = __webpack_require__(895);
 var ReaderSync = /** @class */ (function (_super) {
     __extends(ReaderSync, _super);
     function ReaderSync() {
@@ -103579,7 +104406,7 @@ exports.default = ReaderSync;
 
 
 /***/ }),
-/* 890 */
+/* 895 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103598,8 +104425,8 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var fsStat = __webpack_require__(883);
-var fs_1 = __webpack_require__(887);
+var fsStat = __webpack_require__(888);
+var fs_1 = __webpack_require__(892);
 var FileSystemSync = /** @class */ (function (_super) {
     __extends(FileSystemSync, _super);
     function FileSystemSync() {
@@ -103645,7 +104472,7 @@ exports.default = FileSystemSync;
 
 
 /***/ }),
-/* 891 */
+/* 896 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103661,7 +104488,7 @@ exports.flatten = flatten;
 
 
 /***/ }),
-/* 892 */
+/* 897 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103682,13 +104509,13 @@ exports.merge = merge;
 
 
 /***/ }),
-/* 893 */
+/* 898 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const pathType = __webpack_require__(894);
+const pathType = __webpack_require__(899);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -103754,13 +104581,13 @@ module.exports.sync = (input, opts) => {
 
 
 /***/ }),
-/* 894 */
+/* 899 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const pify = __webpack_require__(895);
+const pify = __webpack_require__(900);
 
 function type(fn, fn2, fp) {
 	if (typeof fp !== 'string') {
@@ -103803,7 +104630,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 
 /***/ }),
-/* 895 */
+/* 900 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103894,7 +104721,7 @@ module.exports = (obj, opts) => {
 
 
 /***/ }),
-/* 896 */
+/* 901 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103902,9 +104729,9 @@ module.exports = (obj, opts) => {
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
 const fastGlob = __webpack_require__(710);
-const gitIgnore = __webpack_require__(897);
-const pify = __webpack_require__(898);
-const slash = __webpack_require__(899);
+const gitIgnore = __webpack_require__(902);
+const pify = __webpack_require__(903);
+const slash = __webpack_require__(904);
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -104002,7 +104829,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 897 */
+/* 902 */
 /***/ (function(module, exports) {
 
 // A simple implementation of make-array
@@ -104471,7 +105298,7 @@ module.exports = options => new IgnoreBase(options)
 
 
 /***/ }),
-/* 898 */
+/* 903 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104546,7 +105373,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 899 */
+/* 904 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104564,17 +105391,17 @@ module.exports = input => {
 
 
 /***/ }),
-/* 900 */
+/* 905 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
 const {constants: fsConstants} = __webpack_require__(23);
-const {Buffer} = __webpack_require__(901);
-const CpFileError = __webpack_require__(902);
-const fs = __webpack_require__(904);
-const ProgressEmitter = __webpack_require__(906);
+const {Buffer} = __webpack_require__(906);
+const CpFileError = __webpack_require__(907);
+const fs = __webpack_require__(909);
+const ProgressEmitter = __webpack_require__(911);
 
 const cpFile = (source, destination, options) => {
 	if (!source || !destination) {
@@ -104728,7 +105555,7 @@ module.exports.sync = (source, destination, options) => {
 
 
 /***/ }),
-/* 901 */
+/* 906 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* eslint-disable node/no-deprecated-api */
@@ -104796,12 +105623,12 @@ SafeBuffer.allocUnsafeSlow = function (size) {
 
 
 /***/ }),
-/* 902 */
+/* 907 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(903);
+const NestedError = __webpack_require__(908);
 
 class CpFileError extends NestedError {
 	constructor(message, nested) {
@@ -104815,7 +105642,7 @@ module.exports = CpFileError;
 
 
 /***/ }),
-/* 903 */
+/* 908 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var inherits = __webpack_require__(509);
@@ -104869,15 +105696,15 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 904 */
+/* 909 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(22);
 const makeDir = __webpack_require__(559);
-const pify = __webpack_require__(905);
-const CpFileError = __webpack_require__(902);
+const pify = __webpack_require__(910);
+const CpFileError = __webpack_require__(907);
 
 const fsP = pify(fs);
 
@@ -105022,7 +105849,7 @@ if (fs.copyFileSync) {
 
 
 /***/ }),
-/* 905 */
+/* 910 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105097,7 +105924,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 906 */
+/* 911 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105138,12 +105965,12 @@ module.exports = ProgressEmitter;
 
 
 /***/ }),
-/* 907 */
+/* 912 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(908);
+const NestedError = __webpack_require__(913);
 
 class CpyError extends NestedError {
 	constructor(message, nested) {
@@ -105157,7 +105984,7 @@ module.exports = CpyError;
 
 
 /***/ }),
-/* 908 */
+/* 913 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var inherits = __webpack_require__(29).inherits;
@@ -105213,7 +106040,7 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 909 */
+/* 914 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
diff --git a/x-pack/legacy/plugins/reporting/index.test.js b/x-pack/legacy/plugins/reporting/index.test.js
index f1b471071153c1..0d9a717bd7d816 100644
--- a/x-pack/legacy/plugins/reporting/index.test.js
+++ b/x-pack/legacy/plugins/reporting/index.test.js
@@ -16,6 +16,7 @@ jest.mock('os', () => {
   return os;
 });
 
+// eslint-disable-next-line jest/valid-describe
 const describeWithContext = describe.each([
   [{ dev: false, dist: false }],
   [{ dev: true, dist: false }],
diff --git a/yarn.lock b/yarn.lock
index e44b03df711fd8..9631ca271295ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3462,10 +3462,10 @@
   resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
   integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
 
-"@types/eslint@^6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-6.1.2.tgz#297ece0f3815f93d699b18bdade5e6bee747284f"
-  integrity sha512-t+smTKg1e9SshiIOI94Zi+Lvo3bfHF20MuKP8w3VGWdrS1dYm33A7xrSoyy9FQv6oE2TwYqEXVJ50I0or8+FWQ==
+"@types/eslint@^6.1.3":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-6.1.3.tgz#ec2a66e445a48efaa234020eb3b6e8f06afc9c61"
+  integrity sha512-llYf1QNZaDweXtA7uY6JczcwHmFwJL9TpK3E6sY0B18l6ulDT6VWNMAdEjYccFHiDfxLPxffd8QmSDV4QUUspA==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
@@ -4434,57 +4434,40 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@typescript-eslint/eslint-plugin@^2.12.0":
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.12.0.tgz#0da7cbca7b24f4c6919e9eb31c704bfb126f90ad"
-  integrity sha512-1t4r9rpLuEwl3hgt90jY18wJHSyb0E3orVL3DaqwmpiSDHmHiSspVsvsFF78BJ/3NNG3qmeso836jpuBWYziAA==
+"@typescript-eslint/eslint-plugin@^2.15.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.15.0.tgz#5442c30b687ffd576ff74cfea46a6d7bfb0ee893"
+  integrity sha512-XRJFznI5v4K1WvIrWmjFjBAdQWaUTz4xJEdqR7+wAFsv6Q9dP3mOlE6BMNT3pdlp9eF1+bC5m5LZTmLMqffCVw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "2.12.0"
+    "@typescript-eslint/experimental-utils" "2.15.0"
     eslint-utils "^1.4.3"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@2.12.0":
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.12.0.tgz#e0a76ffb6293e058748408a191921e453c31d40d"
-  integrity sha512-jv4gYpw5N5BrWF3ntROvCuLe1IjRenLy5+U57J24NbPGwZFAjhnM45qpq0nDH1y/AZMb3Br25YiNVwyPbz6RkA==
+"@typescript-eslint/experimental-utils@2.15.0", "@typescript-eslint/experimental-utils@^2.5.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.15.0.tgz#41e35313bfaef91650ddb5380846d1c78a780070"
+  integrity sha512-Qkxu5zndY5hqlcQkmA88gfLvqQulMpX/TN91XC7OuXsRf4XG5xLGie0sbpX97o/oeccjeZYRMipIsjKk/tjDHA==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.12.0"
+    "@typescript-eslint/typescript-estree" "2.15.0"
     eslint-scope "^5.0.0"
 
-"@typescript-eslint/experimental-utils@^1.13.0":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e"
-  integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "1.13.0"
-    eslint-scope "^4.0.0"
-
-"@typescript-eslint/parser@^2.12.0":
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.12.0.tgz#393f1604943a4ca570bb1a45bc8834e9b9158884"
-  integrity sha512-lPdkwpdzxEfjI8TyTzZqPatkrswLSVu4bqUgnB03fHSOwpC7KSerPgJRgIAf11UGNf7HKjJV6oaPZI4AghLU6g==
+"@typescript-eslint/parser@^2.15.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.15.0.tgz#379a71a51b0429bc3bc55c5f8aab831bf607e411"
+  integrity sha512-6iSgQsqAYTaHw59t0tdjzZJluRAjswdGltzKEdLtcJOxR2UVTPHYvZRqkAVGCkaMVb6Fpa60NnuozNCvsSpA9g==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.12.0"
-    "@typescript-eslint/typescript-estree" "2.12.0"
+    "@typescript-eslint/experimental-utils" "2.15.0"
+    "@typescript-eslint/typescript-estree" "2.15.0"
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/typescript-estree@1.13.0":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz#8140f17d0f60c03619798f1d628b8434913dc32e"
-  integrity sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==
-  dependencies:
-    lodash.unescape "4.0.1"
-    semver "5.5.0"
-
-"@typescript-eslint/typescript-estree@2.12.0":
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.12.0.tgz#bd9e547ccffd17dfab0c3ab0947c80c8e2eb914c"
-  integrity sha512-rGehVfjHEn8Frh9UW02ZZIfJs6SIIxIu/K1bbci8rFfDE/1lQ8krIJy5OXOV3DVnNdDPtoiPOdEANkLMrwXbiQ==
+"@typescript-eslint/typescript-estree@2.15.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.15.0.tgz#79ae52eed8701b164d91e968a65d85a9105e76d3"
+  integrity sha512-L6Pog+w3VZzXkAdyqA0VlwybF8WcwZX+mufso86CMxSdWmcizJ38lgBdpqTbc9bo92iyi0rOvmATKiwl+amjxg==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
@@ -4799,7 +4782,7 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn-jsx@^5.0.2:
+acorn-jsx@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
@@ -11432,10 +11415,10 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-prettier@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz#0a04f147e31d33c6c161b2dd0971418ac52d0477"
-  integrity sha512-YrKucoFdc7SEko5Sxe4r6ixqXPDP1tunGw91POeZTTRKItf/AMFYt/YLEQtZMkR2LVpAVhcAcZgcWpm1oGPW7w==
+eslint-config-prettier@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz#430d24822e82f7deb1e22a435bfa3999fae4ad64"
+  integrity sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA==
   dependencies:
     get-stdin "^6.0.0"
 
@@ -11474,20 +11457,12 @@ eslint-import-resolver-webpack@0.11.1:
     resolve "^1.10.0"
     semver "^5.3.0"
 
-eslint-module-utils@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz#7b4675875bf96b0dbf1b21977456e5bb1f5e018c"
-  integrity sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==
-  dependencies:
-    debug "^2.6.8"
-    pkg-dir "^2.0.0"
-
-eslint-module-utils@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
-  integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
+eslint-module-utils@2.5.0, eslint-module-utils@^2.4.1:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz#cdf0b40d623032274ccd2abd7e64c4e524d6e19c"
+  integrity sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw==
   dependencies:
-    debug "^2.6.8"
+    debug "^2.6.9"
     pkg-dir "^2.0.0"
 
 eslint-plugin-babel@^5.3.0:
@@ -11497,51 +11472,57 @@ eslint-plugin-babel@^5.3.0:
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-eslint-plugin-ban@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ban/-/eslint-plugin-ban-1.3.0.tgz#be9714cb9e01a1adec6c86cdb182e97636eafe44"
-  integrity sha512-A9A2z60UeVj7/BdKzeIjVEGAog/4QXAyOkZ98AUnZc7fsRp+J7YW7+U/YEVpBJqjSiU/FGUA5tGJoI34ul/TyA==
+eslint-plugin-ban@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ban/-/eslint-plugin-ban-1.4.0.tgz#b3a7b000412921336b1feeece5b8ce9a69dea605"
+  integrity sha512-wtrUOLg8WUiGDkVnmyMseLRtXYBM+bJTe2STvhqznHVj6RPAiNEVLbvDj2b0WWwY/2ldKqeaw3iHUHwfCJ8c8Q==
   dependencies:
     requireindex "~1.2.0"
 
-eslint-plugin-cypress@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.7.0.tgz#117f14ce63698e4c4f3afea3d7e27025c8d504f0"
-  integrity sha512-52Lq5ePCD/8jc536e1RqtLfj33BAy1s7BlYgCjbG39J5kqUitcTlRY5i3NRoeAyPHueDwETsq0eASF44ugLosQ==
+eslint-plugin-cypress@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.8.1.tgz#981a0f3658b40de430bcf05cabc96b396487c91f"
+  integrity sha512-jDpcP+MmjmqQO/x3bwIXgp4cl7Q66RYS5/IsuOQP4Qo2sEqE3DI8tTxBQ1EhnV5qEDd2Z2TYHR+5vYI6oCN4uw==
   dependencies:
     globals "^11.12.0"
 
-eslint-plugin-es@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976"
-  integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==
+eslint-plugin-es@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz#98cb1bc8ab0aa807977855e11ad9d1c9422d014b"
+  integrity sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==
   dependencies:
-    eslint-utils "^1.4.2"
+    eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.18.2:
-  version "2.18.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"
-  integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==
+eslint-plugin-eslint-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
+  integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
+
+eslint-plugin-import@^2.19.1:
+  version "2.19.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz#5654e10b7839d064dd0d46cd1b88ec2133a11448"
+  integrity sha512-x68131aKoCZlCae7rDXKSAQmbT5DQuManyXo2sK6fJJ0aK5CWAkv6A6HJZGgqC8IhjQxYPgo6/IY4Oz8AFsbBw==
   dependencies:
     array-includes "^3.0.3"
+    array.prototype.flat "^1.2.1"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
     eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.0"
+    eslint-module-utils "^2.4.1"
     has "^1.0.3"
     minimatch "^3.0.4"
     object.values "^1.1.0"
     read-pkg-up "^2.0.0"
-    resolve "^1.11.0"
+    resolve "^1.12.0"
 
-eslint-plugin-jest@^22.19.0:
-  version "22.19.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.19.0.tgz#0cf90946a8c927d40a2c64458c89bb635d0f2a0b"
-  integrity sha512-4zUc3rh36ds0SXdl2LywT4YWA3zRe8sfLhz8bPp8qQPIKvynTTkNGwmSCMpl5d9QiZE2JxSinGF+WD8yU+O0Lg==
+eslint-plugin-jest@^23.3.0:
+  version "23.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.3.0.tgz#b1443d0c46d6a0de9ef3de78176dd6688c7d5326"
+  integrity sha512-GE6CR4ESJeu6Huw7vfZfaXHmX2R2kCFvf2X9OMcOxfP158yLKgLWz7PqLYTwRDACi84IhpmRxO8lK7GGwG05UQ==
   dependencies:
-    "@typescript-eslint/experimental-utils" "^1.13.0"
+    "@typescript-eslint/experimental-utils" "^2.5.0"
 
 eslint-plugin-jsx-a11y@^6.2.3:
   version "6.2.3"
@@ -11558,10 +11539,10 @@ eslint-plugin-jsx-a11y@^6.2.3:
     has "^1.0.3"
     jsx-ast-utils "^2.2.1"
 
-eslint-plugin-mocha@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-6.2.0.tgz#16ff9ce4d5a6a35af522d5db0ce3c8946566e4c1"
-  integrity sha512-vE/+tHJVom2BkMOiwkOKcAM5YqGPk3C6gMvQ32DHihKkaXF6vmxtj3UEOg64wP3m8/Zk5V/UmQbFE5nqu1EXSg==
+eslint-plugin-mocha@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-6.2.2.tgz#6ef4b78bd12d744beb08a06e8209de330985100d"
+  integrity sha512-oNhPzfkT6Q6CJ0HMVJ2KLxEWG97VWGTmuHOoRcDLE0U88ugUyFNV9wrT2XIt5cGtqc5W9k38m4xTN34L09KhBA==
   dependencies:
     ramda "^0.26.1"
 
@@ -11570,13 +11551,13 @@ eslint-plugin-no-unsanitized@^3.0.2:
   resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.0.2.tgz#83c6fcf8e34715112757e03dd4ee436dce29ed45"
   integrity sha512-JnwpoH8Sv4QOjrTDutENBHzSnyYtspdjtglYtqUtAHe6f6LLKqykJle+UwFPg23GGwt5hI3amS9CRDezW8GAww==
 
-eslint-plugin-node@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6"
-  integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==
+eslint-plugin-node@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz#365944bb0804c5d1d501182a9bc41a0ffefed726"
+  integrity sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg==
   dependencies:
-    eslint-plugin-es "^2.0.0"
-    eslint-utils "^1.4.2"
+    eslint-plugin-es "^3.0.0"
+    eslint-utils "^2.0.0"
     ignore "^5.1.1"
     minimatch "^3.0.4"
     resolve "^1.10.1"
@@ -11587,32 +11568,33 @@ eslint-plugin-prefer-object-spread@^1.2.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-object-spread/-/eslint-plugin-prefer-object-spread-1.2.1.tgz#27fb91853690cceb3ae6101d9c8aecc6a67a402c"
   integrity sha1-J/uRhTaQzOs65hAdnIrsxqZ6QCw=
 
-eslint-plugin-prettier@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz#507b8562410d02a03f0ddc949c616f877852f2ba"
-  integrity sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA==
+eslint-plugin-prettier@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz#432e5a667666ab84ce72f945c72f77d996a5c9ba"
+  integrity sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-react-hooks@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.1.2.tgz#1358d2acb2c5e02b7e90c37e611ac258a488e3a7"
-  integrity sha512-ZR+AyesAUGxJAyTFlF3MbzeVHAcQTFQt1fFVe5o0dzY/HFoj1dgQDMoIkiM+ltN/HhlHBYX4JpJwYonjxsyQMA==
+eslint-plugin-react-hooks@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.3.0.tgz#53e073961f1f5ccf8dd19558036c1fac8c29d99a"
+  integrity sha512-gLKCa52G4ee7uXzdLiorca7JIQZPPXRAQDXV83J4bUEeUuc5pIEyZYAZ45Xnxe5IuupxEqHS+hUhSLIimK1EMw==
 
-eslint-plugin-react@^7.16.0:
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz#9928e4f3e2122ed3ba6a5b56d0303ba3e41d8c09"
-  integrity sha512-GacBAATewhhptbK3/vTP09CbFrgUJmBSaaRcWdbQLFvUZy9yVcQxigBNHGPU/KE2AyHpzj3AWXpxoMTsIDiHug==
+eslint-plugin-react@^7.17.0:
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"
+  integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==
   dependencies:
     array-includes "^3.0.3"
     doctrine "^2.1.0"
+    eslint-plugin-eslint-plugin "^2.1.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.2.1"
+    jsx-ast-utils "^2.2.3"
     object.entries "^1.1.0"
-    object.fromentries "^2.0.0"
+    object.fromentries "^2.0.1"
     object.values "^1.1.0"
     prop-types "^15.7.2"
-    resolve "^1.12.0"
+    resolve "^1.13.1"
 
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
@@ -11643,13 +11625,20 @@ eslint-scope@^5.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.4.2, eslint-utils@^1.4.3:
+eslint-utils@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
   integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
+eslint-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
+  integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
@@ -11699,10 +11688,10 @@ eslint@^2.7.0:
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-eslint@^6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.5.1.tgz#828e4c469697d43bb586144be152198b91e96ed6"
-  integrity sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==
+eslint@^6.8.0:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
+  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"
@@ -11711,19 +11700,19 @@ eslint@^6.5.1:
     debug "^4.0.1"
     doctrine "^3.0.0"
     eslint-scope "^5.0.0"
-    eslint-utils "^1.4.2"
+    eslint-utils "^1.4.3"
     eslint-visitor-keys "^1.1.0"
-    espree "^6.1.1"
+    espree "^6.1.2"
     esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
-    globals "^11.7.0"
+    globals "^12.1.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^6.4.1"
+    inquirer "^7.0.0"
     is-glob "^4.0.0"
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
@@ -11732,7 +11721,7 @@ eslint@^6.5.1:
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.2"
+    optionator "^0.8.3"
     progress "^2.0.0"
     regexpp "^2.0.1"
     semver "^6.1.2"
@@ -11750,13 +11739,13 @@ espree@^3.1.6:
     acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
-espree@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de"
-  integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==
+espree@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
+  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
   dependencies:
-    acorn "^7.0.0"
-    acorn-jsx "^5.0.2"
+    acorn "^7.1.0"
+    acorn-jsx "^5.1.0"
     eslint-visitor-keys "^1.1.0"
 
 esprima@2.7.x, esprima@^2.7.1:
@@ -12380,7 +12369,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -13832,7 +13821,7 @@ global@^4.4.0:
     min-document "^2.19.0"
     process "^0.11.10"
 
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0:
   version "11.7.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
   integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
@@ -13842,6 +13831,13 @@ globals@^11.12.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^12.1.0:
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13"
+  integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==
+  dependencies:
+    type-fest "^0.8.1"
+
 globals@^9.18.0, globals@^9.2.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -15746,25 +15742,6 @@ inquirer@^6.2.0:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-inquirer@^6.4.1:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
-  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
-  dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
-
 inquirer@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a"
@@ -17610,6 +17587,14 @@ jsx-ast-utils@^2.2.1:
     array-includes "^3.0.3"
     object.assign "^4.1.0"
 
+jsx-ast-utils@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
+  integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==
+  dependencies:
+    array-includes "^3.0.3"
+    object.assign "^4.1.0"
+
 jsx-to-string@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jsx-to-string/-/jsx-to-string-1.4.0.tgz#66dc34d773dab9f40fe993cff9940e5da655b705"
@@ -20811,7 +20796,7 @@ object.fromentries@^1.0.0:
     function-bind "^1.1.1"
     has "^1.0.1"
 
-object.fromentries@^2.0.0, object.fromentries@^2.0.1:
+object.fromentries@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
   integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==
@@ -20997,7 +20982,7 @@ optional-js@^2.0.0:
   resolved "https://registry.yarnpkg.com/optional-js/-/optional-js-2.1.1.tgz#c2dc519ad119648510b4d241dbb60b1167c36a46"
   integrity sha512-mUS4bDngcD5kKzzRUd1HVQkr9Lzzby3fSrrPR9wOHhQiyYo+hDS5NVli5YQzGjQRQ15k5Sno4xH9pfykJdeEUA==
 
-optionator@^0.8.1, optionator@^0.8.2:
+optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
   integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
@@ -21009,6 +20994,18 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
+optionator@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 ora@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
@@ -24839,6 +24836,13 @@ resolve@^1.12.0, resolve@^1.4.0:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.13.1:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2"
+  integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==
+  dependencies:
+    path-parse "^1.0.6"
+
 resolve@^1.5.0, resolve@^1.7.1:
   version "1.7.1"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
@@ -30391,6 +30395,11 @@ with@^5.0.0:
     acorn "^3.1.0"
     acorn-globals "^3.0.0"
 
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"

From 0308c9d8cab4adbabca873e601d02fdb2009682b Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Tue, 7 Jan 2020 19:30:37 +0100
Subject: [PATCH 30/96] [SIEM] Cleanup React imports (#53981)

---
 .../plugins/siem/public/components/and_or_badge/index.tsx       | 2 +-
 .../legacy/plugins/siem/public/components/arrows/index.test.tsx | 2 +-
 x-pack/legacy/plugins/siem/public/components/arrows/index.tsx   | 2 +-
 .../siem/public/components/autocomplete_field/index.test.tsx    | 2 +-
 .../legacy/plugins/siem/public/components/bytes/index.test.tsx  | 2 +-
 x-pack/legacy/plugins/siem/public/components/bytes/index.tsx    | 2 +-
 .../public/components/certificate_fingerprint/index.test.tsx    | 2 +-
 .../siem/public/components/certificate_fingerprint/index.tsx    | 2 +-
 .../plugins/siem/public/components/charts/areachart.test.tsx    | 2 +-
 .../plugins/siem/public/components/charts/barchart.test.tsx     | 2 +-
 .../legacy/plugins/siem/public/components/direction/index.tsx   | 2 +-
 .../components/drag_and_drop/drag_drop_context_wrapper.test.tsx | 2 +-
 .../public/components/drag_and_drop/draggable_wrapper.test.tsx  | 2 +-
 .../public/components/drag_and_drop/droppable_wrapper.test.tsx  | 2 +-
 .../siem/public/components/drag_and_drop/droppable_wrapper.tsx  | 2 +-
 .../siem/public/components/draggables/field_badge/index.tsx     | 2 +-
 .../plugins/siem/public/components/draggables/index.test.tsx    | 2 +-
 .../legacy/plugins/siem/public/components/draggables/index.tsx  | 2 +-
 .../plugins/siem/public/components/duration/index.test.tsx      | 2 +-
 x-pack/legacy/plugins/siem/public/components/duration/index.tsx | 2 +-
 .../siem/public/components/edit_data_provider/index.test.tsx    | 2 +-
 .../siem/public/components/embeddables/embedded_map.test.tsx    | 2 +-
 .../embeddables/index_patterns_missing_prompt.test.tsx          | 2 +-
 .../components/embeddables/index_patterns_missing_prompt.tsx    | 2 +-
 .../embeddables/map_tool_tip/line_tool_tip_content.test.tsx     | 2 +-
 .../components/embeddables/map_tool_tip/map_tool_tip.test.tsx   | 2 +-
 .../embeddables/map_tool_tip/point_tool_tip_content.test.tsx    | 2 +-
 .../components/embeddables/map_tool_tip/tooltip_footer.test.tsx | 2 +-
 .../public/components/error_toast_dispatcher/index.test.tsx     | 2 +-
 .../plugins/siem/public/components/event_details/columns.tsx    | 2 +-
 .../siem/public/components/event_details/event_details.test.tsx | 2 +-
 .../components/event_details/event_fields_browser.test.tsx      | 2 +-
 .../siem/public/components/event_details/json_view.test.tsx     | 2 +-
 .../plugins/siem/public/components/event_details/json_view.tsx  | 2 +-
 .../siem/public/components/external_link_icon/index.test.tsx    | 2 +-
 .../plugins/siem/public/components/external_link_icon/index.tsx | 2 +-
 .../public/components/field_renderers/field_renderers.test.tsx  | 2 +-
 .../public/components/fields_browser/categories_pane.test.tsx   | 2 +-
 .../siem/public/components/fields_browser/categories_pane.tsx   | 2 +-
 .../siem/public/components/fields_browser/category.test.tsx     | 2 +-
 .../plugins/siem/public/components/fields_browser/category.tsx  | 2 +-
 .../public/components/fields_browser/category_columns.test.tsx  | 2 +-
 .../public/components/fields_browser/category_title.test.tsx    | 2 +-
 .../siem/public/components/fields_browser/category_title.tsx    | 2 +-
 .../public/components/fields_browser/field_browser.test.tsx     | 2 +-
 .../siem/public/components/fields_browser/field_items.test.tsx  | 2 +-
 .../siem/public/components/fields_browser/field_items.tsx       | 2 +-
 .../siem/public/components/fields_browser/field_name.test.tsx   | 2 +-
 .../siem/public/components/fields_browser/fields_pane.test.tsx  | 2 +-
 .../siem/public/components/fields_browser/fields_pane.tsx       | 2 +-
 .../siem/public/components/fields_browser/header.test.tsx       | 2 +-
 .../plugins/siem/public/components/fields_browser/header.tsx    | 2 +-
 .../siem/public/components/fields_browser/index.test.tsx        | 2 +-
 .../components/flow_controls/flow_direction_select.test.tsx     | 2 +-
 .../public/components/flow_controls/flow_target_select.test.tsx | 2 +-
 .../plugins/siem/public/components/flyout/button/index.tsx      | 2 +-
 .../legacy/plugins/siem/public/components/flyout/index.test.tsx | 2 +-
 x-pack/legacy/plugins/siem/public/components/flyout/index.tsx   | 2 +-
 .../plugins/siem/public/components/flyout/pane/index.test.tsx   | 2 +-
 .../siem/public/components/formatted_bytes/index.test.tsx       | 2 +-
 .../plugins/siem/public/components/formatted_bytes/index.tsx    | 2 +-
 .../siem/public/components/formatted_date/index.test.tsx        | 2 +-
 .../plugins/siem/public/components/formatted_date/index.tsx     | 2 +-
 .../plugins/siem/public/components/formatted_duration/index.tsx | 2 +-
 .../siem/public/components/formatted_duration/tooltip/index.tsx | 2 +-
 .../plugins/siem/public/components/formatted_ip/index.tsx       | 2 +-
 .../plugins/siem/public/components/inspect/index.test.tsx       | 2 +-
 x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx  | 2 +-
 x-pack/legacy/plugins/siem/public/components/ip/index.tsx       | 2 +-
 .../siem/public/components/ja3_fingerprint/index.test.tsx       | 2 +-
 .../plugins/siem/public/components/ja3_fingerprint/index.tsx    | 2 +-
 .../siem/public/components/last_event_time/index.test.tsx       | 2 +-
 .../legacy/plugins/siem/public/components/links/index.test.tsx  | 2 +-
 x-pack/legacy/plugins/siem/public/components/links/index.tsx    | 2 +-
 x-pack/legacy/plugins/siem/public/components/loading/index.tsx  | 2 +-
 .../public/components/localized_date_tooltip/index.test.tsx     | 2 +-
 .../siem/public/components/localized_date_tooltip/index.tsx     | 2 +-
 .../plugins/siem/public/components/markdown/index.test.tsx      | 2 +-
 x-pack/legacy/plugins/siem/public/components/markdown/index.tsx | 2 +-
 .../siem/public/components/markdown/markdown_hint.test.tsx      | 2 +-
 .../plugins/siem/public/components/markdown/markdown_hint.tsx   | 2 +-
 .../siem/public/components/matrix_histogram/index.test.tsx      | 2 +-
 .../public/components/ml/anomaly/anomaly_table_provider.tsx     | 2 +-
 .../siem/public/components/ml/score/anomaly_score.test.tsx      | 2 +-
 .../siem/public/components/ml/score/anomaly_scores.test.tsx     | 2 +-
 .../components/ml/score/create_descriptions_list.test.tsx       | 2 +-
 .../jobs_table/filters/groups_filter_popover.test.tsx           | 2 +-
 .../ml_popover/jobs_table/filters/jobs_table_filters.test.tsx   | 2 +-
 .../public/components/ml_popover/jobs_table/job_switch.test.tsx | 2 +-
 .../public/components/ml_popover/jobs_table/jobs_table.test.tsx | 2 +-
 .../components/ml_popover/jobs_table/showing_count.test.tsx     | 2 +-
 .../siem/public/components/ml_popover/ml_popover.test.tsx       | 2 +-
 .../public/components/ml_popover/popover_description.test.tsx   | 2 +-
 .../siem/public/components/ml_popover/upgrade_contents.test.tsx | 2 +-
 .../plugins/siem/public/components/navigation/index.test.tsx    | 2 +-
 .../public/components/navigation/tab_navigation/index.test.tsx  | 2 +-
 .../siem/public/components/netflow/fingerprints/index.tsx       | 2 +-
 .../plugins/siem/public/components/netflow/index.test.tsx       | 2 +-
 x-pack/legacy/plugins/siem/public/components/netflow/index.tsx  | 2 +-
 .../netflow/netflow_columns/duration_event_start_end.tsx        | 2 +-
 .../siem/public/components/netflow/netflow_columns/index.tsx    | 2 +-
 .../public/components/netflow/netflow_columns/user_process.tsx  | 2 +-
 .../siem/public/components/notes/add_note/index.test.tsx        | 2 +-
 .../siem/public/components/notes/add_note/new_note.test.tsx     | 2 +-
 .../plugins/siem/public/components/notes/add_note/new_note.tsx  | 2 +-
 x-pack/legacy/plugins/siem/public/components/notes/columns.tsx  | 2 +-
 x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx  | 2 +-
 .../siem/public/components/notes/note_card/index.test.tsx       | 2 +-
 .../plugins/siem/public/components/notes/note_card/index.tsx    | 2 +-
 .../public/components/notes/note_card/note_card_body.test.tsx   | 2 +-
 .../siem/public/components/notes/note_card/note_card_body.tsx   | 2 +-
 .../public/components/notes/note_card/note_card_header.test.tsx | 2 +-
 .../siem/public/components/notes/note_card/note_card_header.tsx | 2 +-
 .../public/components/notes/note_card/note_created.test.tsx     | 2 +-
 .../siem/public/components/notes/note_card/note_created.tsx     | 2 +-
 .../siem/public/components/notes/note_cards/index.test.tsx      | 2 +-
 .../delete_timeline_modal/delete_timeline_modal.test.tsx        | 2 +-
 .../delete_timeline_modal/delete_timeline_modal.tsx             | 2 +-
 .../open_timeline/delete_timeline_modal/index.test.tsx          | 2 +-
 .../plugins/siem/public/components/open_timeline/index.test.tsx | 2 +-
 .../components/open_timeline/note_previews/index.test.tsx       | 2 +-
 .../public/components/open_timeline/note_previews/index.tsx     | 2 +-
 .../open_timeline/note_previews/note_preview.test.tsx           | 2 +-
 .../components/open_timeline/note_previews/note_preview.tsx     | 2 +-
 .../siem/public/components/open_timeline/open_timeline.test.tsx | 2 +-
 .../siem/public/components/open_timeline/open_timeline.tsx      | 2 +-
 .../components/open_timeline/open_timeline_modal/index.test.tsx | 2 +-
 .../open_timeline_modal/open_timeline_modal_body.test.tsx       | 2 +-
 .../open_timeline_modal/open_timeline_modal_body.tsx            | 2 +-
 .../open_timeline_modal/open_timeline_modal_button.test.tsx     | 2 +-
 .../public/components/open_timeline/search_row/index.test.tsx   | 2 +-
 .../siem/public/components/open_timeline/search_row/index.tsx   | 2 +-
 .../open_timeline/timelines_table/actions_columns.test.tsx      | 2 +-
 .../open_timeline/timelines_table/actions_columns.tsx           | 2 +-
 .../open_timeline/timelines_table/common_columns.test.tsx       | 2 +-
 .../components/open_timeline/timelines_table/common_columns.tsx | 2 +-
 .../open_timeline/timelines_table/extended_columns.test.tsx     | 2 +-
 .../open_timeline/timelines_table/extended_columns.tsx          | 2 +-
 .../open_timeline/timelines_table/icon_header_columns.test.tsx  | 2 +-
 .../open_timeline/timelines_table/icon_header_columns.tsx       | 2 +-
 .../components/open_timeline/timelines_table/index.test.tsx     | 2 +-
 .../public/components/open_timeline/timelines_table/index.tsx   | 2 +-
 .../public/components/open_timeline/title_row/index.test.tsx    | 2 +-
 .../siem/public/components/open_timeline/title_row/index.tsx    | 2 +-
 .../page/add_filter_to_global_search_bar/index.test.tsx         | 2 +-
 .../components/page/hosts/authentications_table/index.test.tsx  | 2 +-
 .../components/page/hosts/first_last_seen_host/index.test.tsx   | 2 +-
 .../public/components/page/hosts/host_overview/index.test.tsx   | 2 +-
 .../public/components/page/hosts/hosts_table/index.test.tsx     | 2 +-
 .../components/page/hosts/uncommon_process_table/index.test.tsx | 2 +-
 .../page/network/flow_target_select_connected/index.test.tsx    | 2 +-
 .../public/components/page/network/ip_overview/index.test.tsx   | 2 +-
 .../public/components/page/network/kpi_network/index.test.tsx   | 2 +-
 .../components/page/network/network_dns_table/index.test.tsx    | 2 +-
 .../page/network/network_dns_table/is_ptr_included.test.tsx     | 2 +-
 .../components/page/network/network_http_table/index.test.tsx   | 2 +-
 .../page/network/network_top_countries_table/index.test.tsx     | 2 +-
 .../page/network/network_top_n_flow_table/index.test.tsx        | 2 +-
 .../public/components/page/network/tls_table/index.test.tsx     | 2 +-
 .../public/components/page/network/users_table/index.test.tsx   | 2 +-
 .../components/page/overview/overview_host_stats/index.test.tsx | 2 +-
 .../page/overview/overview_network_stats/index.test.tsx         | 2 +-
 .../siem/public/components/paginated_table/index.test.tsx       | 2 +-
 x-pack/legacy/plugins/siem/public/components/pin/index.tsx      | 2 +-
 .../legacy/plugins/siem/public/components/port/index.test.tsx   | 2 +-
 x-pack/legacy/plugins/siem/public/components/port/index.tsx     | 2 +-
 .../plugins/siem/public/components/resize_handle/index.test.tsx | 2 +-
 .../plugins/siem/public/components/scroll_to_top/index.test.tsx | 2 +-
 .../siem/public/components/selectable_text/index.test.tsx       | 2 +-
 .../siem/public/components/source_destination/geo_fields.tsx    | 2 +-
 .../siem/public/components/source_destination/index.test.tsx    | 2 +-
 .../plugins/siem/public/components/source_destination/index.tsx | 2 +-
 .../siem/public/components/source_destination/ip_with_port.tsx  | 2 +-
 .../siem/public/components/source_destination/network.tsx       | 2 +-
 .../components/source_destination/source_destination_arrows.tsx | 2 +-
 .../source_destination/source_destination_ip.test.tsx           | 2 +-
 .../components/source_destination/source_destination_ip.tsx     | 2 +-
 .../source_destination/source_destination_with_arrows.tsx       | 2 +-
 .../plugins/siem/public/components/stat_items/index.test.tsx    | 2 +-
 .../siem/public/components/super_date_picker/index.test.tsx     | 2 +-
 .../plugins/siem/public/components/tables/helpers.test.tsx      | 2 +-
 .../siem/public/components/timeline/auto_save_warning/index.tsx | 2 +-
 .../siem/public/components/timeline/body/actions/index.test.tsx | 2 +-
 .../siem/public/components/timeline/body/actions/index.tsx      | 2 +-
 .../components/timeline/body/column_headers/actions/index.tsx   | 2 +-
 .../timeline/body/column_headers/events_select/helpers.tsx      | 2 +-
 .../timeline/body/column_headers/events_select/index.tsx        | 2 +-
 .../timeline/body/column_headers/filter/index.test.tsx          | 2 +-
 .../components/timeline/body/column_headers/filter/index.tsx    | 2 +-
 .../timeline/body/column_headers/header/index.test.tsx          | 2 +-
 .../body/column_headers/header_tooltip_content/index.test.tsx   | 2 +-
 .../body/column_headers/header_tooltip_content/index.tsx        | 2 +-
 .../components/timeline/body/column_headers/index.test.tsx      | 2 +-
 .../public/components/timeline/body/column_headers/index.tsx    | 2 +-
 .../timeline/body/column_headers/range_picker/index.test.tsx    | 2 +-
 .../timeline/body/column_headers/range_picker/index.tsx         | 2 +-
 .../timeline/body/column_headers/text_filter/index.test.tsx     | 2 +-
 .../timeline/body/column_headers/text_filter/index.tsx          | 2 +-
 .../components/timeline/body/data_driven_columns/index.test.tsx | 2 +-
 .../components/timeline/body/data_driven_columns/index.tsx      | 2 +-
 .../components/timeline/body/events/stateful_event_child.tsx    | 2 +-
 .../plugins/siem/public/components/timeline/body/index.test.tsx | 2 +-
 .../public/components/timeline/body/renderers/args.test.tsx     | 2 +-
 .../siem/public/components/timeline/body/renderers/args.tsx     | 2 +-
 .../timeline/body/renderers/auditd/generic_details.test.tsx     | 2 +-
 .../timeline/body/renderers/auditd/generic_details.tsx          | 2 +-
 .../body/renderers/auditd/generic_file_details.test.tsx         | 2 +-
 .../timeline/body/renderers/auditd/generic_file_details.tsx     | 2 +-
 .../body/renderers/auditd/generic_row_renderer.test.tsx         | 2 +-
 .../body/renderers/auditd/primary_secondary_user_info.test.tsx  | 2 +-
 .../body/renderers/auditd/primary_secondary_user_info.tsx       | 2 +-
 .../renderers/auditd/session_user_host_working_dir.test.tsx     | 2 +-
 .../body/renderers/auditd/session_user_host_working_dir.tsx     | 2 +-
 .../body/renderers/dns/dns_request_event_details.test.tsx       | 2 +-
 .../timeline/body/renderers/dns/dns_request_event_details.tsx   | 2 +-
 .../body/renderers/dns/dns_request_event_details_line.test.tsx  | 2 +-
 .../body/renderers/dns/dns_request_event_details_line.tsx       | 2 +-
 .../timeline/body/renderers/empty_column_renderer.tsx           | 2 +-
 .../renderers/endgame/endgame_security_event_details.test.tsx   | 2 +-
 .../body/renderers/endgame/endgame_security_event_details.tsx   | 2 +-
 .../endgame/endgame_security_event_details_line.test.tsx        | 2 +-
 .../renderers/endgame/endgame_security_event_details_line.tsx   | 2 +-
 .../timeline/body/renderers/exit_code_draggable.test.tsx        | 2 +-
 .../components/timeline/body/renderers/exit_code_draggable.tsx  | 2 +-
 .../components/timeline/body/renderers/file_draggable.test.tsx  | 2 +-
 .../components/timeline/body/renderers/file_draggable.tsx       | 2 +-
 .../timeline/body/renderers/get_column_renderer.test.tsx        | 2 +-
 .../timeline/body/renderers/get_row_renderer.test.tsx           | 2 +-
 .../components/timeline/body/renderers/host_working_dir.tsx     | 2 +-
 .../siem/public/components/timeline/body/renderers/netflow.tsx  | 2 +-
 .../body/renderers/netflow/netflow_row_renderer.test.tsx        | 2 +-
 .../timeline/body/renderers/parent_process_draggable.test.tsx   | 2 +-
 .../timeline/body/renderers/parent_process_draggable.tsx        | 2 +-
 .../timeline/body/renderers/plain_column_renderer.test.tsx      | 2 +-
 .../timeline/body/renderers/process_draggable.test.tsx          | 2 +-
 .../components/timeline/body/renderers/process_draggable.tsx    | 2 +-
 .../public/components/timeline/body/renderers/process_hash.tsx  | 2 +-
 .../timeline/body/renderers/suricata/suricata_details.test.tsx  | 2 +-
 .../timeline/body/renderers/suricata/suricata_details.tsx       | 2 +-
 .../timeline/body/renderers/suricata/suricata_refs.tsx          | 2 +-
 .../body/renderers/suricata/suricata_row_renderer.test.tsx      | 2 +-
 .../body/renderers/suricata/suricata_signature.test.tsx         | 2 +-
 .../timeline/body/renderers/suricata/suricata_signature.tsx     | 2 +-
 .../components/timeline/body/renderers/system/auth_ssh.test.tsx | 2 +-
 .../components/timeline/body/renderers/system/auth_ssh.tsx      | 2 +-
 .../timeline/body/renderers/system/generic_details.test.tsx     | 2 +-
 .../timeline/body/renderers/system/generic_details.tsx          | 2 +-
 .../body/renderers/system/generic_file_details.test.tsx         | 2 +-
 .../timeline/body/renderers/system/generic_file_details.tsx     | 2 +-
 .../body/renderers/system/generic_row_renderer.test.tsx         | 2 +-
 .../components/timeline/body/renderers/system/package.test.tsx  | 2 +-
 .../components/timeline/body/renderers/system/package.tsx       | 2 +-
 .../timeline/body/renderers/user_host_working_dir.test.tsx      | 2 +-
 .../timeline/body/renderers/user_host_working_dir.tsx           | 2 +-
 .../timeline/body/renderers/zeek/zeek_details.test.tsx          | 2 +-
 .../components/timeline/body/renderers/zeek/zeek_details.tsx    | 2 +-
 .../timeline/body/renderers/zeek/zeek_row_renderer.test.tsx     | 2 +-
 .../timeline/body/renderers/zeek/zeek_signature.test.tsx        | 2 +-
 .../components/timeline/body/renderers/zeek/zeek_signature.tsx  | 2 +-
 .../components/timeline/body/sort/sort_indicator.test.tsx       | 2 +-
 .../public/components/timeline/body/sort/sort_indicator.tsx     | 2 +-
 .../components/timeline/data_providers/data_providers.test.tsx  | 2 +-
 .../public/components/timeline/data_providers/empty.test.tsx    | 2 +-
 .../siem/public/components/timeline/data_providers/empty.tsx    | 2 +-
 .../siem/public/components/timeline/data_providers/index.tsx    | 2 +-
 .../public/components/timeline/data_providers/provider.test.tsx | 2 +-
 .../components/timeline/data_providers/provider_item_and.tsx    | 2 +-
 .../timeline/data_providers/provider_item_and_drag_drop.tsx     | 2 +-
 .../components/timeline/data_providers/providers.test.tsx       | 2 +-
 .../public/components/timeline/data_providers/providers.tsx     | 2 +-
 .../siem/public/components/timeline/expandable_event/index.tsx  | 2 +-
 .../siem/public/components/timeline/footer/index.test.tsx       | 2 +-
 .../siem/public/components/timeline/header/index.test.tsx       | 2 +-
 .../plugins/siem/public/components/timeline/header/index.tsx    | 2 +-
 .../siem/public/components/timeline/properties/helpers.tsx      | 2 +-
 .../siem/public/components/timeline/properties/index.test.tsx   | 2 +-
 .../public/components/timeline/search_or_filter/helpers.tsx     | 2 +-
 .../components/timeline/search_or_filter/search_or_filter.tsx   | 2 +-
 .../plugins/siem/public/components/timeline/timeline.test.tsx   | 2 +-
 .../legacy/plugins/siem/public/components/timeline/timeline.tsx | 2 +-
 .../siem/public/components/toasters/modal_all_errors.test.tsx   | 2 +-
 .../siem/public/components/truncatable_text/index.test.tsx      | 2 +-
 .../plugins/siem/public/components/url_state/index.test.tsx     | 2 +-
 .../siem/public/components/url_state/index_mocked.test.tsx      | 2 +-
 x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx   | 2 +-
 .../siem/public/lib/clipboard/with_copy_to_clipboard.tsx        | 2 +-
 x-pack/legacy/plugins/siem/public/mock/hook_wrapper.tsx         | 2 +-
 x-pack/legacy/plugins/siem/public/mock/test_providers.tsx       | 2 +-
 .../rules/components/import_rule_modal/index.test.tsx           | 2 +-
 .../rules/components/json_downloader/index.test.tsx             | 2 +-
 .../rules/components/rule_switch/index.test.tsx                 | 2 +-
 x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx    | 2 +-
 .../plugins/siem/public/pages/network/ip_details/index.test.tsx | 2 +-
 .../legacy/plugins/siem/public/pages/network/network.test.tsx   | 2 +-
 .../legacy/plugins/siem/public/pages/overview/overview.test.tsx | 2 +-
 295 files changed, 295 insertions(+), 295 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/components/and_or_badge/index.tsx b/x-pack/legacy/plugins/siem/public/components/and_or_badge/index.tsx
index be449e3d422d97..2fb270c2840005 100644
--- a/x-pack/legacy/plugins/siem/public/components/and_or_badge/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/and_or_badge/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from './translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
index 10d3c899562e8c..141365911a7c68 100644
--- a/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/arrows/index.tsx b/x-pack/legacy/plugins/siem/public/components/arrows/index.tsx
index dfc7645c564d26..97b5eb04ac7bbb 100644
--- a/x-pack/legacy/plugins/siem/public/components/arrows/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/arrows/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiIcon } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 /** Renders the body (non-pointy part) of an arrow */
diff --git a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
index 77a7296e368cfe..26e6f6d4f56b48 100644
--- a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
@@ -9,7 +9,7 @@ import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { AutocompleteSuggestion } from '../../../../../../../src/plugins/data/public';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/bytes/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/bytes/index.test.tsx
index 6816bff24f1cd2..d99a909efad102 100644
--- a/x-pack/legacy/plugins/siem/public/components/bytes/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/bytes/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 import { PreferenceFormattedBytes } from '../formatted_bytes';
diff --git a/x-pack/legacy/plugins/siem/public/components/bytes/index.tsx b/x-pack/legacy/plugins/siem/public/components/bytes/index.tsx
index fbe83623211b1a..94c6ecba68be52 100644
--- a/x-pack/legacy/plugins/siem/public/components/bytes/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/bytes/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DefaultDraggable } from '../draggables';
 import { PreferenceFormattedBytes } from '../formatted_bytes';
diff --git a/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.test.tsx
index b0c165fedfffc1..9cd0af062c54a6 100644
--- a/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 import { useMountAppended } from '../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.tsx b/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.tsx
index f8db7d754aab15..181d92dce06f99 100644
--- a/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DraggableBadge } from '../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/areachart.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/areachart.test.tsx
index 2b99efc05fd8cb..ac283790671d3a 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/areachart.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/areachart.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { ShallowWrapper, shallow } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { AreaChartBaseComponent, AreaChartComponent } from './areachart';
 import { ChartSeriesData } from './common';
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
index 506b1ceb5ed830..ac9c4d591232a6 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { shallow, ShallowWrapper } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { BarChartBaseComponent, BarChartComponent } from './barchart';
 import { ChartSeriesData } from './common';
diff --git a/x-pack/legacy/plugins/siem/public/components/direction/index.tsx b/x-pack/legacy/plugins/siem/public/components/direction/index.tsx
index 9295e055f918d7..ad1e63dbd7e6a1 100644
--- a/x-pack/legacy/plugins/siem/public/components/direction/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/direction/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { NetworkDirectionEcs } from '../../graphql/types';
 import { DraggableBadge } from '../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
index 1a8af9d99193a6..f7aa8d4fe50b4a 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
index 4b546bca1f72eb..1174a58bb165ec 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
index 056669673bb9e2..1ba49d7b57023f 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx
index c660ac6adaa71d..821ef9be10e8d0 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx
@@ -5,7 +5,7 @@
  */
 
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import { Droppable } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/draggables/field_badge/index.tsx b/x-pack/legacy/plugins/siem/public/components/draggables/field_badge/index.tsx
index 90d8ad463b476e..ba0d53210bace5 100644
--- a/x-pack/legacy/plugins/siem/public/components/draggables/field_badge/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/draggables/field_badge/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 const Field = styled.div`
diff --git a/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
index f1ed533bef545f..6793c3f8cbacac 100644
--- a/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 import { getEmptyString } from '../empty_value';
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 323dee53f1910f..57f047416ec1ca 100644
--- a/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge, EuiBadgeProps, EuiToolTip, IconType } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { Omit } from '../../../common/utility_types';
 import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrapper';
diff --git a/x-pack/legacy/plugins/siem/public/components/duration/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/duration/index.test.tsx
index 140a625bc53fee..0dbc60ad9ae523 100644
--- a/x-pack/legacy/plugins/siem/public/components/duration/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/duration/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 import { ONE_MILLISECOND_AS_NANOSECONDS } from '../formatted_duration/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/duration/index.tsx b/x-pack/legacy/plugins/siem/public/components/duration/index.tsx
index 15e6246f1f1ad8..76712b789ffbe5 100644
--- a/x-pack/legacy/plugins/siem/public/components/duration/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/duration/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DefaultDraggable } from '../draggables';
 import { FormattedDuration } from '../formatted_duration';
diff --git a/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.test.tsx
index 7c515862b0d921..1786905a4bb48a 100644
--- a/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
index 007916595fd6ad..897ee57b14c60d 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { useIndexPatterns } from '../../hooks/use_index_patterns';
 import { EmbeddedMapComponent } from './embedded_map';
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
index d04329edff4756..30d260709fdcda 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { IndexPatternsMissingPromptComponent } from './index_patterns_missing_prompt';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx
index 798e3d2c10f97f..a4f95d2e299adc 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButton, EuiCode, EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 import chrome from 'ui/chrome';
 
 import { useKibana } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
index c43ab1ff4a036f..7113904738a2c0 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { LineToolTipContentComponent } from './line_tool_tip_content';
 import { FeatureProperty } from '../types';
 import { SUM_OF_DESTINATION_BYTES, SUM_OF_SOURCE_BYTES } from '../map_config';
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
index 13eefb252fb04b..8657b7a35f3b5a 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MapToolTipComponent } from './map_tool_tip';
 import { MapFeature } from '../types';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
index 929b4983b5fd76..94884add0bbd26 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { FeatureProperty } from '../types';
 import { getRenderedFieldValue, PointToolTipContentComponent } from './point_tool_tip_content';
 import { TestProviders } from '../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
index 4c77570cfbc9f2..e63577e5a63272 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ToolTipFooterComponent } from './tooltip_footer';
 
 describe('ToolTipFilter', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
index 6233fcfe7c823c..3ae46132149494 100644
--- a/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { Provider } from 'react-redux';
 
 import { apolloClientObservable, mockGlobalState } from '../../mock';
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 18404c2263b1c5..1962850425baac 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
@@ -15,7 +15,7 @@ import {
   EuiText,
   EuiToolTip,
 } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
index d97da7797bb451..7498a3e02269d4 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockDetailItemData, mockDetailItemDataId } from '../../mock/mock_detail_item';
 import { TestProviders } from '../../mock/test_providers';
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx
index 25f95bfa1d383f..1a8955d1116244 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { mockDetailItemData, mockDetailItemDataId } from '../../mock/mock_detail_item';
 import { TestProviders } from '../../mock/test_providers';
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
index 429fc94b2f2d32..32662b51ea3db3 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockDetailItemData } from '../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.tsx
index 519f56adff2d20..9897e319e0487b 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.tsx
@@ -6,7 +6,7 @@
 
 import { EuiCodeEditor } from '@elastic/eui';
 import { set } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DetailItem } from '../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.test.tsx
index 01317e754ad35c..24118ace6796f2 100644
--- a/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.tsx b/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.tsx
index bba32e72abc371..147d2e2d541f52 100644
--- a/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiIcon } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 const LinkIcon = styled(EuiIcon)`
diff --git a/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx b/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
index e45f5dacb36a26..bd31f5314762ef 100644
--- a/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { FlowTarget, GetIpOverviewQuery, HostEcsFields } from '../../graphql/types';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.test.tsx
index 2d3accbcb55c86..361a0789135e41 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.tsx
index 3165580f435a2b..d6972625821cf3 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiInMemoryTable, EuiTitle } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category.test.tsx
index 4e16997ba92f6c..38eaf43977fa21 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category.tsx
index 7b8451db2212f1..9d2a7da9b2d00f 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiInMemoryTable } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.test.tsx
index ce66a2d8d79195..cbead878f525db 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.test.tsx
index e0628a410921e5..792e0342a6d592 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.tsx
index 49255abc83dd58..cd14cef328a7e6 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.test.tsx
index c43d5833fe1da2..9214fd5f2540ce 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.test.tsx
index 6034f5a4764432..4d0c707c469105 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { omit } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
index 17553c79b643cd..778e9d3d3c7449 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
@@ -8,7 +8,7 @@
 
 import { EuiCheckbox, EuiIcon, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { uniqBy } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.test.tsx
index 59ee2efa1f0061..1437af7a30adb7 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.test.tsx
index 68ba2e2774314e..f3ec87a96d46b6 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.tsx
index 170cf324ca6d8a..fba6e22e4b21f5 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/header.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/header.test.tsx
index 7e36a028961c48..42689065354d00 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/header.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/header.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/header.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/header.tsx
index 8acb19970c268c..45b331f133e85e 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/header.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/header.tsx
@@ -12,7 +12,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/index.test.tsx
index 8a01a01b1daae8..24e4cd77b20d3f 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
index 47f0aef4b48060..2fce177735968a 100644
--- a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { FlowDirection } from '../../graphql/types';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
index b1f757841e54b1..ba05a3961619ec 100644
--- a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
@@ -7,7 +7,7 @@
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { clone } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
 
 import { FlowDirection, FlowTarget } from '../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/button/index.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/button/index.tsx
index fee4f25f9e2559..6ec5912872467f 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/button/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/button/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiNotificationBadge, EuiIcon, EuiButton } from '@elastic/eui';
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DroppableWrapper } from '../../drag_and_drop/droppable_wrapper';
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
index be7e8fac70bf53..3894a64f3e084e 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
@@ -7,7 +7,7 @@
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { set } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
 
 import { apolloClientObservable, mockGlobalState, TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/index.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/index.tsx
index 2d347830d5b1b5..528f02f0a845b7 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge } from '@elastic/eui';
 import { defaultTo, getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
 import styled from 'styled-components';
 import { ActionCreator } from 'typescript-fsa';
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
index 246261035508bd..0196f500fee74a 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock';
 import { flyoutHeaderHeight } from '..';
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
index 8c27a55d3a6b0e..665d90f6a05ecb 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockFrameworks, getMockKibanaUiSetting } from '../../mock';
 import { useUiSetting$ } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
index 003ce0879b7b51..5a4816a96324b7 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import numeral from '@elastic/numeral';
 
 import { DEFAULT_BYTES_FORMAT } from '../../../common/constants';
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
index dad1d5feb5c6e8..6f8bab13a00943 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
@@ -7,7 +7,7 @@
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 
 import { useUiSetting$ } from '../../lib/kibana';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
index 19e8ec3f95d269..169696d5fcde9e 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 import { FormattedRelative } from '@kbn/i18n/react';
 
 import { useUiSetting$ } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_duration/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_duration/index.tsx
index 8afbafe57af4ab..fa8d87cf4e82d8 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_duration/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_duration/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { getFormattedDurationString } from './helpers';
 import { FormattedDurationTooltip } from './tooltip';
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_duration/tooltip/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_duration/tooltip/index.tsx
index 1372b3ef10920b..6c11a7aad7ad21 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_duration/tooltip/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_duration/tooltip/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_ip/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_ip/index.tsx
index 8dcb558122d015..48d34451404bea 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_ip/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_ip/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isArray, isEmpty, isString, uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrapper';
 import { escapeDataProviderId } from '../drag_and_drop/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/inspect/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/inspect/index.test.tsx
index 3a2e516fffb7e7..26c5f499717e9c 100644
--- a/x-pack/legacy/plugins/siem/public/components/inspect/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/inspect/index.test.tsx
@@ -6,7 +6,7 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import {
diff --git a/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
index 2dda3eca563fea..c042c3590c53fb 100644
--- a/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
 import { useMountAppended } from '../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/ip/index.tsx b/x-pack/legacy/plugins/siem/public/components/ip/index.tsx
index 8c327989963b42..49237c3bb1bb96 100644
--- a/x-pack/legacy/plugins/siem/public/components/ip/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ip/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { FormattedFieldValue } from '../timeline/body/renderers/formatted_field';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.test.tsx
index 3842b7be678767..c4ea6ff63a0a77 100644
--- a/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 import { useMountAppended } from '../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.tsx b/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.tsx
index 950ab252ad0bd0..955a57576dc8eb 100644
--- a/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DraggableBadge } from '../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/last_event_time/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/last_event_time/index.test.tsx
index dcecc636d9f0fd..69a795d0c8db78 100644
--- a/x-pack/legacy/plugins/siem/public/components/last_event_time/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/last_event_time/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { getEmptyValue } from '../empty_value';
 import { LastEventIndexKey } from '../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
index 21580a0ac86640..dd5c3bf8bb5d59 100644
--- a/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import { encodeIpv6 } from '../../lib/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/links/index.tsx b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
index 9d8d01d2bb49aa..f63d13fcda7f03 100644
--- a/x-pack/legacy/plugins/siem/public/components/links/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiLink } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { encodeIpv6 } from '../../lib/helpers';
 import { getHostDetailsUrl, getIPDetailsUrl } from '../link_to';
diff --git a/x-pack/legacy/plugins/siem/public/components/loading/index.tsx b/x-pack/legacy/plugins/siem/public/components/loading/index.tsx
index cd437911ab5897..8c39a3d6ffcbe1 100644
--- a/x-pack/legacy/plugins/siem/public/components/loading/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/loading/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiPanel, EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 const SpinnerFlexItem = styled(EuiFlexItem)`
diff --git a/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.test.tsx
index 5feb70edffb9a8..c25f0d71833c02 100644
--- a/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.test.tsx
@@ -5,7 +5,7 @@
  */
 import { mount } from 'enzyme';
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 
 import { LocalizedDateTooltip } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.tsx b/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.tsx
index 82520ce2745c0b..ed0b1b16892188 100644
--- a/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.tsx
@@ -7,7 +7,7 @@
 import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { FormattedRelative } from '@kbn/i18n/react';
 import moment from 'moment';
-import * as React from 'react';
+import React from 'react';
 
 export const LocalizedDateTooltip = React.memo<{
   children: React.ReactNode;
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
index 56c215218ad5ed..9e97ce56130093 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
@@ -5,7 +5,7 @@
  */
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Markdown } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
index 0727b6794f48ce..30695c9d0c7e2a 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
@@ -7,7 +7,7 @@
 /* eslint-disable react/display-name */
 
 import { EuiLink, EuiTableRow, EuiTableRowCell, EuiText, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import ReactMarkdown from 'react-markdown';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
index 80ccd07c30249b..81aa2d586a83b0 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { MarkdownHintComponent } from './markdown_hint';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.tsx
index 5ecd1d4c9d2ad3..199059670e4bd2 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from './translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
index fd72fcd7322b04..78a4c967ee0bba 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
@@ -7,7 +7,7 @@
 /* eslint-disable react/display-name */
 
 import { shallow } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { MatrixHistogram } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx
index 3966448f84df02..6ccc41546e5587 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import { InfluencerInput, Anomalies, CriteriaFields } from '../types';
 import { useAnomaliesTableData } from './use_anomalies_table_data';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
index cf24d6c02a1381..dcd0a55ca4bd16 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { AnomalyScoreComponent } from './anomaly_score';
 import { mockAnomalies } from '../mock';
 import { TestProviders } from '../../../mock/test_providers';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
index 759e84e36f4acc..68795dd1046912 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { AnomalyScoresComponent, createJobKey } from './anomaly_scores';
 import { mockAnomalies } from '../mock';
 import { TestProviders } from '../../../mock/test_providers';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
index f00fb62d74ac3e..89b2c61bd46895 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow, mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { mockAnomalies } from '../mock';
 import { createDescriptionList } from './create_description_list';
 import { EuiDescriptionList } from '@elastic/eui';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
index 542529c628b727..9a76c82fd3f60a 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { GroupsFilterPopoverComponent } from './groups_filter_popover';
 import { mockSiemJobs } from '../../__mocks__/api';
 import { SiemJob } from '../../types';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
index 0711cc1c879660..266f844c8956e5 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { JobsTableFiltersComponent } from './jobs_table_filters';
 import { SiemJob } from '../../types';
 import { cloneDeep } from 'lodash/fp';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
index 91e5510f4938d4..69ea1929dc7ea8 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow, mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { isChecked, isFailure, isJobLoading, JobSwitchComponent } from './job_switch';
 import { cloneDeep } from 'lodash/fp';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
index 691d43a8b18b36..a791ebef4773e8 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow, mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { JobsTableComponent } from './jobs_table';
 import { mockSiemJobs } from '../__mocks__/api';
 import { cloneDeep } from 'lodash/fp';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
index 2e2445fe933bbc..c2a11af5f997b3 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ShowingCountComponent } from './showing_count';
 
 describe('ShowingCount', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.test.tsx
index 987c63be3f7be1..bd7d696757ca6d 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import { MlPopover } from './ml_popover';
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
index d409f5de200a47..81f5bb726e0825 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { PopoverDescriptionComponent } from './popover_description';
 
 describe('JobsTableFilters', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
index c522b7750c4149..b62307c17cb168 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { UpgradeContentsComponent } from './upgrade_contents';
 
 describe('JobsTableFilters', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/navigation/index.test.tsx
index d7061ba4efd9cb..cae209a76fc1ce 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { CONSTANTS } from '../url_state/constants';
 import { SiemNavigationComponent } from './';
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx
index 840e2bf3f42dcd..b9563b60f301bb 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { navTabs } from '../../../pages/home/home_navigations';
 import { SiemPageName } from '../../../pages/home/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/fingerprints/index.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/fingerprints/index.tsx
index 6b29068f3cd2de..f0dc67a5ff4c3b 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/fingerprints/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/fingerprints/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import {
   CertificateFingerprint,
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
index 22531983b23992..2c0b1237138ed9 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
@@ -6,7 +6,7 @@
 
 import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { shallow } from 'enzyme';
 
 import { asArrayIfExists } from '../../lib/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/index.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/index.tsx
index 26e6986c386be9..3d6c2a7b767cb0 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { Fingerprints } from './fingerprints';
 import { NetflowColumns } from './netflow_columns';
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/duration_event_start_end.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/duration_event_start_end.tsx
index f006ec0f003c18..09fa5d9fe1596a 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/duration_event_start_end.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/duration_event_start_end.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
 import { uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DefaultDraggable } from '../../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/index.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/index.tsx
index 0dc4a2271e207f..f8a0256ff4d435 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { SourceDestination } from '../../source_destination';
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/user_process.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/user_process.tsx
index adac7dede1f851..ab71dc301156f8 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/user_process.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/user_process.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
index fc76780ef80c79..30789b042b4ade 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { AddNote } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
index 3ab556a4e5dc4c..9c4a32aad195b4 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import * as i18n from '../translations';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.tsx
index 64cbdf1c678c55..5a3439d53dd891 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel, EuiTabbedContent, EuiTextArea } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Markdown } from '../../markdown';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx b/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
index fbcb3c13be67ac..32e10ac3eb77d1 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
@@ -6,7 +6,7 @@
 
 /* eslint-disable react/display-name */
 
-import * as React from 'react';
+import React from 'react';
 
 import { EuiTableDataType } from '@elastic/eui';
 import { NoteCard } from './note_card';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx
index 65e46f8d84c9f0..c933055186e078 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx
@@ -6,7 +6,7 @@
 
 import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import moment from 'moment';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Note } from '../../lib/note';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.test.tsx
index 2c16f85c780764..a927627353f691 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.tsx
index 88e59ddd1419b5..e02ebc2a25fd0c 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { NoteCardBody } from './note_card_body';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
index b6cd23496b1902..d1e08c19a1b658 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
index 94ea0a6ee3129d..11761c8fd39b04 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { WithCopyToClipboard } from '../../../lib/clipboard/with_copy_to_clipboard';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx
index 0511ad264647a7..3525a88fc2ddd4 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import * as i18n from '../translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.tsx
index a227b5af38e85c..e6aa0542df4b35 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiAvatar, EuiPanel } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from '../translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.test.tsx
index 9c41d9d52a755e..5d99375c38217f 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import { NoteCreated } from './note_created';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.tsx
index c94f4021e1a4aa..cdd0406c714509 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.tsx
@@ -5,7 +5,7 @@
  */
 
 import { FormattedRelative } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { LocalizedDateTooltip } from '../../localized_date_tooltip';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.test.tsx
index dc52822eaff778..f70e841d1eefd3 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
index 917ec3f1bf0b86..e061141bf43e78 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 
 import { DeleteTimelineModal } from './delete_timeline_modal';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx
index 1163fbba1572a7..82fe0d1d162a4b 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx
@@ -6,7 +6,7 @@
 
 import { EuiConfirmModal, EUI_MODAL_CONFIRM_BUTTON } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 
 import * as i18n from '../translations';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx
index 561eac000bbf76..a3c5371435e52c 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButtonIconProps } from '@elastic/eui';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 
 import { DeleteTimelineModalButton } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx
index c9f52d9d204aed..520e2094fb3364 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
 import { MockedProvider } from 'react-apollo/test-utils';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { wait } from '../../lib/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx
index 70bf7d2cbeb524..463111bd9735f0 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx
@@ -8,7 +8,7 @@ import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep } from 'lodash/fp';
 import moment from 'moment';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { mockTimelineResults } from '../../../mock/timeline_results';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.tsx
index 2c35d5d8254cd4..e0507c2370831d 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { uniqBy } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { NotePreview } from './note_preview';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx
index 8092172a29cefa..7cefaf08d76cb2 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx
@@ -6,7 +6,7 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { getEmptyValue } from '../../empty_value';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx
index 126a14f1f8e32f..bb4a032734b5b9 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx
@@ -6,7 +6,7 @@
 
 import { EuiAvatar, EuiFlexGroup, EuiFlexItem, EuiText, EuiTitle, EuiToolTip } from '@elastic/eui';
 import { FormattedRelative } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { getEmptyValue, defaultToEmptyTag } from '../../empty_value';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
index dbc7199aac7253..1ed08eee633aba 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../pages/timelines/timelines_page';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
index 3b4057c69a696c..59ccfc8b250aa5 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { OPEN_TIMELINE_CLASS_NAME } from './helpers';
 import { OpenTimelineProps } from './types';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx
index e3dc6d974b5e04..ca8fa50c572fe3 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx
@@ -6,7 +6,7 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ThemeProvider } from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
index a5abb42c2e3b66..1010504c0acace 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
index b097d2e0d01ebf..e28725973aff2f 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiModalBody, EuiModalHeader } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { OpenTimelineProps } from '../types';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx
index 9a70fd476e89e9..66947a313f5e55 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx
@@ -6,7 +6,7 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ThemeProvider } from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.test.tsx
index c25bba7b6b041b..1a4708ed5af083 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.test.tsx
@@ -7,7 +7,7 @@
 import { EuiFilterButtonProps } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { SearchRow } from '.';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.tsx
index fa16c8cfb70356..5765d31078bcf7 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.tsx
@@ -14,7 +14,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from '../translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
index 749ba8672abead..89d6b4befa787c 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
@@ -8,7 +8,7 @@ import { EuiButtonIconProps } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep, omit } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
index 6934e69bd0f7fa..51dba21ac225c2 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
@@ -7,7 +7,7 @@
 /* eslint-disable react/display-name */
 
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { ACTION_COLUMN_WIDTH } from './common_styles';
 import { DeleteTimelineModalButton } from '../delete_timeline_modal';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
index fa08df1df4785b..559ee4a7bb4946 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
@@ -7,7 +7,7 @@
 import { EuiButtonIconProps } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep, omit } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
index 743754842c6a8a..0b51bd78283c5a 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
@@ -8,7 +8,7 @@
 
 import { EuiButtonIcon, EuiLink } from '@elastic/eui';
 import { omit } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { ACTION_COLUMN_WIDTH } from './common_styles';
 import { isUntitled } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
index 13362e0f43a28c..bc88603721e8a2 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep, omit } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
index aa80a2b4e78a14..b6d874fa0c4d1a 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
@@ -6,7 +6,7 @@
 
 /* eslint-disable react/display-name */
 
-import * as React from 'react';
+import React from 'react';
 
 import { defaultToEmptyTag } from '../../empty_value';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
index b6048b85eea753..26836787efab10 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep, omit } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
index 7649b1a8ce01cf..5b0f3ded7d71bd 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
@@ -7,7 +7,7 @@
 /* eslint-disable react/display-name */
 
 import { EuiIcon, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { ACTION_COLUMN_WIDTH } from './common_styles';
 import { getNotesCount, getPinnedEventCount } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
index d75863d1ccb8bd..7d947cb28e9ece 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
index 8f25b5345988a7..ce88ade01d2ef3 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBasicTable as _EuiBasicTable } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from '../translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.test.tsx
index 9303c09c994aa3..88dfab470ac962 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { EuiButtonProps } from '@elastic/eui';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { TitleRow } from '.';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.tsx
index 2e82c4979f41d9..c7de367e043640 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import * as i18n from '../translations';
 import { OpenTimelineProps } from '../types';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx
index 70e75cb54671ac..c7e620ded1d296 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../mock';
 import { createStore, State } from '../../../store';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
index 71e61e2425373c..964efbd79e4045 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
 import { apolloClientObservable, mockGlobalState } from '../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
index 35c1eded18f15d..0c6976ef774e2c 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { render, act } from '@testing-library/react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
index 830665f827301e..6ac551f8ed0ca8 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { TestProviders } from '../../../../mock';
 
 import { HostOverview } from './index';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
index 4728925eb741a6..2981984c93e968 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
index 28ddb1df12c3a2..115c4f38725739 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { hostsModel } from '../../../../store';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx
index c9d18d5f996f39..8c744c6573ee88 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock';
 import { createStore, State } from '../../../../store';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
index 6c2edd764855c4..9407eca9732b42 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
 
 import { FlowTarget } from '../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
index 964617c4c85b14..181d61d0aa8531 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
 import { apolloClientObservable, mockGlobalState } from '../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
index b88653bcadde8a..96209635e9fce9 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
index e39723f57f0b07..182d33f202e65e 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { FlowDirection } from '../../../../graphql/types';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx
index 81e0c7fad7b391..212a88060cc9ab 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
index 8fd245b0772431..5b359c1cb53726 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
index 5c4aa862283f20..6d53b15e3285b9 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
index 920d1cd8210e5a..7abbc90353bb4e 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
index d01923f01543f4..139ccac1d3293e 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
index d324df2ecb0c11..57ec07ce1f306c 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { OverviewHostStats } from '.';
 import { mockData } from './mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
index 1b28c032221ab3..fda0e7dc8b7ab3 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { OverviewNetworkStats } from '.';
 import { mockData } from './mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
index 0444360d2b965a..150c728a38206a 100644
--- a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../graphql/types';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/pin/index.tsx b/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
index 8aec3a60cbc371..9f898f9acaf2e9 100644
--- a/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButtonIcon, IconSize } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import * as i18n from '../../components/timeline/body/translations';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
index 330385e39ca79f..99cd0c158bbc48 100644
--- a/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
 import { useMountAppended } from '../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/port/index.tsx b/x-pack/legacy/plugins/siem/public/components/port/index.tsx
index a8961a92f24cf7..bd6289547d0dc8 100644
--- a/x-pack/legacy/plugins/siem/public/components/port/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/port/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DefaultDraggable } from '../draggables';
 import { getEmptyValue } from '../empty_value';
diff --git a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
index f1580b59362bfa..52abc9e9935449 100644
--- a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/scroll_to_top/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/scroll_to_top/index.test.tsx
index 988bb13841fa52..18040937328616 100644
--- a/x-pack/legacy/plugins/siem/public/components/scroll_to_top/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/scroll_to_top/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { globalNode, HookWrapper } from '../../mock';
 import { useScrollToTop } from '.';
diff --git a/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
index 95c68d0233c691..98f3574375c24c 100644
--- a/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { SelectableText } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/geo_fields.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/geo_fields.tsx
index edf3dc08c7282a..baeca10ee0fae6 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/geo_fields.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/geo_fields.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { get, uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DefaultDraggable } from '../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
index c437994145d63b..9282a05232ce18 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
@@ -8,7 +8,7 @@ import numeral from '@elastic/numeral';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { asArrayIfExists } from '../../lib/helpers';
 import { getMockNetflowData } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/index.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/index.tsx
index 0333181c3521c5..c994c4b2cd5197 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Network } from './network';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/ip_with_port.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/ip_with_port.tsx
index 4ec317737e72d9..ea6ce4caa72702 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/ip_with_port.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/ip_with_port.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Ip } from '../ip';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/network.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/network.tsx
index cfacbb077856c5..a0b86b3e9a1338 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/network.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/network.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DirectionBadge } from '../direction';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_arrows.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_arrows.tsx
index 0675212591a66f..005ebc14dcdcc6 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_arrows.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_arrows.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import numeral from '@elastic/numeral';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { ArrowBody, ArrowHead } from '../arrows';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx
index 463373b5894f1d..60ab59c3796ff0 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { asArrayIfExists } from '../../lib/helpers';
 import { getMockNetflowData } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
index ebc5beaa4e3548..33159387214e43 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { isEmpty, isEqual, uniqWith } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip';
 import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME, Port } from '../port';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx
index 53dade22351bfb..d6a3ce41587341 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { SourceDestinationArrows } from './source_destination_arrows';
 import { SourceDestinationIp } from './source_destination_ip';
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
index 7dac5ff2e9bb66..43d845590ec752 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
@@ -9,7 +9,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, ReactWrapper } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import {
diff --git a/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.test.tsx
index 013104da7c6128..c5838fa283e177 100644
--- a/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
 import { useUiSetting$ } from '../../lib/kibana';
diff --git a/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
index d864d4306b8ef6..0b8807915732b8 100644
--- a/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
@@ -10,7 +10,7 @@ import {
   getRowItemDraggable,
   OverflowFieldComponent,
 } from './helpers';
-import * as React from 'react';
+import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/auto_save_warning/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/auto_save_warning/index.tsx
index 6c793126efa726..c2dfda6a81ce40 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/auto_save_warning/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/auto_save_warning/index.tsx
@@ -11,7 +11,7 @@ import {
   EuiGlobalToastListToast as Toast,
 } from '@elastic/eui';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.test.tsx
index a9628ebbd183f7..9351fddd90dd5a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.tsx
index 54b1fb0893c83b..6cf14cd972d3ec 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { EuiButtonIcon, EuiCheckbox, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { Note } from '../../../../lib/note';
 import { AssociateNote, UpdateNote } from '../../../notes/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx
index b57b343d614a80..64e8aa3c7e7b7c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButtonIcon } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { OnColumnRemoved } from '../../../events';
 import { EventsHeadingExtra, EventsLoading } from '../../../styles';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx
index 057f751f451ac0..853c1ec24b7031 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Pin } from '../../../../pin';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx
index 634db2dc526761..87a1035fc07397 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiCheckbox, EuiSuperSelect } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled, { createGlobalStyle } from 'styled-components';
 
 import { getEventsSelectOptions } from './helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
index d93983d7d40545..48c9c991b24b46 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { ColumnHeaderType } from '../column_header';
 import { defaultHeaders } from '../default_headers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx
index c56322cc69e0ca..0b5247e7da6786 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { OnFilterChange } from '../../../events';
 import { ColumnHeader } from '../column_header';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
index bfcf3cd6397999..f1b412319a3772 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../../../../graphql/types';
 import { TestProviders } from '../../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
index da348590bd0444..aec0267061f551 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
@@ -7,7 +7,7 @@
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { defaultHeaders } from '../../../../../mock';
 import { ColumnHeader } from '../column_header';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx
index a63ec2bf840a6b..5deb2c3e66376f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiIcon } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { getIconFromType } from '../../../../event_details/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
index 7765b0360d35b7..f40c93aaba3a46 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../helpers';
 import { defaultHeaders } from './default_headers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
index 6b53b763b77835..52495c2e3c816d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiCheckbox } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Draggable, Droppable } from 'react-beautiful-dnd';
 
 import { BrowserFields } from '../../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx
index d919bdb0788a62..12ce3bb7092423 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { RangePicker } from '.';
 import { Ranges } from './ranges';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx
index c221829f92d041..de21fdac6434a5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiSelect } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { OnRangeSelected } from '../../../events';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
index c6b1ee056ebcc5..0323629638001b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { DEFAULT_PLACEHOLDER, TextFilter } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx
index 09672eb9a38fe5..fcc23314a18136 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFieldText } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { OnFilterChange } from '../../../events';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
index f5b33296561c7e..0638f2d96808f4 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
@@ -6,7 +6,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 
-import * as React from 'react';
+import React from 'react';
 
 import { mockTimelineData } from '../../../../mock';
 import { defaultHeaders } from '../column_headers/default_headers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx
index 03900e1745236d..37b6e302150560 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
 import { OnColumnResized } from '../../events';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event_child.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event_child.tsx
index 9ea1bbb1e84302..a39c254c61126b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event_child.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event_child.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import uuid from 'uuid';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.test.tsx
index 5c6a0872ce3406..239d8a9d779168 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../containers/source/mock';
 import { Direction } from '../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
index ad904554e33ad3..f0d63ff0465cf5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { useMountAppended } from '../../../../utils/use_mount_appended';
 import { TestProviders } from '../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.tsx
index 8282931aa05794..22367ec879851a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../draggables';
 import { isNillEmptyOrNotFinite, TokensFlexItem } from './helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
index 8d3a7133690313..260e713474ac62 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx
index b60d89c857421b..c25c656b75e41f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
index af4971faae2956..1abcb459b77206 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx
index be84696033d69f..797361878e6c53 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiSpacer, IconType } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
index f2cce8b16b5d6a..4f66793ffae324 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
index a5b861be08e563..8212f4c9c7974d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { PrimarySecondaryUserInfo, nilOrUnSet } from './primary_secondary_user_info';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx
index bd350a599bb47f..a54042d3de9d87 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
index 2240d83169e0da..ec56e38ffade30 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
@@ -7,7 +7,7 @@
 import { EuiFlexItem } from '@elastic/eui';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { SessionUserHostWorkingDir } from './session_user_host_working_dir';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx
index 3c825e6c931be3..6a6b55bb817c84 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
index 07207c822ad291..a7c9d10e82a2fd 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { mockBrowserFields } from '../../../../../../public/containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx
index 752163901de2e2..824e8c00de307a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Details } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx
index d6c50460194a78..e12eacd73559de 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx
index fd49395379e240..c7a08620bebbbe 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 import { isNillEmptyOrNotFinite, TokensFlexItem } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
index 8e046342abd42c..7e2346ced8785e 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
@@ -6,7 +6,7 @@
 
 /* eslint-disable react/display-name */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
 import { DraggableWrapper, DragEffects } from '../../../drag_and_drop/draggable_wrapper';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
index 77569f07a23c23..72b879d4ade78b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { mockBrowserFields } from '../../../../../../public/containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
index 10f9c4ad9e5455..35a88f52f05a3a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx
index 45a824e034b15a..4e522f6ed5c94f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx
index 185e9c9a8287a2..c2c42ba0e4ddcf 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 import { isNillEmptyOrNotFinite, TokensFlexItem } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx
index 21fbafb64d57f6..4da236bfa34c30 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { useMountAppended } from '../../../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx
index 9ea5f2cdd99fa9..7671e3f0509a53 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx
index ff63d02acc37c7..d800821f8d8a5f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx
index a1c43f3ecb1633..e4871c6479c6be 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
index d445ec2859e2c2..908e01ef110c02 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
 import { mockTimelineData } from '../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
index bea525116021d5..e73802b9295d67 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../containers/source/mock';
 import { Ecs } from '../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx
index 0bdecfecd6c594..db49df30be473f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow.tsx
index 0904c836c2f307..0990301b6e2b92 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow.tsx
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { Ecs } from '../../../../graphql/types';
 import { asArrayIfExists } from '../../../../lib/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
index 6ba8f3f28dae85..188e9babfaf454 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx
index 80ae10a48415cf..684def7386da04 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx
index 7cb6c3704a238b..1402743ef8a519 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
index 008885b5264c88..5c25216cf8487a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
@@ -8,7 +8,7 @@ import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
 import { defaultHeaders, mockFrameworks, mockTimelineData, TestProviders } from '../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
index ff1cb60db0d93f..a9dae95d700c3f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { ProcessDraggable, ProcessDraggableWithNonExistentProcess } from './process_draggable';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx
index 29d6c0e7d59c2b..35512c60629dd0 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx
index cb0b40bdd8fcae..b6696d38dc1c53 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DraggableBadge } from '../../../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
index 3f77726474c568..c8921fb616e56c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
 import { mockTimelineData } from '../../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx
index 35733e5e0b31b9..17f5f236265edf 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx
index 6fe6523180e584..dd773bb88ef686 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { ExternalLinkIcon } from '../../../../external_link_icon';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
index 66c9613c029958..be8d557b638111 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
index 4eefb4b0bc8b9a..3e643fe5c78300 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { useMountAppended } from '../../../../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
index 632e8ff35950e8..2b9adfe21b120b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge, EuiBadgeProps, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DragEffects, DraggableWrapper } from '../../../../drag_and_drop/draggable_wrapper';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
index e42a91b7d7972c..5831af59545078 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { AuthSsh } from './auth_ssh';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx
index 60eab8381e98d6..0ff2eec35314d8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 import { TokensFlexItem } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
index 54f5b2f1652874..ca3445c23cecf5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
index e3627d0ec918a7..e1524c8e5aecbb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
index d4260d9bd183a1..cd721b109090f1 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
index 401c1c522ca602..c47d9603cbea26 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
index b2dbdb6b0e45cb..62402ba8a4c4e4 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
index 167abe2185bcc5..e561ad462ae4e8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { useMountAppended } from '../../../../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.tsx
index d87639d2b8d6ed..a28e850e2af968 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 import { TokensFlexItem } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
index 662392078f38ae..8ecc917a383b89 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { UserHostWorkingDir } from './user_host_working_dir';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx
index 281cfd39bd9d24..d370afee2585f5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../draggables';
 import { TokensFlexItem } from './helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
index 73b90410bc8039..a2c0f0403c801b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx
index 1a31e560d78104..d8561186b45462 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiSpacer } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
index b4fd9a978b7d88..b61b445a5dd753 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
index 4ef2bb89e05ca4..763d10e732c576 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { Ecs } from '../../../../../graphql/types';
 import { mockTimelineData, TestProviders } from '../../../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
index 6a6ae4e4e7da50..72f58df5677e4d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge, EuiBadgeProps, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
index cda1fe0844e001..f3116bc2f4bf45 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../../../graphql/types';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx
index fc77bbd7257048..74fb1e5e4034c8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiIcon } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../../../graphql/types';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
index d67c6c9648a151..43425bd6c51303 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 import { useMountAppended } from '../../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
index c249e263d1205b..18bb0b20b30615 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Empty } from './empty';
 import { TestProviders } from '../../../mock/test_providers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.tsx
index 87d45f6d3db179..a47fb932ed26c7 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge, EuiBadgeProps, EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { AndOrBadge } from '../../and_or_badge';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
index cce6dfc1403757..525cc8e301d11c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
index aa3f07cb1b17ab..e47117c9550fe9 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and.tsx
index 05dc7b7b84587d..badc92d00c1746 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { AndOrBadge } from '../../and_or_badge';
 import { BrowserFields } from '../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and_drag_drop.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and_drag_drop.tsx
index 17457b900f3a9d..1a1e8292b7e027 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and_drag_drop.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and_drag_drop.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge, EuiBadgeProps, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { AndOrBadge } from '../../and_or_badge';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
index c9454846c5548b..246fefda8d5236 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 import { DroppableWrapper } from '../../drag_and_drop/droppable_wrapper';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.tsx
index 4d095485ef69d0..bfe99f6920e663 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiFormHelpText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/expandable_event/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/expandable_event/index.tsx
index 8f5d91d8ce11fb..1c5df9d220a62b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/expandable_event/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/expandable_event/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
index 07b7741e5c1521..2d8c0e73029443 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
@@ -7,7 +7,7 @@
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
index 4527e39128f890..d8f56507bf3655 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../../graphql/types';
 import { mockIndexPattern } from '../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.tsx
index 814d25d9c718d5..7e570d613ca5a3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiCallOut } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 import { IIndexPattern } from 'src/plugins/data/public';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
index 0e222f470f0d7e..ae139c24d01768 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
@@ -18,7 +18,7 @@ import {
   EuiOverlayMask,
   EuiToolTip,
 } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import uuid from 'uuid';
 
 import { Note } from '../../../lib/note';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.test.tsx
index bc05204cc47fe2..495b94f8c02e78 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
 import { mockGlobalState, apolloClientObservable } from '../../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx
index c9b1a3ced6e93a..5db453988cbb8e 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiSpacer, EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { AndOrBadge } from '../../and_or_badge';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
index b645202ab4c541..45eb7f85c809f5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiSuperSelect, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled, { createGlobalStyle } from 'styled-components';
 
 import { esFilters, IIndexPattern } from '../../../../../../../../src/plugins/data/public';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
index bb500de239da71..34e62cf2c22479 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { timelineQuery } from '../../containers/timeline/index.gql_query';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
index 5646b26428bf86..e15c58d32425a8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup } from '@elastic/eui';
 import { getOr, isEmpty } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx b/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
index 3a7774298f6afa..7c19b61c4b49df 100644
--- a/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 
-import * as React from 'react';
+import React from 'react';
 
 import { ModalAllErrors } from './modal_all_errors';
 import { AppToast } from '.';
diff --git a/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
index 8c5a08fdf5e214..e4c799822ba170 100644
--- a/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TruncatableText } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
index 63412302fedfb4..67823bea9e170c 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { HookWrapper } from '../../mock';
 import { SiemPageName } from '../../pages/home/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/index_mocked.test.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/index_mocked.test.tsx
index 705b2106be3157..f673b77ea13c5c 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/index_mocked.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/index_mocked.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { HookWrapper } from '../../mock/hook_wrapper';
 import { SiemPageName } from '../../pages/home/types';
diff --git a/x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx b/x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx
index 44cf7502f3c5ec..fdb6ed130a5256 100644
--- a/x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx
+++ b/x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx
@@ -6,7 +6,7 @@
 
 import { EuiGlobalToastListToast as Toast, EuiButtonIcon } from '@elastic/eui';
 import copy from 'copy-to-clipboard';
-import * as React from 'react';
+import React from 'react';
 import uuid from 'uuid';
 
 import * as i18n from './translations';
diff --git a/x-pack/legacy/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx b/x-pack/legacy/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx
index c392c2511551f6..ee94c2daa3fc46 100644
--- a/x-pack/legacy/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx
+++ b/x-pack/legacy/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Clipboard } from './clipboard';
diff --git a/x-pack/legacy/plugins/siem/public/mock/hook_wrapper.tsx b/x-pack/legacy/plugins/siem/public/mock/hook_wrapper.tsx
index 4f1c2049c00271..292ddc036dcafd 100644
--- a/x-pack/legacy/plugins/siem/public/mock/hook_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/mock/hook_wrapper.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 interface HookWrapperProps {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx b/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
index f0f719a60a7088..c7692755c13303 100644
--- a/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
+++ b/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
@@ -9,7 +9,7 @@ import { I18nProvider } from '@kbn/i18n/react';
 import { InMemoryCache as Cache } from 'apollo-cache-inmemory';
 import ApolloClient from 'apollo-client';
 import { ApolloLink } from 'apollo-link';
-import * as React from 'react';
+import React from 'react';
 import { ApolloProvider } from 'react-apollo';
 import { DragDropContext, DropResult, ResponderProvided } from 'react-beautiful-dnd';
 import { Provider as ReduxStoreProvider } from 'react-redux';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
index 381a3138bf6179..7544edac5a5503 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ImportRuleModalComponent } from './index';
 
 jest.mock('../../../../../lib/kibana');
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
index d7a508e2c53e38..e5ba3b8d6ddbd0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { JSONDownloaderComponent, jsonToNDJSON, ndjsonToJSON } from './index';
 
 const jsonArray = [
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
index 7a3a99b1839718..4e7ff6fb3a886a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { RuleSwitchComponent } from './index';
 jest.mock('../../../../../lib/kibana');
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
index 00dcb5908a98bc..729777745d689f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount } from 'enzyme';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Router } from 'react-router-dom';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ActionCreator } from 'typescript-fsa';
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
index d624631c1feae4..bde41ac02bc0a4 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Router } from 'react-router-dom';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ActionCreator } from 'typescript-fsa';
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx b/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
index 335bb62c5c8526..9c87d29cd1056e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount } from 'enzyme';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Router } from 'react-router-dom';
 import { MockedProvider } from 'react-apollo/test-utils';
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
index 300df4a742adf2..7f9f4b1eb70b03 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
@@ -6,7 +6,7 @@
 
 import { mount } from 'enzyme';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { MemoryRouter } from 'react-router-dom';
 

From 057632758b15125ddd7c27f8dbe195d12c50e8c9 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Tue, 7 Jan 2020 10:43:40 -0800
Subject: [PATCH 31/96] [DOCS] Moves index pattern doc to Discover (#53347)

* [DOCS] Moves index pattern doc to Discover

* [DOCS] Improves intro to index patterns doc

* [DOCS] Edits index patterns doc

* [DOCS] Incorporates comments into index patterns doc

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 docs/management/index-patterns.asciidoc       | 138 ++++++++++--------
 .../management-cross-cluster-search.asciidoc  |  30 ----
 docs/user/discover.asciidoc                   |   3 +
 docs/user/management.asciidoc                 |   4 -
 4 files changed, 78 insertions(+), 97 deletions(-)
 delete mode 100644 docs/management/index-patterns/management-cross-cluster-search.asciidoc

diff --git a/docs/management/index-patterns.asciidoc b/docs/management/index-patterns.asciidoc
index 8d9ef515108eda..8e687f641c92be 100644
--- a/docs/management/index-patterns.asciidoc
+++ b/docs/management/index-patterns.asciidoc
@@ -1,17 +1,22 @@
 [[index-patterns]]
-== Index patterns
+== Creating an index pattern
 
-To visualize and explore data in {kib}, you must create an index pattern. 
-An index pattern tells {kib} which {es} indices contain the data that you want to work with. 
-An index pattern can match a single index, multiple indices, and a rollup index. 
+To explore and visualize data in {kib}, you must create an index pattern.
+An index pattern tells {kib} which {es} indices contain the data that
+you want to work with.
+Once you create an index pattern, you're ready to:
+
+* Interactively explore your data in <<discover, Discover>>.
+* Analyze your data in charts, tables, gauges, tag clouds, and more in <<visualize, Visualize>>.
+* Show off your data in a <<canvas, Canvas>> workpad.
+* If your data includes geo data, visualize it with <<maps, Maps>>.
 
 [float]
 [[index-patterns-read-only-access]]
 === [xpack]#Read-only access#
-If you have insufficient privileges to create or save index patterns, a read-only 
+If you have insufficient privileges to create or save index patterns, a read-only
 indicator appears in Kibana. The buttons to create new index patterns or save
-existing index patterns are not visible. For more information on granting access to
-Kibana see <<xpack-security-authorization>>.
+existing index patterns are not visible. For more information, see <<xpack-security-authorization>>.
 
 [role="screenshot"]
 image::images/management-index-read-only-badge.png[Example of Index Pattern Management's read only access indicator in Kibana's header]
@@ -20,12 +25,9 @@ image::images/management-index-read-only-badge.png[Example of Index Pattern Mana
 [[settings-create-pattern]]
 === Create an index pattern
 
-To get started, go to *Management > Kibana > Index Patterns*.  You begin with
-an overview of your index patterns, including any that were added when you 
-downloaded sample data sets. 
-
-You can create a standard index pattern, and if a rollup index is detected in the 
-cluster, a rollup index pattern.
+If you are in an app that requires an index pattern, and you don't have one yet,
+{kib} prompts you to create one.  Or, you can go directly to
+*Management > Kibana > Index Patterns*.
 
 [role="screenshot"]
 image:management/index-patterns/images/rollup-index-pattern.png["Menu with rollup index pattern"]
@@ -33,83 +35,93 @@ image:management/index-patterns/images/rollup-index-pattern.png["Menu with rollu
 [float]
 ==== Standard index pattern
 
-{kib} makes it easy for you to create an index pattern by walking you through 
-the process. Just start typing in the *Index pattern* field, and {kib} looks for 
-the names of {es} indices that match your input. Make sure that the name of the 
+Just start typing in the *Index pattern* field, and {kib} looks for
+the names of {es} indices that match your input. Make sure that the name of the
 index pattern is unique.
-
-If you want to include system indices in your search, toggle the switch in the 
-upper right.
+To include system indices in your search, toggle the switch in the upper right.
 
 [role="screenshot"]
 image:management/index-patterns/images/create-index-pattern.png["Create index pattern"]
 
-Your index pattern can match multiple {es} indices.  
-Use a comma to separate the names, with no space after the comma. The notation for 
-wildcards (`*`) and the ability to "exclude" (`-`) also apply 
+Your index pattern can match multiple {es} indices.
+Use a comma to separate the names, with no space after the comma. The notation for
+wildcards (`*`) and the ability to "exclude" (`-`) also apply
 (for example, `test*,-test3`).
 
-When {kib} detects an index with a timestamp, you’re asked to choose a field to 
-filter your data by time. If you don’t specify a field, you won’t be able 
+If {kib} detects an index with a timestamp, you’re asked to choose a field to
+filter your data by time. If you don’t specify a field, you won’t be able
 to use the time filter.
 
-Once you’ve created your index pattern, you can start working with 
-your {es} data in {kib}.  Here are some things to try:
 
-* Interactively explore your data in <<discover, Discover>>.
-* Present your data in charts, tables, gauges, tag clouds, and more in <<visualize, Visualize>>.
-* Show off your data in a <<canvas, Canvas>> presentation.
-* If your data includes geo data, visualize it using <<maps, Maps>>.
-
-For a walkthrough of creating an index pattern and visualizing the data, 
-see <<getting-started, Getting Started>>. 
 
 [float]
 ==== Rollup index pattern
 
-If a rollup index is detected in the cluster, clicking *Create index pattern* 
-includes an item for creating a rollup index pattern. You create an 
-index pattern for rolled up data the same way you do for any data.  
+If a rollup index is detected in the cluster, clicking *Create index pattern*
+includes an item for creating a rollup index pattern.
+You can match an index pattern to only rolled up data, or mix both rolled
+up and raw data to explore and visualize all data together.
+An index pattern can match
+only one rollup index.
+
+[float]
+[[management-cross-cluster-search]]
+==== {ccs-cap} index pattern
+
+If your {es} clusters are configured for {ref}/modules-cross-cluster-search.html[{ccs}], you can create
+index patterns to search across the clusters of your choosing. Using the
+same syntax that you'd use in a raw {ccs} request in {es}, create your
+index pattern with the convention `<cluster-names>:<pattern>`.
+
+For example, to query {ls} indices across two {es} clusters
+that you set up for {ccs}, which are named `cluster_one` and `cluster_two`,
+you would use `cluster_one:logstash-*,cluster_two:logstash-*` as your index pattern.
+
+You can use wildcards in your cluster names
+to match any number of clusters, so if you want to search {ls} indices across
+clusters named `cluster_foo`, `cluster_bar`, and so on, you would use `cluster_*:logstash-*`
+as your index pattern.
 
-You can match an index pattern to only rolled up data, or mix both rolled 
-up and raw data to visualize all data together. An index pattern can match 
-only one rollup index, not multiple. There is no restriction on the 
-number of standard indices that an index pattern can match.
+To query across all {es} clusters that have been configured for {ccs},
+use a standalone wildcard for your cluster name in your index
+pattern: `*:logstash-*`.
 
-See <<visualize-rollup-data, Creating a visualization using rolled up data>> 
-for more detailed information.
+Once an index pattern is configured using the {ccs} syntax, all searches and
+aggregations using that index pattern in {kib} take advantage of {ccs}.
 
 [float]
 === Manage your index pattern
 
-Once you’ve created an index pattern, you’re presented a table of all fields 
-and associated data types in the index. 
+Once you create an index pattern, manually or with a sample data set,
+you can look at its fields and associated data types.
+You can also perform housekeeping tasks, such as making the
+index pattern the default or deleting it when you longer need it.
+To drill down into the details of an index pattern, click its name in
+the *Index patterns* overview.
 
 [role="screenshot"]
 image:management/index-patterns/images/new-index-pattern.png["Index files and data types"]
 
-You can perform the following actions:
+From the detailed view, you can perform the following actions:
 
-* *Manage the index fields.* Click a column header to sort the table by that column. 
-Use the field dropdown menu to limit to display to a specific field. 
-See <<managing-fields, Managing fields>> for more detailed information. 
+* *Manage the index fields.* You can add formatters to format values and create
+scripted fields.
+See <<managing-fields, Managing fields>> for more information.
 
-* [[set-default-pattern]]*Set the default index pattern.* {kib} uses a badge to make users 
-aware of which index pattern is the default. The first pattern 
-you create is automatically designated as the default pattern. The default 
-index pattern is loaded when you view the Discover tab.  
+* [[set-default-pattern]]*Set the default index pattern.* {kib} uses a badge to make users
+aware of which index pattern is the default. The first pattern
+you create is automatically designated as the default pattern. The default
+index pattern is loaded when you open *Discover*.
 
-* [[reload-fields]]*Reload the index fields list.* You can reload the index fields list to 
-pick up any newly-added fields. Doing so also resets Kibana’s popularity counters 
-for the fields. The popularity counters keep track of the fields 
-you’ve used most often in {kib} and are used to sort fields in lists.
+* [[reload-fields]]*Refresh the index fields list.* You can refresh the index fields list to
+pick up any newly-added fields. Doing so also resets Kibana’s popularity counters
+for the fields. The popularity counters are used in *Discover* to sort fields in lists.
 
-* [[delete-pattern]]*Delete the index pattern.* This action removes the pattern from the list of 
-Saved Objects in {kib}. You will not be able to recover field formatters, 
+* [[delete-pattern]]*Delete the index pattern.* This action removes the pattern from the list of
+Saved Objects in {kib}. You will not be able to recover field formatters,
 scripted fields, source filters, and field popularity data associated with the index pattern.
-+
-Deleting an index pattern breaks all visualizations, saved searches, and 
-other saved objects that reference the pattern. Deleting an index pattern does 
+Deleting an index pattern does
 not remove any indices or data documents from {es}.
-
-include::index-patterns/management-cross-cluster-search.asciidoc[]
++
+WARNING: Deleting an index pattern breaks all visualizations, saved searches, and
+other saved objects that reference the pattern.
diff --git a/docs/management/index-patterns/management-cross-cluster-search.asciidoc b/docs/management/index-patterns/management-cross-cluster-search.asciidoc
deleted file mode 100644
index 9fd8deb7f34be7..00000000000000
--- a/docs/management/index-patterns/management-cross-cluster-search.asciidoc
+++ /dev/null
@@ -1,30 +0,0 @@
-[[management-cross-cluster-search]]
-=== {ccs-cap}
-
-{es} supports the ability to run search and aggregation requests across multiple
-clusters using a module called _{ccs}_.
-
-In order to take advantage of {ccs}, you must configure your {es}
-clusters accordingly. Review the corresponding {es}
-{ref}/modules-cross-cluster-search.html[documentation] before attempting to use {ccs} in {kib}.
-
-Once your {es} clusters are configured for {ccs}, you can create
-specific index patterns in {kib} to search across the clusters of your choosing. Using the
-same syntax that you'd use in a raw {ccs} request in {es}, create your
-index pattern in {kib} with the convention `<cluster-names>:<pattern>`.
-
-For example, if you want to query {ls} indices across two of the {es} clusters
-that you set up for {ccs}, which were named `cluster_one` and `cluster_two`,
-you would use `cluster_one:logstash-*,cluster_two:logstash-*` as your index pattern in {kib}.
-
-Just like in raw search requests in {es}, you can use wildcards in your cluster names
-to match any number of clusters, so if you wanted to search {ls} indices across any
-clusters named `cluster_foo`, `cluster_bar`, and so on, you would use `cluster_*:logstash-*`
-as your index pattern in {kib}.
-
-If you want to query across all {es} clusters that have been configured for {ccs}, 
-then use a standalone wildcard for your cluster name in your {kib} index
-pattern: `*:logstash-*`.
-
-Once an index pattern is configured using the {ccs} syntax, all searches and
-aggregations using that index pattern in {kib} take advantage of {ccs}.
diff --git a/docs/user/discover.asciidoc b/docs/user/discover.asciidoc
index 36d6b0a6e473a9..7de7d73bf16642 100644
--- a/docs/user/discover.asciidoc
+++ b/docs/user/discover.asciidoc
@@ -3,6 +3,7 @@
 
 [partintro]
 --
+
 When you know what your data includes, you can create visualizations
 that best display that data and build better dashboards.
 *Discover* enables you to explore your data, find
@@ -99,6 +100,8 @@ or create a direct link to share.  The *Save* and *Share* actions are in the men
 
 --
 
+include::{kib-repo-dir}/management/index-patterns.asciidoc[]
+
 include::{kib-repo-dir}/discover/set-time-filter.asciidoc[]
 
 include::{kib-repo-dir}/discover/search.asciidoc[]
diff --git a/docs/user/management.asciidoc b/docs/user/management.asciidoc
index d1acb915f1973f..2c41d0072fe5b9 100644
--- a/docs/user/management.asciidoc
+++ b/docs/user/management.asciidoc
@@ -13,8 +13,6 @@ visualizations, and dashboards.
 
 include::{kib-repo-dir}/management/managing-licenses.asciidoc[]
 
-include::{kib-repo-dir}/management/index-patterns.asciidoc[]
-
 include::{kib-repo-dir}/management/rollups/create_and_manage_rollups.asciidoc[]
 
 include::{kib-repo-dir}/management/index-lifecycle-policies/intro-to-lifecycle-policies.asciidoc[]
@@ -40,5 +38,3 @@ include::{kib-repo-dir}/management/managing-beats.asciidoc[]
 include::{kib-repo-dir}/management/managing-remote-clusters.asciidoc[]
 
 include::{kib-repo-dir}/management/snapshot-restore/index.asciidoc[]
-
-

From 9eb0c77318c6136aa95f18db8c03dd063949ca74 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Tue, 7 Jan 2020 11:56:08 -0700
Subject: [PATCH 32/96] [dev/run] expose unexpected flags as more than just
 names (#54080)

---
 packages/kbn-dev-utils/src/run/README.md     |  2 +-
 packages/kbn-dev-utils/src/run/flags.test.ts | 94 ++++++++++++++++++++
 packages/kbn-dev-utils/src/run/flags.ts      | 65 ++++++++++++--
 packages/kbn-dev-utils/src/run/run.ts        |  4 +-
 packages/kbn-dev-utils/tsconfig.json         |  3 +-
 packages/kbn-pm/dist/index.js                | 61 +++++++++++--
 src/dev/run_i18n_check.ts                    |  1 +
 src/dev/run_i18n_extract.ts                  |  1 +
 src/dev/run_i18n_integrate.ts                |  1 +
 9 files changed, 211 insertions(+), 21 deletions(-)
 create mode 100644 packages/kbn-dev-utils/src/run/flags.test.ts

diff --git a/packages/kbn-dev-utils/src/run/README.md b/packages/kbn-dev-utils/src/run/README.md
index 913b601058f870..99893a62376689 100644
--- a/packages/kbn-dev-utils/src/run/README.md
+++ b/packages/kbn-dev-utils/src/run/README.md
@@ -117,7 +117,7 @@ $ node scripts/my_task
 
     - *`flags.allowUnexpected: boolean`*
 
-      By default, any flag that is passed but not mentioned in `flags.string`, `flags.boolean`, `flags.alias` or `flags.default` will trigger an error, preventing the run function from calling its first argument. If you have a reason to disable this behavior set this option to `true`.
+      By default, any flag that is passed but not mentioned in `flags.string`, `flags.boolean`, `flags.alias` or `flags.default` will trigger an error, preventing the run function from calling its first argument. If you have a reason to disable this behavior set this option to `true`. Unexpected flags will be collected from argv into `flags.unexpected`. To parse these flags and guess at their types, you can additionally pass `flags.guessTypesForUnexpectedFlags` but that's not recommended.
 
 
 - ***`createFailError(reason: string, options: { exitCode: number, showHelp: boolean }): FailError`***
diff --git a/packages/kbn-dev-utils/src/run/flags.test.ts b/packages/kbn-dev-utils/src/run/flags.test.ts
new file mode 100644
index 00000000000000..c730067a84f46a
--- /dev/null
+++ b/packages/kbn-dev-utils/src/run/flags.test.ts
@@ -0,0 +1,94 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getFlags } from './flags';
+
+it('gets flags correctly', () => {
+  expect(
+    getFlags(['-a', '--abc=bcd', '--foo=bar', '--no-bar', '--foo=baz', '--box', 'yes', '-zxy'], {
+      flags: {
+        boolean: ['x'],
+        string: ['abc'],
+        alias: {
+          x: 'extra',
+        },
+        allowUnexpected: true,
+      },
+    })
+  ).toMatchInlineSnapshot(`
+    Object {
+      "_": Array [],
+      "abc": "bcd",
+      "debug": false,
+      "extra": true,
+      "help": false,
+      "quiet": false,
+      "silent": false,
+      "unexpected": Array [
+        "-a",
+        "--foo=bar",
+        "--foo=baz",
+        "--no-bar",
+        "--box",
+        "yes",
+        "-z",
+        "-y",
+      ],
+      "v": false,
+      "verbose": false,
+      "x": true,
+    }
+  `);
+});
+
+it('guesses types for unexpected flags', () => {
+  expect(
+    getFlags(['-abc', '--abc=bcd', '--no-foo', '--bar'], {
+      flags: {
+        allowUnexpected: true,
+        guessTypesForUnexpectedFlags: true,
+      },
+    })
+  ).toMatchInlineSnapshot(`
+    Object {
+      "_": Array [],
+      "a": true,
+      "abc": "bcd",
+      "b": true,
+      "bar": true,
+      "c": true,
+      "debug": false,
+      "foo": false,
+      "help": false,
+      "quiet": false,
+      "silent": false,
+      "unexpected": Array [
+        "-a",
+        "-b",
+        "-c",
+        "-abc",
+        "--abc=bcd",
+        "--no-foo",
+        "--bar",
+      ],
+      "v": false,
+      "verbose": false,
+    }
+  `);
+});
diff --git a/packages/kbn-dev-utils/src/run/flags.ts b/packages/kbn-dev-utils/src/run/flags.ts
index 6a2966359ece12..c809a40d8512ba 100644
--- a/packages/kbn-dev-utils/src/run/flags.ts
+++ b/packages/kbn-dev-utils/src/run/flags.ts
@@ -37,7 +37,7 @@ export interface Flags {
 }
 
 export function getFlags(argv: string[], options: Options): Flags {
-  const unexpected: string[] = [];
+  const unexpectedNames = new Set<string>();
   const flagOpts = options.flags || {};
 
   const { verbose, quiet, silent, debug, help, _, ...others } = getopts(argv, {
@@ -49,15 +49,64 @@ export function getFlags(argv: string[], options: Options): Flags {
     },
     default: flagOpts.default,
     unknown: (name: string) => {
-      unexpected.push(name);
+      unexpectedNames.add(name);
+      return flagOpts.guessTypesForUnexpectedFlags;
+    },
+  } as any);
+
+  const unexpected: string[] = [];
+  for (const unexpectedName of unexpectedNames) {
+    const matchingArgv: string[] = [];
+
+    iterArgv: for (const [i, v] of argv.entries()) {
+      for (const prefix of ['--', '-']) {
+        if (v.startsWith(prefix)) {
+          // -/--name=value
+          if (v.startsWith(`${prefix}${unexpectedName}=`)) {
+            matchingArgv.push(v);
+            continue iterArgv;
+          }
+
+          // -/--name (value possibly follows)
+          if (v === `${prefix}${unexpectedName}`) {
+            matchingArgv.push(v);
 
-      if (options.flags && options.flags.allowUnexpected) {
-        return true;
+            // value follows -/--name
+            if (argv.length > i + 1 && !argv[i + 1].startsWith('-')) {
+              matchingArgv.push(argv[i + 1]);
+            }
+
+            continue iterArgv;
+          }
+        }
       }
 
-      return false;
-    },
-  } as any);
+      // special case for `--no-{flag}` disabling of boolean flags
+      if (v === `--no-${unexpectedName}`) {
+        matchingArgv.push(v);
+        continue iterArgv;
+      }
+
+      // special case for shortcut flags formatted as `-abc` where `a`, `b`,
+      // and `c` will be three separate unexpected flags
+      if (
+        unexpectedName.length === 1 &&
+        v[0] === '-' &&
+        v[1] !== '-' &&
+        !v.includes('=') &&
+        v.includes(unexpectedName)
+      ) {
+        matchingArgv.push(`-${unexpectedName}`);
+        continue iterArgv;
+      }
+    }
+
+    if (matchingArgv.length) {
+      unexpected.push(...matchingArgv);
+    } else {
+      throw new Error(`unable to find unexpected flag named "${unexpectedName}"`);
+    }
+  }
 
   return {
     verbose,
@@ -75,7 +124,7 @@ export function getHelp(options: Options) {
   const usage = options.usage || `node ${relative(process.cwd(), process.argv[1])}`;
 
   const optionHelp = (
-    dedent((options.flags && options.flags.help) || '') +
+    dedent(options?.flags?.help || '') +
     '\n' +
     dedent`
       --verbose, -v      Log verbosely
diff --git a/packages/kbn-dev-utils/src/run/run.ts b/packages/kbn-dev-utils/src/run/run.ts
index 06746c663b917c..1d28d435757297 100644
--- a/packages/kbn-dev-utils/src/run/run.ts
+++ b/packages/kbn-dev-utils/src/run/run.ts
@@ -36,6 +36,7 @@ export interface Options {
   description?: string;
   flags?: {
     allowUnexpected?: boolean;
+    guessTypesForUnexpectedFlags?: boolean;
     help?: string;
     alias?: { [key: string]: string | string[] };
     boolean?: string[];
@@ -46,7 +47,6 @@ export interface Options {
 
 export async function run(fn: RunFn, options: Options = {}) {
   const flags = getFlags(process.argv.slice(2), options);
-  const allowUnexpected = options.flags ? options.flags.allowUnexpected : false;
 
   if (flags.help) {
     process.stderr.write(getHelp(options));
@@ -97,7 +97,7 @@ export async function run(fn: RunFn, options: Options = {}) {
   const cleanupTasks: CleanupTask[] = [unhookExit];
 
   try {
-    if (!allowUnexpected && flags.unexpected.length) {
+    if (!options.flags?.allowUnexpected && flags.unexpected.length) {
       throw createFlagError(`Unknown flag(s) "${flags.unexpected.join('", "')}"`);
     }
 
diff --git a/packages/kbn-dev-utils/tsconfig.json b/packages/kbn-dev-utils/tsconfig.json
index 4c519a609d86fe..0ec058eeb8a280 100644
--- a/packages/kbn-dev-utils/tsconfig.json
+++ b/packages/kbn-dev-utils/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "target",
     "target": "ES2019",
-    "declaration": true
+    "declaration": true,
+    "declarationMap": true
   },
   "include": [
     "src/**/*"
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index b81308e8309cf8..c3f3f2f477fdd0 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -37054,8 +37054,8 @@ const tooling_log_1 = __webpack_require__(415);
 const fail_1 = __webpack_require__(425);
 const flags_1 = __webpack_require__(426);
 async function run(fn, options = {}) {
+    var _a;
     const flags = flags_1.getFlags(process.argv.slice(2), options);
-    const allowUnexpected = options.flags ? options.flags.allowUnexpected : false;
     if (flags.help) {
         process.stderr.write(flags_1.getHelp(options));
         process.exit(1);
@@ -37098,7 +37098,7 @@ async function run(fn, options = {}) {
     const unhookExit = exit_hook_1.default(doCleanup);
     const cleanupTasks = [unhookExit];
     try {
-        if (!allowUnexpected && flags.unexpected.length) {
+        if (!((_a = options.flags) === null || _a === void 0 ? void 0 : _a.allowUnexpected) && flags.unexpected.length) {
             throw fail_1.createFlagError(`Unknown flag(s) "${flags.unexpected.join('", "')}"`);
         }
         try {
@@ -37218,7 +37218,7 @@ const path_1 = __webpack_require__(16);
 const dedent_1 = tslib_1.__importDefault(__webpack_require__(14));
 const getopts_1 = tslib_1.__importDefault(__webpack_require__(427));
 function getFlags(argv, options) {
-    const unexpected = [];
+    const unexpectedNames = new Set();
     const flagOpts = options.flags || {};
     const { verbose, quiet, silent, debug, help, _, ...others } = getopts_1.default(argv, {
         string: flagOpts.string,
@@ -37229,13 +37229,55 @@ function getFlags(argv, options) {
         },
         default: flagOpts.default,
         unknown: (name) => {
-            unexpected.push(name);
-            if (options.flags && options.flags.allowUnexpected) {
-                return true;
-            }
-            return false;
+            unexpectedNames.add(name);
+            return flagOpts.guessTypesForUnexpectedFlags;
         },
     });
+    const unexpected = [];
+    for (const unexpectedName of unexpectedNames) {
+        const matchingArgv = [];
+        iterArgv: for (const [i, v] of argv.entries()) {
+            for (const prefix of ['--', '-']) {
+                if (v.startsWith(prefix)) {
+                    // -/--name=value
+                    if (v.startsWith(`${prefix}${unexpectedName}=`)) {
+                        matchingArgv.push(v);
+                        continue iterArgv;
+                    }
+                    // -/--name (value possibly follows)
+                    if (v === `${prefix}${unexpectedName}`) {
+                        matchingArgv.push(v);
+                        // value follows -/--name
+                        if (argv.length > i + 1 && !argv[i + 1].startsWith('-')) {
+                            matchingArgv.push(argv[i + 1]);
+                        }
+                        continue iterArgv;
+                    }
+                }
+            }
+            // special case for `--no-{flag}` disabling of boolean flags
+            if (v === `--no-${unexpectedName}`) {
+                matchingArgv.push(v);
+                continue iterArgv;
+            }
+            // special case for shortcut flags formatted as `-abc` where `a`, `b`,
+            // and `c` will be three separate unexpected flags
+            if (unexpectedName.length === 1 &&
+                v[0] === '-' &&
+                v[1] !== '-' &&
+                !v.includes('=') &&
+                v.includes(unexpectedName)) {
+                matchingArgv.push(`-${unexpectedName}`);
+                continue iterArgv;
+            }
+        }
+        if (matchingArgv.length) {
+            unexpected.push(...matchingArgv);
+        }
+        else {
+            throw new Error(`unable to find unexpected flag named "${unexpectedName}"`);
+        }
+    }
     return {
         verbose,
         quiet,
@@ -37249,8 +37291,9 @@ function getFlags(argv, options) {
 }
 exports.getFlags = getFlags;
 function getHelp(options) {
+    var _a, _b;
     const usage = options.usage || `node ${path_1.relative(process.cwd(), process.argv[1])}`;
-    const optionHelp = (dedent_1.default((options.flags && options.flags.help) || '') +
+    const optionHelp = (dedent_1.default(((_b = (_a = options) === null || _a === void 0 ? void 0 : _a.flags) === null || _b === void 0 ? void 0 : _b.help) || '') +
         '\n' +
         dedent_1.default `
       --verbose, -v      Log verbosely
diff --git a/src/dev/run_i18n_check.ts b/src/dev/run_i18n_check.ts
index f686c18c848f25..97ea988b1de3aa 100644
--- a/src/dev/run_i18n_check.ts
+++ b/src/dev/run_i18n_check.ts
@@ -133,6 +133,7 @@ run(
   {
     flags: {
       allowUnexpected: true,
+      guessTypesForUnexpectedFlags: true,
     },
   }
 );
diff --git a/src/dev/run_i18n_extract.ts b/src/dev/run_i18n_extract.ts
index 5492b5cd6795c7..106c8f10cb5cca 100644
--- a/src/dev/run_i18n_extract.ts
+++ b/src/dev/run_i18n_extract.ts
@@ -93,6 +93,7 @@ run(
   {
     flags: {
       allowUnexpected: true,
+      guessTypesForUnexpectedFlags: true,
     },
   }
 );
diff --git a/src/dev/run_i18n_integrate.ts b/src/dev/run_i18n_integrate.ts
index e8cd020773419e..23d66fae9f26e4 100644
--- a/src/dev/run_i18n_integrate.ts
+++ b/src/dev/run_i18n_integrate.ts
@@ -121,6 +121,7 @@ run(
   {
     flags: {
       allowUnexpected: true,
+      guessTypesForUnexpectedFlags: true,
     },
   }
 );

From 7b33fd318c61555a48969326bb78ae6f334fe831 Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Tue, 7 Jan 2020 14:20:02 -0500
Subject: [PATCH 33/96] Remove dependency that was causing effect to re-execute
 infinitely. (#54160)

---
 x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index eb9b475a35716e..f2b586b27dba69 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
@@ -16,5 +16,6 @@ export const useIndexPattern = <T>(setIndexPattern: Dispatch<T>) => {
       setIndexPattern(await fetch('/api/uptime/index_pattern', { method: 'GET' }));
     }
     getIndexPattern();
-  }, [core.services.http, setIndexPattern]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [core.services.http]);
 };

From 03ec7af04454335f346526b1347abe76cec4fe37 Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Tue, 7 Jan 2020 14:50:02 -0500
Subject: [PATCH 34/96] Spaces - fix flakey api tests (#54154)

* adding terms query

* run x-pack-ciGroup8 44 times

* Revert "run x-pack-ciGroup8 44 times"

This reverts commit 7d10217c2b6112f3240343d77c020fc2f5dd6f3e.
---
 .../common/suites/copy_to_space.ts                     | 10 ++--------
 .../spaces_api_integration/common/suites/delete.ts     |  5 +++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
index 7383bb3409f1a6..00ab75702e90d1 100644
--- a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
@@ -87,14 +87,8 @@ export function copyToSpaceTestSuiteFactory(
       body: {
         size: 0,
         query: {
-          bool: {
-            must_not: {
-              term: {
-                // exclude spaces from the result set.
-                // we don't assert on these.
-                type: 'space',
-              },
-            },
+          terms: {
+            type: ['visualization', 'dashboard', 'index-pattern'],
           },
         },
         aggs: {
diff --git a/x-pack/test/spaces_api_integration/common/suites/delete.ts b/x-pack/test/spaces_api_integration/common/suites/delete.ts
index e3994634be1d9b..9036fcbf7a8ddc 100644
--- a/x-pack/test/spaces_api_integration/common/suites/delete.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/delete.ts
@@ -39,6 +39,11 @@ export function deleteTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
       index: '.kibana',
       body: {
         size: 0,
+        query: {
+          terms: {
+            type: ['visualization', 'dashboard', 'space', 'config', 'index-pattern'],
+          },
+        },
         aggs: {
           count: {
             terms: {

From af52b29394ab2abeffbd25f51a77f5dfe1ce0ed2 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Tue, 7 Jan 2020 12:53:54 -0700
Subject: [PATCH 35/96] sort renovate packages in config

---
 renovate.json5             | 950 ++++++++++++++++++-------------------
 src/dev/renovate/config.ts |   2 +-
 2 files changed, 476 insertions(+), 476 deletions(-)

diff --git a/renovate.json5 b/renovate.json5
index ecc9b3b2ceb624..f069e961c0f2be 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -46,35 +46,6 @@
       enabled: false,
     },
     packageRules: [
-      {
-        groupSlug: 'eslint',
-        groupName: 'eslint related packages',
-        packagePatterns: [
-          '(\\b|_)eslint(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'babel',
-        groupName: 'babel related packages',
-        packagePatterns: [
-          '(\\b|_)babel(\\b|_)',
-        ],
-        packageNames: [
-          'core-js',
-          '@types/core-js',
-          '@babel/preset-react',
-          '@types/babel__preset-react',
-          '@babel/preset-typescript',
-          '@types/babel__preset-typescript',
-        ],
-      },
-      {
-        groupSlug: 'jest',
-        groupName: 'jest related packages',
-        packagePatterns: [
-          '(\\b|_)jest(\\b|_)',
-        ],
-      },
       {
         groupSlug: '@elastic/charts',
         groupName: '@elastic/charts related packages',
@@ -88,31 +59,11 @@
         masterIssueApproval: false,
       },
       {
-        groupSlug: 'mocha',
-        groupName: 'mocha related packages',
-        packagePatterns: [
-          '(\\b|_)mocha(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'karma',
-        groupName: 'karma related packages',
-        packagePatterns: [
-          '(\\b|_)karma(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'gulp',
-        groupName: 'gulp related packages',
-        packagePatterns: [
-          '(\\b|_)gulp(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'grunt',
-        groupName: 'grunt related packages',
-        packagePatterns: [
-          '(\\b|_)grunt(\\b|_)',
+        groupSlug: '@reach/router',
+        groupName: '@reach/router related packages',
+        packageNames: [
+          '@reach/router',
+          '@types/reach__router',
         ],
       },
       {
@@ -122,126 +73,6 @@
           '(\\b|_)angular(\\b|_)',
         ],
       },
-      {
-        groupSlug: 'd3',
-        groupName: 'd3 related packages',
-        packagePatterns: [
-          '(\\b|_)d3(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'react',
-        groupName: 'react related packages',
-        packagePatterns: [
-          '(\\b|_)react(\\b|_)',
-          '(\\b|_)redux(\\b|_)',
-          '(\\b|_)enzyme(\\b|_)',
-        ],
-        packageNames: [
-          'ngreact',
-          '@types/ngreact',
-          'recompose',
-          '@types/recompose',
-          'prop-types',
-          '@types/prop-types',
-          'typescript-fsa-reducers',
-          '@types/typescript-fsa-reducers',
-          'reselect',
-          '@types/reselect',
-        ],
-      },
-      {
-        groupSlug: 'moment',
-        groupName: 'moment related packages',
-        packagePatterns: [
-          '(\\b|_)moment(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'graphql',
-        groupName: 'graphql related packages',
-        packagePatterns: [
-          '(\\b|_)graphql(\\b|_)',
-          '(\\b|_)apollo(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'webpack',
-        groupName: 'webpack related packages',
-        packagePatterns: [
-          '(\\b|_)webpack(\\b|_)',
-          '(\\b|_)loader(\\b|_)',
-          '(\\b|_)acorn(\\b|_)',
-          '(\\b|_)terser(\\b|_)',
-        ],
-        packageNames: [
-          'mini-css-extract-plugin',
-          '@types/mini-css-extract-plugin',
-          'chokidar',
-          '@types/chokidar',
-        ],
-      },
-      {
-        groupSlug: 'vega',
-        groupName: 'vega related packages',
-        packagePatterns: [
-          '(\\b|_)vega(\\b|_)',
-        ],
-        enabled: false,
-      },
-      {
-        groupSlug: 'language server',
-        groupName: 'language server related packages',
-        packageNames: [
-          'vscode-jsonrpc',
-          '@types/vscode-jsonrpc',
-          'vscode-languageserver',
-          '@types/vscode-languageserver',
-          'vscode-languageserver-types',
-          '@types/vscode-languageserver-types',
-        ],
-      },
-      {
-        groupSlug: 'hapi',
-        groupName: 'hapi related packages',
-        packagePatterns: [
-          '(\\b|_)hapi(\\b|_)',
-        ],
-        packageNames: [
-          'hapi',
-          '@types/hapi',
-          'joi',
-          '@types/joi',
-          'boom',
-          '@types/boom',
-          'hoek',
-          '@types/hoek',
-          'h2o2',
-          '@types/h2o2',
-          '@elastic/good',
-          '@types/elastic__good',
-          'good-squeeze',
-          '@types/good-squeeze',
-          'inert',
-          '@types/inert',
-        ],
-      },
-      {
-        groupSlug: 'dragselect',
-        groupName: 'dragselect related packages',
-        packageNames: [
-          'dragselect',
-          '@types/dragselect',
-        ],
-        labels: [
-          'release_note:skip',
-          'Team:Operations',
-          'renovate',
-          'v8.0.0',
-          'v7.6.0',
-          ':ml',
-        ],
-      },
       {
         groupSlug: 'api-documenter',
         groupName: 'api-documenter related packages',
@@ -254,47 +85,34 @@
         enabled: false,
       },
       {
-        groupSlug: 'jsts',
-        groupName: 'jsts related packages',
+        groupSlug: 'archiver',
+        groupName: 'archiver related packages',
         packageNames: [
-          'jsts',
-          '@types/jsts',
-        ],
-        allowedVersions: '^1.6.2',
-      },
-      {
-        groupSlug: 'storybook',
-        groupName: 'storybook related packages',
-        packagePatterns: [
-          '(\\b|_)storybook(\\b|_)',
+          'archiver',
+          '@types/archiver',
         ],
       },
       {
-        groupSlug: 'typescript',
-        groupName: 'typescript related packages',
+        groupSlug: 'babel',
+        groupName: 'babel related packages',
         packagePatterns: [
-          '(\\b|_)ts(\\b|_)',
-          '(\\b|_)typescript(\\b|_)',
+          '(\\b|_)babel(\\b|_)',
         ],
         packageNames: [
-          'tslib',
-          '@types/tslib',
-        ],
-      },
-      {
-        groupSlug: 'json-stable-stringify',
-        groupName: 'json-stable-stringify related packages',
-        packageNames: [
-          'json-stable-stringify',
-          '@types/json-stable-stringify',
+          'core-js',
+          '@types/core-js',
+          '@babel/preset-react',
+          '@types/babel__preset-react',
+          '@babel/preset-typescript',
+          '@types/babel__preset-typescript',
         ],
       },
       {
-        groupSlug: 'lodash.clonedeep',
-        groupName: 'lodash.clonedeep related packages',
+        groupSlug: 'base64-js',
+        groupName: 'base64-js related packages',
         packageNames: [
-          'lodash.clonedeep',
-          '@types/lodash.clonedeep',
+          'base64-js',
+          '@types/base64-js',
         ],
       },
       {
@@ -321,6 +139,14 @@
           '@types/cheerio',
         ],
       },
+      {
+        groupSlug: 'chroma-js',
+        groupName: 'chroma-js related packages',
+        packageNames: [
+          'chroma-js',
+          '@types/chroma-js',
+        ],
+      },
       {
         groupSlug: 'chromedriver',
         groupName: 'chromedriver related packages',
@@ -338,403 +164,441 @@
         ],
       },
       {
-        groupSlug: 'dedent',
-        groupName: 'dedent related packages',
+        groupSlug: 'cmd-shim',
+        groupName: 'cmd-shim related packages',
         packageNames: [
-          'dedent',
-          '@types/dedent',
+          'cmd-shim',
+          '@types/cmd-shim',
         ],
       },
       {
-        groupSlug: 'delete-empty',
-        groupName: 'delete-empty related packages',
+        groupSlug: 'color',
+        groupName: 'color related packages',
         packageNames: [
-          'delete-empty',
-          '@types/delete-empty',
+          'color',
+          '@types/color',
         ],
       },
       {
-        groupSlug: 'elasticsearch',
-        groupName: 'elasticsearch related packages',
+        groupSlug: 'cpy',
+        groupName: 'cpy related packages',
         packageNames: [
-          'elasticsearch',
-          '@types/elasticsearch',
+          'cpy',
+          '@types/cpy',
         ],
       },
       {
-        groupSlug: 'fetch-mock',
-        groupName: 'fetch-mock related packages',
+        groupSlug: 'cytoscape',
+        groupName: 'cytoscape related packages',
         packageNames: [
-          'fetch-mock',
-          '@types/fetch-mock',
+          'cytoscape',
+          '@types/cytoscape',
         ],
       },
       {
-        groupSlug: 'getopts',
-        groupName: 'getopts related packages',
-        packageNames: [
-          'getopts',
-          '@types/getopts',
+        groupSlug: 'd3',
+        groupName: 'd3 related packages',
+        packagePatterns: [
+          '(\\b|_)d3(\\b|_)',
         ],
       },
       {
-        groupSlug: 'glob',
-        groupName: 'glob related packages',
+        groupSlug: 'dedent',
+        groupName: 'dedent related packages',
         packageNames: [
-          'glob',
-          '@types/glob',
+          'dedent',
+          '@types/dedent',
         ],
       },
       {
-        groupSlug: 'globby',
-        groupName: 'globby related packages',
+        groupSlug: 'delete-empty',
+        groupName: 'delete-empty related packages',
         packageNames: [
-          'globby',
-          '@types/globby',
+          'delete-empty',
+          '@types/delete-empty',
         ],
       },
       {
-        groupSlug: 'has-ansi',
-        groupName: 'has-ansi related packages',
+        groupSlug: 'dragselect',
+        groupName: 'dragselect related packages',
         packageNames: [
-          'has-ansi',
-          '@types/has-ansi',
+          'dragselect',
+          '@types/dragselect',
+        ],
+        labels: [
+          'release_note:skip',
+          'Team:Operations',
+          'renovate',
+          'v8.0.0',
+          'v7.6.0',
+          ':ml',
         ],
       },
       {
-        groupSlug: 'history',
-        groupName: 'history related packages',
+        groupSlug: 'elasticsearch',
+        groupName: 'elasticsearch related packages',
         packageNames: [
-          'history',
-          '@types/history',
+          'elasticsearch',
+          '@types/elasticsearch',
         ],
       },
       {
-        groupSlug: 'jquery',
-        groupName: 'jquery related packages',
-        packageNames: [
-          'jquery',
-          '@types/jquery',
+        groupSlug: 'eslint',
+        groupName: 'eslint related packages',
+        packagePatterns: [
+          '(\\b|_)eslint(\\b|_)',
         ],
       },
       {
-        groupSlug: 'js-yaml',
-        groupName: 'js-yaml related packages',
+        groupSlug: 'fancy-log',
+        groupName: 'fancy-log related packages',
         packageNames: [
-          'js-yaml',
-          '@types/js-yaml',
+          'fancy-log',
+          '@types/fancy-log',
         ],
       },
       {
-        groupSlug: 'json5',
-        groupName: 'json5 related packages',
+        groupSlug: 'fetch-mock',
+        groupName: 'fetch-mock related packages',
         packageNames: [
-          'json5',
-          '@types/json5',
+          'fetch-mock',
+          '@types/fetch-mock',
         ],
       },
       {
-        groupSlug: 'license-checker',
-        groupName: 'license-checker related packages',
+        groupSlug: 'file-saver',
+        groupName: 'file-saver related packages',
         packageNames: [
-          'license-checker',
-          '@types/license-checker',
+          'file-saver',
+          '@types/file-saver',
         ],
       },
       {
-        groupSlug: 'listr',
-        groupName: 'listr related packages',
+        groupSlug: 'getopts',
+        groupName: 'getopts related packages',
         packageNames: [
-          'listr',
-          '@types/listr',
+          'getopts',
+          '@types/getopts',
         ],
       },
       {
-        groupSlug: 'lodash',
-        groupName: 'lodash related packages',
+        groupSlug: 'getos',
+        groupName: 'getos related packages',
         packageNames: [
-          'lodash',
-          '@types/lodash',
+          'getos',
+          '@types/getos',
         ],
       },
       {
-        groupSlug: 'lru-cache',
-        groupName: 'lru-cache related packages',
+        groupSlug: 'git-url-parse',
+        groupName: 'git-url-parse related packages',
         packageNames: [
-          'lru-cache',
-          '@types/lru-cache',
+          'git-url-parse',
+          '@types/git-url-parse',
         ],
       },
       {
-        groupSlug: 'markdown-it',
-        groupName: 'markdown-it related packages',
+        groupSlug: 'glob',
+        groupName: 'glob related packages',
         packageNames: [
-          'markdown-it',
-          '@types/markdown-it',
+          'glob',
+          '@types/glob',
         ],
       },
       {
-        groupSlug: 'minimatch',
-        groupName: 'minimatch related packages',
+        groupSlug: 'globby',
+        groupName: 'globby related packages',
         packageNames: [
-          'minimatch',
-          '@types/minimatch',
+          'globby',
+          '@types/globby',
         ],
       },
       {
-        groupSlug: 'mustache',
-        groupName: 'mustache related packages',
-        packageNames: [
-          'mustache',
-          '@types/mustache',
+        groupSlug: 'graphql',
+        groupName: 'graphql related packages',
+        packagePatterns: [
+          '(\\b|_)graphql(\\b|_)',
+          '(\\b|_)apollo(\\b|_)',
         ],
       },
       {
-        groupSlug: 'node',
-        groupName: 'node related packages',
-        packageNames: [
-          'node',
-          '@types/node',
+        groupSlug: 'grunt',
+        groupName: 'grunt related packages',
+        packagePatterns: [
+          '(\\b|_)grunt(\\b|_)',
         ],
       },
       {
-        groupSlug: 'opn',
-        groupName: 'opn related packages',
+        groupSlug: 'gulp',
+        groupName: 'gulp related packages',
+        packagePatterns: [
+          '(\\b|_)gulp(\\b|_)',
+        ],
+      },
+      {
+        groupSlug: 'hapi',
+        groupName: 'hapi related packages',
+        packagePatterns: [
+          '(\\b|_)hapi(\\b|_)',
+        ],
         packageNames: [
-          'opn',
-          '@types/opn',
+          'hapi',
+          '@types/hapi',
+          'joi',
+          '@types/joi',
+          'boom',
+          '@types/boom',
+          'hoek',
+          '@types/hoek',
+          'h2o2',
+          '@types/h2o2',
+          '@elastic/good',
+          '@types/elastic__good',
+          'good-squeeze',
+          '@types/good-squeeze',
+          'inert',
+          '@types/inert',
         ],
       },
       {
-        groupSlug: 'pngjs',
-        groupName: 'pngjs related packages',
+        groupSlug: 'has-ansi',
+        groupName: 'has-ansi related packages',
         packageNames: [
-          'pngjs',
-          '@types/pngjs',
+          'has-ansi',
+          '@types/has-ansi',
         ],
       },
       {
-        groupSlug: 'podium',
-        groupName: 'podium related packages',
+        groupSlug: 'history',
+        groupName: 'history related packages',
         packageNames: [
-          'podium',
-          '@types/podium',
+          'history',
+          '@types/history',
         ],
       },
       {
-        groupSlug: '@reach/router',
-        groupName: '@reach/router related packages',
+        groupSlug: 'indent-string',
+        groupName: 'indent-string related packages',
         packageNames: [
-          '@reach/router',
-          '@types/reach__router',
+          'indent-string',
+          '@types/indent-string',
         ],
       },
       {
-        groupSlug: 'request',
-        groupName: 'request related packages',
+        groupSlug: 'intl-relativeformat',
+        groupName: 'intl-relativeformat related packages',
         packageNames: [
-          'request',
-          '@types/request',
+          'intl-relativeformat',
+          '@types/intl-relativeformat',
         ],
       },
       {
-        groupSlug: 'selenium-webdriver',
-        groupName: 'selenium-webdriver related packages',
-        packageNames: [
-          'selenium-webdriver',
-          '@types/selenium-webdriver',
+        groupSlug: 'jest',
+        groupName: 'jest related packages',
+        packagePatterns: [
+          '(\\b|_)jest(\\b|_)',
         ],
       },
       {
-        groupSlug: 'semver',
-        groupName: 'semver related packages',
+        groupSlug: 'jquery',
+        groupName: 'jquery related packages',
         packageNames: [
-          'semver',
-          '@types/semver',
+          'jquery',
+          '@types/jquery',
         ],
       },
       {
-        groupSlug: 'sinon',
-        groupName: 'sinon related packages',
+        groupSlug: 'js-yaml',
+        groupName: 'js-yaml related packages',
         packageNames: [
-          'sinon',
-          '@types/sinon',
+          'js-yaml',
+          '@types/js-yaml',
         ],
       },
       {
-        groupSlug: 'strip-ansi',
-        groupName: 'strip-ansi related packages',
+        groupSlug: 'jsdom',
+        groupName: 'jsdom related packages',
         packageNames: [
-          'strip-ansi',
-          '@types/strip-ansi',
+          'jsdom',
+          '@types/jsdom',
         ],
       },
       {
-        groupSlug: 'styled-components',
-        groupName: 'styled-components related packages',
+        groupSlug: 'json-stable-stringify',
+        groupName: 'json-stable-stringify related packages',
         packageNames: [
-          'styled-components',
-          '@types/styled-components',
+          'json-stable-stringify',
+          '@types/json-stable-stringify',
         ],
       },
       {
-        groupSlug: 'supertest',
-        groupName: 'supertest related packages',
+        groupSlug: 'json5',
+        groupName: 'json5 related packages',
         packageNames: [
-          'supertest',
-          '@types/supertest',
+          'json5',
+          '@types/json5',
         ],
       },
       {
-        groupSlug: 'supertest-as-promised',
-        groupName: 'supertest-as-promised related packages',
+        groupSlug: 'jsonwebtoken',
+        groupName: 'jsonwebtoken related packages',
         packageNames: [
-          'supertest-as-promised',
-          '@types/supertest-as-promised',
+          'jsonwebtoken',
+          '@types/jsonwebtoken',
         ],
       },
       {
-        groupSlug: 'type-detect',
-        groupName: 'type-detect related packages',
+        groupSlug: 'jsts',
+        groupName: 'jsts related packages',
         packageNames: [
-          'type-detect',
-          '@types/type-detect',
+          'jsts',
+          '@types/jsts',
         ],
+        allowedVersions: '^1.6.2',
       },
       {
-        groupSlug: 'uuid',
-        groupName: 'uuid related packages',
-        packageNames: [
-          'uuid',
-          '@types/uuid',
+        groupSlug: 'karma',
+        groupName: 'karma related packages',
+        packagePatterns: [
+          '(\\b|_)karma(\\b|_)',
         ],
       },
       {
-        groupSlug: 'vinyl-fs',
-        groupName: 'vinyl-fs related packages',
+        groupSlug: 'language server',
+        groupName: 'language server related packages',
         packageNames: [
-          'vinyl-fs',
-          '@types/vinyl-fs',
+          'vscode-jsonrpc',
+          '@types/vscode-jsonrpc',
+          'vscode-languageserver',
+          '@types/vscode-languageserver',
+          'vscode-languageserver-types',
+          '@types/vscode-languageserver-types',
         ],
       },
       {
-        groupSlug: 'zen-observable',
-        groupName: 'zen-observable related packages',
+        groupSlug: 'license-checker',
+        groupName: 'license-checker related packages',
         packageNames: [
-          'zen-observable',
-          '@types/zen-observable',
+          'license-checker',
+          '@types/license-checker',
         ],
       },
       {
-        groupSlug: 'archiver',
-        groupName: 'archiver related packages',
+        groupSlug: 'listr',
+        groupName: 'listr related packages',
         packageNames: [
-          'archiver',
-          '@types/archiver',
+          'listr',
+          '@types/listr',
         ],
       },
       {
-        groupSlug: 'base64-js',
-        groupName: 'base64-js related packages',
+        groupSlug: 'lodash',
+        groupName: 'lodash related packages',
         packageNames: [
-          'base64-js',
-          '@types/base64-js',
+          'lodash',
+          '@types/lodash',
         ],
       },
       {
-        groupSlug: 'chroma-js',
-        groupName: 'chroma-js related packages',
+        groupSlug: 'lodash.clonedeep',
+        groupName: 'lodash.clonedeep related packages',
         packageNames: [
-          'chroma-js',
-          '@types/chroma-js',
+          'lodash.clonedeep',
+          '@types/lodash.clonedeep',
         ],
       },
       {
-        groupSlug: 'color',
-        groupName: 'color related packages',
+        groupSlug: 'lodash.clonedeepwith',
+        groupName: 'lodash.clonedeepwith related packages',
         packageNames: [
-          'color',
-          '@types/color',
+          'lodash.clonedeepwith',
+          '@types/lodash.clonedeepwith',
         ],
       },
       {
-        groupSlug: 'cytoscape',
-        groupName: 'cytoscape related packages',
+        groupSlug: 'log-symbols',
+        groupName: 'log-symbols related packages',
         packageNames: [
-          'cytoscape',
-          '@types/cytoscape',
+          'log-symbols',
+          '@types/log-symbols',
         ],
       },
       {
-        groupSlug: 'fancy-log',
-        groupName: 'fancy-log related packages',
+        groupSlug: 'lru-cache',
+        groupName: 'lru-cache related packages',
         packageNames: [
-          'fancy-log',
-          '@types/fancy-log',
+          'lru-cache',
+          '@types/lru-cache',
         ],
       },
       {
-        groupSlug: 'file-saver',
-        groupName: 'file-saver related packages',
+        groupSlug: 'mapbox-gl',
+        groupName: 'mapbox-gl related packages',
         packageNames: [
-          'file-saver',
-          '@types/file-saver',
+          'mapbox-gl',
+          '@types/mapbox-gl',
         ],
       },
       {
-        groupSlug: 'getos',
-        groupName: 'getos related packages',
+        groupSlug: 'markdown-it',
+        groupName: 'markdown-it related packages',
         packageNames: [
-          'getos',
-          '@types/getos',
+          'markdown-it',
+          '@types/markdown-it',
         ],
       },
       {
-        groupSlug: 'git-url-parse',
-        groupName: 'git-url-parse related packages',
+        groupSlug: 'memoize-one',
+        groupName: 'memoize-one related packages',
         packageNames: [
-          'git-url-parse',
-          '@types/git-url-parse',
+          'memoize-one',
+          '@types/memoize-one',
         ],
       },
       {
-        groupSlug: 'jsdom',
-        groupName: 'jsdom related packages',
+        groupSlug: 'mime',
+        groupName: 'mime related packages',
         packageNames: [
-          'jsdom',
-          '@types/jsdom',
+          'mime',
+          '@types/mime',
         ],
       },
       {
-        groupSlug: 'jsonwebtoken',
-        groupName: 'jsonwebtoken related packages',
+        groupSlug: 'minimatch',
+        groupName: 'minimatch related packages',
         packageNames: [
-          'jsonwebtoken',
-          '@types/jsonwebtoken',
+          'minimatch',
+          '@types/minimatch',
         ],
       },
       {
-        groupSlug: 'mapbox-gl',
-        groupName: 'mapbox-gl related packages',
-        packageNames: [
-          'mapbox-gl',
-          '@types/mapbox-gl',
+        groupSlug: 'mocha',
+        groupName: 'mocha related packages',
+        packagePatterns: [
+          '(\\b|_)mocha(\\b|_)',
         ],
       },
       {
-        groupSlug: 'memoize-one',
-        groupName: 'memoize-one related packages',
+        groupSlug: 'moment',
+        groupName: 'moment related packages',
+        packagePatterns: [
+          '(\\b|_)moment(\\b|_)',
+        ],
+      },
+      {
+        groupSlug: 'mustache',
+        groupName: 'mustache related packages',
         packageNames: [
-          'memoize-one',
-          '@types/memoize-one',
+          'mustache',
+          '@types/mustache',
         ],
       },
       {
-        groupSlug: 'mime',
-        groupName: 'mime related packages',
+        groupSlug: 'ncp',
+        groupName: 'ncp related packages',
         packageNames: [
-          'mime',
-          '@types/mime',
+          'ncp',
+          '@types/ncp',
         ],
       },
       {
@@ -745,6 +609,14 @@
           '@types/nock',
         ],
       },
+      {
+        groupSlug: 'node',
+        groupName: 'node related packages',
+        packageNames: [
+          'node',
+          '@types/node',
+        ],
+      },
       {
         groupSlug: 'node-fetch',
         groupName: 'node-fetch related packages',
@@ -769,6 +641,22 @@
           '@types/object-hash',
         ],
       },
+      {
+        groupSlug: 'opn',
+        groupName: 'opn related packages',
+        packageNames: [
+          'opn',
+          '@types/opn',
+        ],
+      },
+      {
+        groupSlug: 'ora',
+        groupName: 'ora related packages',
+        packageNames: [
+          'ora',
+          '@types/ora',
+        ],
+      },
       {
         groupSlug: 'papaparse',
         groupName: 'papaparse related packages',
@@ -777,6 +665,30 @@
           '@types/papaparse',
         ],
       },
+      {
+        groupSlug: 'parse-link-header',
+        groupName: 'parse-link-header related packages',
+        packageNames: [
+          'parse-link-header',
+          '@types/parse-link-header',
+        ],
+      },
+      {
+        groupSlug: 'pngjs',
+        groupName: 'pngjs related packages',
+        packageNames: [
+          'pngjs',
+          '@types/pngjs',
+        ],
+      },
+      {
+        groupSlug: 'podium',
+        groupName: 'podium related packages',
+        packageNames: [
+          'podium',
+          '@types/podium',
+        ],
+      },
       {
         groupSlug: 'proper-lockfile',
         groupName: 'proper-lockfile related packages',
@@ -793,6 +705,35 @@
           '@types/puppeteer',
         ],
       },
+      {
+        groupSlug: 'react',
+        groupName: 'react related packages',
+        packagePatterns: [
+          '(\\b|_)react(\\b|_)',
+          '(\\b|_)redux(\\b|_)',
+          '(\\b|_)enzyme(\\b|_)',
+        ],
+        packageNames: [
+          'ngreact',
+          '@types/ngreact',
+          'recompose',
+          '@types/recompose',
+          'prop-types',
+          '@types/prop-types',
+          'typescript-fsa-reducers',
+          '@types/typescript-fsa-reducers',
+          'reselect',
+          '@types/reselect',
+        ],
+      },
+      {
+        groupSlug: 'read-pkg',
+        groupName: 'read-pkg related packages',
+        packageNames: [
+          'read-pkg',
+          '@types/read-pkg',
+        ],
+      },
       {
         groupSlug: 'reduce-reducers',
         groupName: 'reduce-reducers related packages',
@@ -802,123 +743,166 @@
         ],
       },
       {
-        groupSlug: 'tar-fs',
-        groupName: 'tar-fs related packages',
+        groupSlug: 'request',
+        groupName: 'request related packages',
         packageNames: [
-          'tar-fs',
-          '@types/tar-fs',
+          'request',
+          '@types/request',
         ],
       },
       {
-        groupSlug: 'tinycolor2',
-        groupName: 'tinycolor2 related packages',
+        groupSlug: 'selenium-webdriver',
+        groupName: 'selenium-webdriver related packages',
         packageNames: [
-          'tinycolor2',
-          '@types/tinycolor2',
+          'selenium-webdriver',
+          '@types/selenium-webdriver',
         ],
       },
       {
-        groupSlug: 'xml-crypto',
-        groupName: 'xml-crypto related packages',
+        groupSlug: 'semver',
+        groupName: 'semver related packages',
         packageNames: [
-          'xml-crypto',
-          '@types/xml-crypto',
+          'semver',
+          '@types/semver',
         ],
       },
       {
-        groupSlug: 'xml2js',
-        groupName: 'xml2js related packages',
+        groupSlug: 'sinon',
+        groupName: 'sinon related packages',
         packageNames: [
-          'xml2js',
-          '@types/xml2js',
+          'sinon',
+          '@types/sinon',
         ],
       },
       {
-        groupSlug: 'intl-relativeformat',
-        groupName: 'intl-relativeformat related packages',
+        groupSlug: 'storybook',
+        groupName: 'storybook related packages',
+        packagePatterns: [
+          '(\\b|_)storybook(\\b|_)',
+        ],
+      },
+      {
+        groupSlug: 'strip-ansi',
+        groupName: 'strip-ansi related packages',
         packageNames: [
-          'intl-relativeformat',
-          '@types/intl-relativeformat',
+          'strip-ansi',
+          '@types/strip-ansi',
         ],
       },
       {
-        groupSlug: 'cmd-shim',
-        groupName: 'cmd-shim related packages',
+        groupSlug: 'strong-log-transformer',
+        groupName: 'strong-log-transformer related packages',
         packageNames: [
-          'cmd-shim',
-          '@types/cmd-shim',
+          'strong-log-transformer',
+          '@types/strong-log-transformer',
         ],
       },
       {
-        groupSlug: 'cpy',
-        groupName: 'cpy related packages',
+        groupSlug: 'styled-components',
+        groupName: 'styled-components related packages',
         packageNames: [
-          'cpy',
-          '@types/cpy',
+          'styled-components',
+          '@types/styled-components',
         ],
       },
       {
-        groupSlug: 'indent-string',
-        groupName: 'indent-string related packages',
+        groupSlug: 'supertest',
+        groupName: 'supertest related packages',
         packageNames: [
-          'indent-string',
-          '@types/indent-string',
+          'supertest',
+          '@types/supertest',
         ],
       },
       {
-        groupSlug: 'lodash.clonedeepwith',
-        groupName: 'lodash.clonedeepwith related packages',
+        groupSlug: 'supertest-as-promised',
+        groupName: 'supertest-as-promised related packages',
         packageNames: [
-          'lodash.clonedeepwith',
-          '@types/lodash.clonedeepwith',
+          'supertest-as-promised',
+          '@types/supertest-as-promised',
         ],
       },
       {
-        groupSlug: 'log-symbols',
-        groupName: 'log-symbols related packages',
+        groupSlug: 'tar-fs',
+        groupName: 'tar-fs related packages',
         packageNames: [
-          'log-symbols',
-          '@types/log-symbols',
+          'tar-fs',
+          '@types/tar-fs',
         ],
       },
       {
-        groupSlug: 'ncp',
-        groupName: 'ncp related packages',
+        groupSlug: 'tempy',
+        groupName: 'tempy related packages',
         packageNames: [
-          'ncp',
-          '@types/ncp',
+          'tempy',
+          '@types/tempy',
         ],
       },
       {
-        groupSlug: 'ora',
-        groupName: 'ora related packages',
+        groupSlug: 'tinycolor2',
+        groupName: 'tinycolor2 related packages',
         packageNames: [
-          'ora',
-          '@types/ora',
+          'tinycolor2',
+          '@types/tinycolor2',
         ],
       },
       {
-        groupSlug: 'read-pkg',
-        groupName: 'read-pkg related packages',
+        groupSlug: 'type-detect',
+        groupName: 'type-detect related packages',
         packageNames: [
-          'read-pkg',
-          '@types/read-pkg',
+          'type-detect',
+          '@types/type-detect',
         ],
       },
       {
-        groupSlug: 'strong-log-transformer',
-        groupName: 'strong-log-transformer related packages',
+        groupSlug: 'typescript',
+        groupName: 'typescript related packages',
+        packagePatterns: [
+          '(\\b|_)ts(\\b|_)',
+          '(\\b|_)typescript(\\b|_)',
+        ],
         packageNames: [
-          'strong-log-transformer',
-          '@types/strong-log-transformer',
+          'tslib',
+          '@types/tslib',
         ],
       },
       {
-        groupSlug: 'tempy',
-        groupName: 'tempy related packages',
+        groupSlug: 'uuid',
+        groupName: 'uuid related packages',
         packageNames: [
-          'tempy',
-          '@types/tempy',
+          'uuid',
+          '@types/uuid',
+        ],
+      },
+      {
+        groupSlug: 'vega',
+        groupName: 'vega related packages',
+        packagePatterns: [
+          '(\\b|_)vega(\\b|_)',
+        ],
+        enabled: false,
+      },
+      {
+        groupSlug: 'vinyl-fs',
+        groupName: 'vinyl-fs related packages',
+        packageNames: [
+          'vinyl-fs',
+          '@types/vinyl-fs',
+        ],
+      },
+      {
+        groupSlug: 'webpack',
+        groupName: 'webpack related packages',
+        packagePatterns: [
+          '(\\b|_)webpack(\\b|_)',
+          '(\\b|_)loader(\\b|_)',
+          '(\\b|_)acorn(\\b|_)',
+          '(\\b|_)terser(\\b|_)',
+        ],
+        packageNames: [
+          'mini-css-extract-plugin',
+          '@types/mini-css-extract-plugin',
+          'chokidar',
+          '@types/chokidar',
         ],
       },
       {
@@ -938,11 +922,27 @@
         ],
       },
       {
-        groupSlug: 'parse-link-header',
-        groupName: 'parse-link-header related packages',
+        groupSlug: 'xml-crypto',
+        groupName: 'xml-crypto related packages',
         packageNames: [
-          'parse-link-header',
-          '@types/parse-link-header',
+          'xml-crypto',
+          '@types/xml-crypto',
+        ],
+      },
+      {
+        groupSlug: 'xml2js',
+        groupName: 'xml2js related packages',
+        packageNames: [
+          'xml2js',
+          '@types/xml2js',
+        ],
+      },
+      {
+        groupSlug: 'zen-observable',
+        groupName: 'zen-observable related packages',
+        packageNames: [
+          'zen-observable',
+          '@types/zen-observable',
         ],
       },
       {
diff --git a/src/dev/renovate/config.ts b/src/dev/renovate/config.ts
index 61feb4e47f0220..c7056ba69449ab 100644
--- a/src/dev/renovate/config.ts
+++ b/src/dev/renovate/config.ts
@@ -95,7 +95,7 @@ export const RENOVATE_CONFIG = {
         allowedVersions: group.allowedVersions || undefined,
         reviewers: group.reviewers || undefined,
         masterIssueApproval: group.autoOpenPr ? false : undefined,
-      })),
+      })).sort((a, b) => a.groupName.localeCompare(b.groupName)),
 
       // internal/local packages
       {

From ae1fac4fe532baad4d8be08a151cc32a7f781da3 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Tue, 7 Jan 2020 13:07:24 -0800
Subject: [PATCH 36/96] [DOCS] Updates ML links (#53613)

---
 docs/limitations.asciidoc                                 | 2 +-
 .../__snapshots__/rule_editor_flyout.test.js.snap         | 6 +++---
 .../components/rule_editor/rule_editor_flyout.js          | 2 +-
 .../__snapshots__/validate_job_view.test.js.snap          | 4 ++--
 .../components/validate_job/validate_job_view.js          | 2 +-
 .../components/calendars/description.tsx                  | 2 +-
 .../components/custom_urls/description.tsx                | 2 +-
 .../components/jobs_list_page/jobs_list_page.tsx          | 4 ++--
 .../calendars/list/__snapshots__/header.test.js.snap      | 2 +-
 .../public/application/settings/calendars/list/header.js  | 2 +-
 .../filter_lists/list/__snapshots__/header.test.js.snap   | 2 +-
 .../application/settings/filter_lists/list/header.js      | 2 +-
 .../plugins/ml/server/models/job_validation/messages.js   | 8 ++++----
 x-pack/legacy/plugins/transform/public/shim.ts            | 2 ++
 14 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/docs/limitations.asciidoc b/docs/limitations.asciidoc
index 9bcba3b65d6605..818cc766bf6a93 100644
--- a/docs/limitations.asciidoc
+++ b/docs/limitations.asciidoc
@@ -19,4 +19,4 @@ These {stack} features also have limitations that affect {kib}:
 
 include::limitations/nested-objects.asciidoc[]
 
-include::limitations/export-data.asciidoc[]
+include::limitations/export-data.asciidoc[]
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
index 4486899efb0018..3b14025e9cb7be 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
@@ -101,7 +101,7 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule
             values={
               Object {
                 "learnMoreLink": <ForwardRef
-                  href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-rules.html"
+                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
                   target="_blank"
                 >
                   <FormattedMessage
@@ -365,7 +365,7 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`]
             values={
               Object {
                 "learnMoreLink": <ForwardRef
-                  href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-rules.html"
+                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
                   target="_blank"
                 >
                   <FormattedMessage
@@ -615,7 +615,7 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions
             values={
               Object {
                 "learnMoreLink": <ForwardRef
-                  href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-rules.html"
+                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
                   target="_blank"
                 >
                   <FormattedMessage
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
index 232419cc7dca24..1f66cf95553b99 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
@@ -56,7 +56,7 @@ import { metadata } from 'ui/metadata';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
 
 // metadata.branch corresponds to the version used in documentation links.
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-rules.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-rules.html`;
 
 export const RuleEditorFlyout = injectI18n(
   class RuleEditorFlyout extends Component {
diff --git a/x-pack/legacy/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap b/x-pack/legacy/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
index 29d10eb99ff4ea..fb6b9c7c9db66c 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
@@ -60,7 +60,7 @@ exports[`ValidateJob renders button and modal with a message 1`] = `
           values={
             Object {
               "mlJobTipsLink": <ForwardRef
-                href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/create-jobs.html#job-tips"
+                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/create-jobs.html#job-tips"
                 target="_blank"
               >
                 <FormattedMessage
@@ -150,7 +150,7 @@ exports[`ValidateJob renders the button and modal with a success message 1`] = `
           values={
             Object {
               "mlJobTipsLink": <ForwardRef
-                href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/create-jobs.html#job-tips"
+                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/create-jobs.html#job-tips"
                 target="_blank"
               >
                 <FormattedMessage
diff --git a/x-pack/legacy/plugins/ml/public/application/components/validate_job/validate_job_view.js b/x-pack/legacy/plugins/ml/public/application/components/validate_job/validate_job_view.js
index c1296375b5a333..9b92265c4034bc 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/validate_job/validate_job_view.js
+++ b/x-pack/legacy/plugins/ml/public/application/components/validate_job/validate_job_view.js
@@ -27,7 +27,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { metadata } from 'ui/metadata';
 // metadata.branch corresponds to the version used in documentation links.
-const jobTipsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/create-jobs.html#job-tips`;
+const jobTipsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/create-jobs.html#job-tips`;
 
 // don't use something like plugins/ml/../common
 // because it won't work with the jest tests
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/calendars/description.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/calendars/description.tsx
index e11fb615efd708..828c91052b30b9 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/calendars/description.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/calendars/description.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiDescribedFormGroup, EuiFormRow, EuiLink } from '@elastic/eui';
 import { metadata } from 'ui/metadata';
 
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-calendars.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-calendars.html`;
 
 export const Description: FC = memo(({ children }) => {
   const title = i18n.translate(
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/description.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/description.tsx
index 89cd5c252c3d62..566bd313dbc6e6 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/description.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/description.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiDescribedFormGroup, EuiFormRow, EuiLink } from '@elastic/eui';
 import { metadata } from 'ui/metadata';
 
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-configuring-url.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-configuring-url.html`;
 
 export const Description: FC = memo(({ children }) => {
   const title = i18n.translate(
diff --git a/x-pack/legacy/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx b/x-pack/legacy/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
index a19a27d00e9b04..1591dbcbad6bfa 100644
--- a/x-pack/legacy/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
@@ -70,8 +70,8 @@ export const JobsListPage: FC<Props> = ({ isMlEnabledInSpace }) => {
   const [currentTabId, setCurrentTabId] = useState(tabs[0].id);
 
   // metadata.branch corresponds to the version used in documentation links.
-  const anomalyDetectionJobsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-jobs.html`;
-  const anomalyJobsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-dfanalytics.html`;
+  const anomalyDetectionJobsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-jobs.html`;
+  const anomalyJobsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-dfanalytics.html`;
 
   const anomalyDetectionDocsLabel = i18n.translate(
     'xpack.ml.management.jobsList.anomalyDetectionDocsLabel',
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
index 2d32650a4b788b..0b39841ed61e48 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
@@ -89,7 +89,7 @@ exports[`CalendarListsHeader renders header 1`] = `
             Object {
               "br": <br />,
               "learnMoreLink": <ForwardRef
-                href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-calendars.html"
+                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-calendars.html"
                 target="_blank"
               >
                 <FormattedMessage
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/header.js b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/header.js
index 9f1229d28f0aa1..58f0ac268fdb29 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/header.js
+++ b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/header.js
@@ -26,7 +26,7 @@ import {
 import { metadata } from 'ui/metadata';
 
 // metadata.branch corresponds to the version used in documentation links.
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-calendars.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-calendars.html`;
 
 export function CalendarsListHeader({ totalCount, refreshCalendars }) {
   return (
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/header.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/header.test.js.snap
index 7e658fde9f1cf3..77936b16667b13 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/header.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/header.test.js.snap
@@ -90,7 +90,7 @@ You can use the same filter list in multiple jobs.{br}{learnMoreLink}"
             Object {
               "br": <br />,
               "learnMoreLink": <ForwardRef
-                href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-rules.html"
+                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
                 target="_blank"
               >
                 <FormattedMessage
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/header.js b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/header.js
index aed643165bd64c..ae0c2ef4338ec9 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/header.js
+++ b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/header.js
@@ -26,7 +26,7 @@ import {
 import { metadata } from 'ui/metadata';
 
 // metadata.branch corresponds to the version used in documentation links.
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-rules.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-rules.html`;
 
 export function FilterListsHeader({ totalCount, refreshFilterLists }) {
   return (
diff --git a/x-pack/legacy/plugins/ml/server/models/job_validation/messages.js b/x-pack/legacy/plugins/ml/server/models/job_validation/messages.js
index 4cd6dbc787d280..2c0c218bf86b51 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_validation/messages.js
+++ b/x-pack/legacy/plugins/ml/server/models/job_validation/messages.js
@@ -14,7 +14,7 @@ export const getMessages = () => {
     return messages;
   }
 
-  const createJobsDocsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/{{version}}/create-jobs.html`;
+  const createJobsDocsUrl = `https://www.elastic.co/guide/en/machine-learning/{{version}}/create-jobs.html`;
 
   return (messages = {
     field_not_aggregatable: {
@@ -26,7 +26,7 @@ export const getMessages = () => {
         },
       }),
       url:
-        'https://www.elastic.co/guide/en/elastic-stack-overview/{{version}}/ml-configuring-aggregation.html',
+        'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-configuring-aggregation.html',
     },
     fields_not_aggregatable: {
       status: 'ERROR',
@@ -34,7 +34,7 @@ export const getMessages = () => {
         defaultMessage: 'One of the detector fields is not an aggregatable field.',
       }),
       url:
-        'https://www.elastic.co/guide/en/elastic-stack-overview/{{version}}/ml-configuring-aggregation.html',
+        'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-configuring-aggregation.html',
     },
     cardinality_by_field: {
       status: 'WARNING',
@@ -112,7 +112,7 @@ export const getMessages = () => {
         }
       ),
       url:
-        'https://www.elastic.co/guide/en/elastic-stack-overview/{{version}}/ml-configuring-categories.html',
+        'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-configuring-categories.html',
     },
     categorization_filters_invalid: {
       status: 'ERROR',
diff --git a/x-pack/legacy/plugins/transform/public/shim.ts b/x-pack/legacy/plugins/transform/public/shim.ts
index f8edc752c9a215..d739dd2edddcc8 100644
--- a/x-pack/legacy/plugins/transform/public/shim.ts
+++ b/x-pack/legacy/plugins/transform/public/shim.ts
@@ -47,6 +47,7 @@ export interface Core extends npCore {
     esDocBasePath: string;
     esPluginDocBasePath: string;
     esStackOverviewDocBasePath: string;
+    esMLDocBasePath: string;
   };
   docTitle: {
     change: typeof docTitle.change;
@@ -93,6 +94,7 @@ export function createPublicShim(): { core: Core; plugins: Plugins } {
         esDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/`,
         esPluginDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/plugins/${DOC_LINK_VERSION}/`,
         esStackOverviewDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elastic-stack-overview/${DOC_LINK_VERSION}/`,
+        esMLDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/`,
       },
       docTitle: {
         change: docTitle.change,

From b7a534b1b1c570703b6325c2e8bf10435ab5a98f Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Tue, 7 Jan 2020 13:20:57 -0800
Subject: [PATCH 37/96] [SIEM] Implement NP Plugin Setup (#54030)

* Set up our react app in the NP way

* Defines the setup() method for our UI plugin
* Renders the app in the NP way within our setup() method
* Defines a legacy file that invokes the plugin manually

Things seem to be mostly working; the app mounts with no immediate
errors, at least.

* Move files into NP structure

Our plugin function and class are both direct children of siem/public.
The app folder contains both our React app and the function to render
it.

* Register SIEM in the feature catalogue via NP format

Unfortunately, this can't live in the plugin for now because it doesn't
get invoked when we need it. For now, it's going to live in the same
spot, and once we're a real NP plugin we can move it.

* Eliminate usage of timezoneBrowser UI setting

This seems to be redundant with dateFormat:tz except that it always
returns a real timezone, not just a preference. By wrapping that logic
in our own hook, useTimeZone, we can remove this weird usage and stick
to the standard dateFormat and dateFormat:tz.

* Clean up tests for FormattedDate components

Mocks our simpler wrapping hooks rather than the entire UI Settings
module.

* Remove remaining uses of UI Settings mocks

These remaining tests can mock settings directly, or otherwise were
misusing the settings mocks to retrieve assertion values.

* Remove unnecessary intermediate `describe` blocks

They were not adding any information to the tests.

* Remove use of kibana version in client requests

We were previously passing this version all over the place for the sake
of our framework-specific request header. The sole advantage of supplying
such a header is that the client will receive an informative error modal
in the case of a version mismatch between the client and server.

We can successfully perform these requests with the `kbn-xsrf` header
instead. Long-term, we can use core.http.fetch to perform the requests
and auto-populate the version header, but it would be nicer to abstract
those requests to the framework level rather than threading the HTTP
client throughout the application.

* Remove newly added uses of kbnVersion

These happened on master in the meantime.

* Use helper to generate test assertion

Allows us to change the implementation of the empty string without
breaking the test.

* Remove guard from date formatting component

We're always going to get back usable values from these hooks; while the
user can unset the dateFormat in their settings, we'll still get an
empty string which is effectively the same as no formatting (as
evidenced in the tests).

* Remove default from byte formatting component

If the user has deleted this default, they presumably meant to do so and
we shouldn't supersede it.

* Refactor bytes formatting to allow use in our charts

We need a formatting function to use with our charts, so this splits out
a hook from the original react component, allowing our charts to be
formatted as specified in the user's UI settings.

* Refer to our constant for APP_ID

* Explicit return values for some UI Settings hooks

This forces accidental changes to the return value to be explicit.

* Remove use of ui/chrome in request header

This is an unnecessary use: kibana works the same no matter what
contents the `kbn-xsrf` header contains (as long as it's there).

* Mock UI Settings values in our TestProvider

When using our TestProvider components, we were previously relying on
platform's UISettings mocks instead of our own, more comprehensive ones.
This worked for the most part, and when we needed real settings we would
mock the UI Settings client manually.

When we removed some app code that defaulted UI Settings values when the
client did not return a value, tests that used TestProviders but also
relied on those defaults broke. This adds that behavior back,
and obviates the need for manual calls to jest.mock except when we're a)
not using TestProviders but b) overriding the platform mocks.

Also removes some of those unneeded uses.

* Remove unused import

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../legacy/plugins/siem/common/constants.ts   |   2 -
 x-pack/legacy/plugins/siem/index.ts           |   4 +-
 .../{apps/start_app.tsx => app/app.tsx}       |   6 +-
 .../legacy/plugins/siem/public/app/index.tsx  |  20 ++
 .../legacy/plugins/siem/public/apps/index.ts  |  18 --
 .../plugins/siem/public/apps/plugin.tsx       |  59 ----
 .../plugins/siem/public/apps/template.html    |   1 -
 .../public/components/charts/areachart.tsx    |   4 +-
 .../public/components/charts/barchart.tsx     |   4 +-
 .../siem/public/components/charts/common.tsx  |   8 +-
 .../event_fields_browser.test.tsx             |   2 -
 .../events_viewer/events_viewer.test.tsx      |   2 -
 .../components/events_viewer/index.test.tsx   |   2 -
 .../components/flyout/pane/index.test.tsx     |   2 -
 .../__snapshots__/index.test.tsx.snap         |   2 +-
 .../components/formatted_bytes/index.test.tsx |  71 ++---
 .../components/formatted_bytes/index.tsx      |  17 +-
 .../__snapshots__/index.test.tsx.snap         |   4 +-
 .../components/formatted_date/index.test.tsx  | 293 +++++++++---------
 .../components/formatted_date/index.tsx       |  21 +-
 .../components/matrix_histogram/utils.ts      |   6 +-
 .../ml/anomaly/use_anomalies_table_data.ts    |  13 +-
 .../components/ml/api/anomalies_table_data.ts |  11 +-
 .../components/ml/api/get_ml_capabilities.ts  |  10 +-
 .../permissions/ml_capabilities_provider.tsx  |   5 +-
 .../siem/public/components/ml_popover/api.tsx |  49 +--
 .../ml_popover/hooks/use_siem_jobs.tsx        |   8 +-
 .../components/ml_popover/ml_popover.tsx      |   9 +-
 .../public/components/ml_popover/types.ts     |   3 -
 .../hosts/first_last_seen_host/index.test.tsx |   2 -
 .../page/network/dns_histogram/index.tsx      |   5 +-
 .../components/query_bar/index.test.tsx       |   2 -
 .../renderers/plain_column_renderer.test.tsx  |  13 +-
 .../system/generic_row_renderer.test.tsx      |   2 -
 .../containers/detection_engine/rules/api.ts  |  39 +--
 .../detection_engine/rules/persist_rule.tsx   |   5 +-
 .../detection_engine/rules/types.ts           |   6 -
 .../detection_engine/rules/use_rule.tsx       |   4 -
 .../detection_engine/rules/use_rules.tsx      |   4 -
 .../detection_engine/signals/api.ts           |  37 +--
 .../detection_engine/signals/types.ts         |   2 -
 .../signals/use_privilege_user.tsx            |   4 -
 .../detection_engine/signals/use_query.tsx    |   5 -
 .../signals/use_signal_index.tsx              |  13 +-
 .../plugins/siem/public/hooks/api/api.tsx     |   9 +-
 .../siem/public/{app.ts => hooks/index.ts}    |   2 +-
 .../siem/public/hooks/use_index_patterns.tsx  |   5 +-
 .../siem/public/hooks/use_ui_settings.ts      |  17 +
 x-pack/legacy/plugins/siem/public/index.ts    |   9 +
 x-pack/legacy/plugins/siem/public/legacy.ts   |  15 +
 .../siem/public/lib/compose/helpers.ts        |   4 +-
 .../plugins/siem/public/lib/kibana/index.ts   |   2 +-
 x-pack/legacy/plugins/siem/public/lib/lib.ts  |   1 -
 .../legacy/plugins/siem/public/mock/index.ts  |   1 -
 .../plugins/siem/public/mock/kibana_config.ts | 123 --------
 .../plugins/siem/public/mock/kibana_react.ts  |  10 +-
 .../components/signals/actions.tsx            |   7 +-
 .../components/signals/default_config.tsx     |   3 -
 .../components/signals/index.tsx              |   8 +-
 .../components/signals/types.ts               |   1 -
 .../detection_engine/rules/all/actions.tsx    |  21 +-
 .../rules/all/batch_actions.tsx               |  10 +-
 .../detection_engine/rules/all/columns.tsx    |   9 +-
 .../detection_engine/rules/all/index.tsx      |  11 +-
 .../components/import_rule_modal/index.tsx    |   5 +-
 .../components/rule_switch/index.test.tsx     |   1 -
 .../rules/components/rule_switch/index.tsx    |   8 +-
 .../pages/hosts/details/details_tabs.test.tsx |   2 -
 .../siem/public/pages/hosts/hosts.test.tsx    |   2 -
 .../pages/network/ip_details/index.test.tsx   |   2 -
 .../public/pages/network/network.test.tsx     |   2 -
 .../public/pages/overview/overview.test.tsx   |   2 -
 x-pack/legacy/plugins/siem/public/plugin.tsx  |  67 ++++
 .../plugins/siem/public/register_feature.ts   |  16 +-
 74 files changed, 431 insertions(+), 743 deletions(-)
 rename x-pack/legacy/plugins/siem/public/{apps/start_app.tsx => app/app.tsx} (96%)
 create mode 100644 x-pack/legacy/plugins/siem/public/app/index.tsx
 delete mode 100644 x-pack/legacy/plugins/siem/public/apps/index.ts
 delete mode 100644 x-pack/legacy/plugins/siem/public/apps/plugin.tsx
 delete mode 100644 x-pack/legacy/plugins/siem/public/apps/template.html
 rename x-pack/legacy/plugins/siem/public/{app.ts => hooks/index.ts} (79%)
 create mode 100644 x-pack/legacy/plugins/siem/public/hooks/use_ui_settings.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/index.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/legacy.ts
 delete mode 100644 x-pack/legacy/plugins/siem/public/mock/kibana_config.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/plugin.tsx

diff --git a/x-pack/legacy/plugins/siem/common/constants.ts b/x-pack/legacy/plugins/siem/common/constants.ts
index 4383329fea0723..5116416b527a5e 100644
--- a/x-pack/legacy/plugins/siem/common/constants.ts
+++ b/x-pack/legacy/plugins/siem/common/constants.ts
@@ -27,8 +27,6 @@ export const DEFAULT_SEARCH_AFTER_PAGE_SIZE = 100;
 export const DEFAULT_ANOMALY_SCORE = 'siem:defaultAnomalyScore';
 export const DEFAULT_MAX_TABLE_QUERY_SIZE = 10000;
 export const DEFAULT_SCALE_DATE_FORMAT = 'dateFormat:scaled';
-export const DEFAULT_KBN_VERSION = 'kbnVersion';
-export const DEFAULT_TIMEZONE_BROWSER = 'timezoneBrowser';
 export const DEFAULT_FROM = 'now-24h';
 export const DEFAULT_TO = 'now';
 export const DEFAULT_INTERVAL_PAUSE = true;
diff --git a/x-pack/legacy/plugins/siem/index.ts b/x-pack/legacy/plugins/siem/index.ts
index cf9fffc6a14558..c5038626fdfc20 100644
--- a/x-pack/legacy/plugins/siem/index.ts
+++ b/x-pack/legacy/plugins/siem/index.ts
@@ -9,7 +9,7 @@ import { resolve } from 'path';
 import { Server } from 'hapi';
 import { Root } from 'joi';
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '../../../../src/core/server';
 import { plugin } from './server';
 import { savedObjectMappings } from './server/saved_objects';
 
@@ -43,7 +43,7 @@ export const siem = (kibana: any) => {
         description: i18n.translate('xpack.siem.securityDescription', {
           defaultMessage: 'Explore your SIEM App',
         }),
-        main: 'plugins/siem/app',
+        main: 'plugins/siem/legacy',
         euiIconType: 'securityAnalyticsApp',
         title: APP_NAME,
         listed: false,
diff --git a/x-pack/legacy/plugins/siem/public/apps/start_app.tsx b/x-pack/legacy/plugins/siem/public/app/app.tsx
similarity index 96%
rename from x-pack/legacy/plugins/siem/public/apps/start_app.tsx
rename to x-pack/legacy/plugins/siem/public/app/app.tsx
index 100f10aaf2e7bb..5f9199735d8c04 100644
--- a/x-pack/legacy/plugins/siem/public/apps/start_app.tsx
+++ b/x-pack/legacy/plugins/siem/public/app/app.tsx
@@ -25,7 +25,7 @@ import { DEFAULT_DARK_MODE } from '../../common/constants';
 import { ErrorToastDispatcher } from '../components/error_toast_dispatcher';
 import { compose } from '../lib/compose/kibana_compose';
 import { AppFrontendLibs, AppApolloClient } from '../lib/lib';
-import { StartCore, StartPlugins } from './plugin';
+import { CoreStart, StartPlugins } from '../plugin';
 import { PageRouter } from '../routes';
 import { createStore } from '../store';
 import { GlobalToaster, ManageGlobalToaster } from '../components/toasters';
@@ -89,10 +89,8 @@ const StartAppComponent: FC<AppFrontendLibs> = libs => {
 
 const StartApp = memo(StartAppComponent);
 
-export const ROOT_ELEMENT_ID = 'react-siem-root';
-
 interface SiemAppComponentProps {
-  core: StartCore;
+  core: CoreStart;
   plugins: StartPlugins;
 }
 
diff --git a/x-pack/legacy/plugins/siem/public/app/index.tsx b/x-pack/legacy/plugins/siem/public/app/index.tsx
new file mode 100644
index 00000000000000..01175a98d1e44e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/app/index.tsx
@@ -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 React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+
+import { CoreStart, StartPlugins, AppMountParameters } from '../plugin';
+import { SiemApp } from './app';
+
+export const renderApp = (
+  core: CoreStart,
+  plugins: StartPlugins,
+  { element }: AppMountParameters
+) => {
+  render(<SiemApp core={core} plugins={plugins} />, element);
+  return () => unmountComponentAtNode(element);
+};
diff --git a/x-pack/legacy/plugins/siem/public/apps/index.ts b/x-pack/legacy/plugins/siem/public/apps/index.ts
deleted file mode 100644
index 0cc5c5584e1b76..00000000000000
--- a/x-pack/legacy/plugins/siem/public/apps/index.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 chrome from 'ui/chrome';
-import { npStart } from 'ui/new_platform';
-import { Plugin } from './plugin';
-
-const { data, embeddable, inspector, uiActions } = npStart.plugins;
-const startPlugins = { data, embeddable, inspector, uiActions };
-
-new Plugin(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  { opaqueId: Symbol('siem'), env: {} as any, config: { get: () => ({} as any) } },
-  chrome
-).start(npStart.core, startPlugins);
diff --git a/x-pack/legacy/plugins/siem/public/apps/plugin.tsx b/x-pack/legacy/plugins/siem/public/apps/plugin.tsx
deleted file mode 100644
index aa42504e07635f..00000000000000
--- a/x-pack/legacy/plugins/siem/public/apps/plugin.tsx
+++ /dev/null
@@ -1,59 +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 { render } from 'react-dom';
-import { LegacyCoreStart, PluginInitializerContext } from 'src/core/public';
-import { PluginsStart } from 'ui/new_platform/new_platform';
-import { Chrome } from 'ui/chrome';
-
-import { DEFAULT_KBN_VERSION, DEFAULT_TIMEZONE_BROWSER } from '../../common/constants';
-import { SiemApp } from './start_app';
-import template from './template.html';
-
-export const ROOT_ELEMENT_ID = 'react-siem-root';
-
-export type StartCore = LegacyCoreStart;
-export type StartPlugins = Required<
-  Pick<PluginsStart, 'data' | 'embeddable' | 'inspector' | 'uiActions'>
->;
-export type StartServices = StartCore & StartPlugins;
-
-export class Plugin {
-  constructor(
-    // @ts-ignore this is added to satisfy the New Platform typing constraint,
-    // but we're not leveraging any of its functionality yet.
-    private readonly initializerContext: PluginInitializerContext,
-    private readonly chrome: Chrome
-  ) {
-    this.chrome = chrome;
-  }
-
-  public start(core: StartCore, plugins: StartPlugins) {
-    // TODO(rylnd): These are unknown by uiSettings by default
-    core.uiSettings.set(DEFAULT_KBN_VERSION, '8.0.0');
-    core.uiSettings.set(DEFAULT_TIMEZONE_BROWSER, 'UTC');
-
-    // @ts-ignore improper type description
-    this.chrome.setRootTemplate(template);
-    const checkForRoot = () => {
-      return new Promise(resolve => {
-        const ready = !!document.getElementById(ROOT_ELEMENT_ID);
-        if (ready) {
-          resolve();
-        } else {
-          setTimeout(() => resolve(checkForRoot()), 10);
-        }
-      });
-    };
-    checkForRoot().then(() => {
-      const node = document.getElementById(ROOT_ELEMENT_ID);
-      if (node) {
-        render(<SiemApp core={core} plugins={plugins} />, node);
-      }
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/siem/public/apps/template.html b/x-pack/legacy/plugins/siem/public/apps/template.html
deleted file mode 100644
index 9f757b25ccecb6..00000000000000
--- a/x-pack/legacy/plugins/siem/public/apps/template.html
+++ /dev/null
@@ -1 +0,0 @@
-<div id="react-siem-root"></div>
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
index ba07a3f3436d93..71f22efadc6ed2 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
@@ -18,6 +18,7 @@ import {
 import { getOr, get, isNull, isNumber } from 'lodash/fp';
 import { AutoSizer } from '../auto_sizer';
 import { ChartPlaceHolder } from './chart_place_holder';
+import { useTimeZone } from '../../hooks';
 import {
   chartDefaultSettings,
   ChartSeriesConfigs,
@@ -26,7 +27,6 @@ import {
   getChartWidth,
   WrappedByAutoSizer,
   useTheme,
-  useBrowserTimeZone,
 } from './common';
 
 // custom series styles: https://ela.st/areachart-styling
@@ -71,7 +71,7 @@ export const AreaChartBaseComponent = ({
   configs?: ChartSeriesConfigs | undefined;
 }) => {
   const theme = useTheme();
-  const timeZone = useBrowserTimeZone();
+  const timeZone = useTimeZone();
   const xTickFormatter = get('configs.axis.xTickFormatter', chartConfigs);
   const yTickFormatter = get('configs.axis.yTickFormatter', chartConfigs);
   const xAxisId = `group-${data[0].key}-x`;
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
index db84d7dbd2c18f..415cbeb7c24409 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
@@ -7,6 +7,7 @@
 import React from 'react';
 import { Chart, BarSeries, Axis, Position, ScaleType, Settings } from '@elastic/charts';
 import { getOr, get, isNumber } from 'lodash/fp';
+import { useTimeZone } from '../../hooks';
 import { AutoSizer } from '../auto_sizer';
 import { ChartPlaceHolder } from './chart_place_holder';
 import {
@@ -17,7 +18,6 @@ import {
   getChartHeight,
   getChartWidth,
   WrappedByAutoSizer,
-  useBrowserTimeZone,
   useTheme,
 } from './common';
 
@@ -44,7 +44,7 @@ export const BarChartBaseComponent = ({
   configs?: ChartSeriesConfigs | undefined;
 }) => {
   const theme = useTheme();
-  const timeZone = useBrowserTimeZone();
+  const timeZone = useTimeZone();
   const xTickFormatter = get('configs.axis.xTickFormatter', chartConfigs);
   const yTickFormatter = get('configs.axis.yTickFormatter', chartConfigs);
   const tickSize = getOr(0, 'configs.axis.tickSize', chartConfigs);
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
index a4be390019916d..78cce72f0a0d39 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
@@ -15,10 +15,9 @@ import {
   SettingsSpecProps,
   TickFormatter,
 } from '@elastic/charts';
-import moment from 'moment-timezone';
 import styled from 'styled-components';
 import { useUiSetting } from '../../lib/kibana';
-import { DEFAULT_DATE_FORMAT_TZ, DEFAULT_DARK_MODE } from '../../../common/constants';
+import { DEFAULT_DARK_MODE } from '../../../common/constants';
 
 export const defaultChartHeight = '100%';
 export const defaultChartWidth = '100%';
@@ -108,11 +107,6 @@ export const chartDefaultSettings = {
   debug: false,
 };
 
-export const useBrowserTimeZone = () => {
-  const kibanaTimezone = useUiSetting<string>(DEFAULT_DATE_FORMAT_TZ);
-  return kibanaTimezone === 'Browser' ? moment.tz.guess() : kibanaTimezone;
-};
-
 export const getChartHeight = (customHeight?: number, autoSizerHeight?: number): string => {
   const height = customHeight || autoSizerHeight;
   return height ? `${height}px` : defaultChartHeight;
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx
index 1a8955d1116244..5b18e2d9b1fbce 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx
@@ -14,8 +14,6 @@ import { mockBrowserFields } from '../../containers/source/mock';
 import { defaultHeaders } from '../../mock/header';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../lib/kibana');
-
 describe('EventFieldsBrowser', () => {
   const mount = useMountAppended();
 
diff --git a/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx b/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx
index b44d83c27a60d3..3cef3e98c2f0a7 100644
--- a/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx
@@ -18,8 +18,6 @@ import { mockBrowserFields } from '../../containers/source/mock';
 import { eventsDefaultModel } from './default_model';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../lib/kibana');
-
 const mockUseFetchIndexPatterns: jest.Mock = useFetchIndexPatterns as jest.Mock;
 jest.mock('../../containers/detection_engine/rules/fetch_index_patterns');
 mockUseFetchIndexPatterns.mockImplementation(() => [
diff --git a/x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx
index 27c3abf7f6824c..1e225dabb25410 100644
--- a/x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx
@@ -17,8 +17,6 @@ import { useFetchIndexPatterns } from '../../containers/detection_engine/rules/f
 import { mockBrowserFields } from '../../containers/source/mock';
 import { eventsDefaultModel } from './default_model';
 
-jest.mock('../../lib/kibana');
-
 const mockUseFetchIndexPatterns: jest.Mock = useFetchIndexPatterns as jest.Mock;
 jest.mock('../../containers/detection_engine/rules/fetch_index_patterns');
 mockUseFetchIndexPatterns.mockImplementation(() => [
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
index 0196f500fee74a..d94c5f4d0a4f2a 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
@@ -16,8 +16,6 @@ const testFlyoutHeight = 980;
 const testWidth = 640;
 const usersViewing = ['elastic'];
 
-jest.mock('../../../lib/kibana');
-
 describe('Pane', () => {
   test('renders correctly against snapshot', () => {
     const EmptyComponent = shallow(
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap
index d23b1c61f7aeeb..ae30325f2a93b7 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`formatted_bytes PreferenceFormattedBytes rendering renders correctly against snapshot 1`] = `
+exports[`PreferenceFormattedBytes renders correctly against snapshot 1`] = `
 <Fragment>
   2.7MB
 </Fragment>
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
index 665d90f6a05ecb..44121591144445 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
@@ -8,7 +8,6 @@ import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import { mockFrameworks, getMockKibanaUiSetting } from '../../mock';
 import { useUiSetting$ } from '../../lib/kibana';
 
 import { PreferenceFormattedBytesComponent } from '.';
@@ -16,50 +15,42 @@ import { PreferenceFormattedBytesComponent } from '.';
 jest.mock('../../lib/kibana');
 const mockUseUiSetting$ = useUiSetting$ as jest.Mock;
 
-describe('formatted_bytes', () => {
-  describe('PreferenceFormattedBytes', () => {
-    describe('rendering', () => {
-      beforeEach(() => {
-        mockUseUiSetting$.mockClear();
-      });
+const DEFAULT_BYTES_FORMAT_VALUE = '0,0.[0]b'; // kibana's default for this setting
+const bytes = '2806422';
 
-      const bytes = '2806422';
+describe('PreferenceFormattedBytes', () => {
+  test('renders correctly against snapshot', () => {
+    mockUseUiSetting$.mockImplementation(() => [DEFAULT_BYTES_FORMAT_VALUE]);
+    const wrapper = shallow(<PreferenceFormattedBytesComponent value={bytes} />);
 
-      test('renders correctly against snapshot', () => {
-        mockUseUiSetting$.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_browser)
-        );
-        const wrapper = shallow(<PreferenceFormattedBytesComponent value={bytes} />);
-        expect(toJson(wrapper)).toMatchSnapshot();
-      });
+    expect(toJson(wrapper)).toMatchSnapshot();
+  });
+
+  test('it renders bytes to Numeral formatting when no format setting exists', () => {
+    mockUseUiSetting$.mockImplementation(() => [null]);
+    const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
+
+    expect(wrapper.text()).toEqual('2,806,422');
+  });
 
-      test('it renders bytes to hardcoded format when no configuration exists', () => {
-        mockUseUiSetting$.mockImplementation(() => [null]);
-        const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
-        expect(wrapper.text()).toEqual('2.7MB');
-      });
+  test('it renders bytes according to the default format', () => {
+    mockUseUiSetting$.mockImplementation(() => [DEFAULT_BYTES_FORMAT_VALUE]);
+    const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
 
-      test('it renders bytes according to the default format', () => {
-        mockUseUiSetting$.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_browser)
-        );
-        const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
-        expect(wrapper.text()).toEqual('2.7MB');
-      });
+    expect(wrapper.text()).toEqual('2.7MB');
+  });
+
+  test('it renders bytes supplied as a number according to the default format', () => {
+    mockUseUiSetting$.mockImplementation(() => [DEFAULT_BYTES_FORMAT_VALUE]);
+    const wrapper = mount(<PreferenceFormattedBytesComponent value={+bytes} />);
+
+    expect(wrapper.text()).toEqual('2.7MB');
+  });
 
-      test('it renders bytes supplied as a number according to the default format', () => {
-        mockUseUiSetting$.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_browser)
-        );
-        const wrapper = mount(<PreferenceFormattedBytesComponent value={+bytes} />);
-        expect(wrapper.text()).toEqual('2.7MB');
-      });
+  test('it renders bytes according to new format', () => {
+    mockUseUiSetting$.mockImplementation(() => ['0b']);
+    const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
 
-      test('it renders bytes according to new format', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.bytes_short));
-        const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
-        expect(wrapper.text()).toEqual('3MB');
-      });
-    });
+    expect(wrapper.text()).toEqual('3MB');
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
index 5a4816a96324b7..98a1acf471629e 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
@@ -10,13 +10,22 @@ import numeral from '@elastic/numeral';
 import { DEFAULT_BYTES_FORMAT } from '../../../common/constants';
 import { useUiSetting$ } from '../../lib/kibana';
 
-export const PreferenceFormattedBytesComponent = ({ value }: { value: string | number }) => {
+type Bytes = string | number;
+
+export const formatBytes = (value: Bytes, format: string) => {
+  return numeral(value).format(format);
+};
+
+export const useFormatBytes = () => {
   const [bytesFormat] = useUiSetting$<string>(DEFAULT_BYTES_FORMAT);
-  return (
-    <>{bytesFormat ? numeral(value).format(bytesFormat) : numeral(value).format('0,0.[0]b')}</>
-  );
+
+  return (value: Bytes) => formatBytes(value, bytesFormat);
 };
 
+export const PreferenceFormattedBytesComponent = ({ value }: { value: Bytes }) => (
+  <>{useFormatBytes()(value)}</>
+);
+
 PreferenceFormattedBytesComponent.displayName = 'PreferenceFormattedBytesComponent';
 
 export const PreferenceFormattedBytes = React.memo(PreferenceFormattedBytesComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap
index d196a23bff5bf7..9e851ddcd7d0f7 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`formatted_date PreferenceFormattedDate rendering renders correctly against snapshot 1`] = `
+exports[`formatted_date PreferenceFormattedDate renders correctly against snapshot 1`] = `
 <PreferenceFormattedDate
   value={2019-02-25T22:27:05.000Z}
 >
-  2019-02-25T22:27:05.000Z
+  2019-02-25T22:27:05Z
 </PreferenceFormattedDate>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
index 6f8bab13a00943..1b6f63f944882c 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
@@ -6,174 +6,165 @@
 
 import { mount, shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import moment from 'moment-timezone';
 import React from 'react';
 
-import { useUiSetting$ } from '../../lib/kibana';
+import { useDateFormat, useTimeZone } from '../../hooks';
 
-import { mockFrameworks, TestProviders, MockFrameworks, getMockKibanaUiSetting } from '../../mock';
+import { TestProviders } from '../../mock';
 import { getEmptyString, getEmptyValue } from '../empty_value';
 import { PreferenceFormattedDate, FormattedDate, FormattedRelativePreferenceDate } from '.';
 
-jest.mock('../../lib/kibana');
-const mockUseUiSetting$ = useUiSetting$ as jest.Mock;
+jest.mock('../../hooks');
+const mockUseDateFormat = useDateFormat as jest.Mock;
+const mockUseTimeZone = useTimeZone as jest.Mock;
+
+const isoDateString = '2019-02-25T22:27:05.000Z';
 
 describe('formatted_date', () => {
+  let isoDate: Date;
+
+  beforeEach(() => {
+    isoDate = new Date(isoDateString);
+    mockUseDateFormat.mockImplementation(() => 'MMM D, YYYY @ HH:mm:ss.SSS');
+    mockUseTimeZone.mockImplementation(() => 'UTC');
+  });
+
   describe('PreferenceFormattedDate', () => {
-    describe('rendering', () => {
-      const isoDateString = '2019-02-25T22:27:05.000Z';
-      const isoDate = new Date(isoDateString);
-      const configFormattedDateString = (dateString: string, config: MockFrameworks): string =>
-        moment
-          .tz(
-            dateString,
-            config.dateFormatTz! === 'Browser' ? config.timezone! : config.dateFormatTz!
-          )
-          .format(config.dateFormat);
-
-      test('renders correctly against snapshot', () => {
-        mockUseUiSetting$.mockImplementation(() => [null]);
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(toJson(wrapper)).toMatchSnapshot();
-      });
-
-      test('it renders the UTC ISO8601 date string supplied when no configuration exists', () => {
-        mockUseUiSetting$.mockImplementation(() => [null]);
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(wrapper.text()).toEqual(isoDateString);
-      });
-
-      test('it renders the UTC ISO8601 date supplied when the default configuration exists', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_UTC));
-
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(wrapper.text()).toEqual(
-          configFormattedDateString(isoDateString, mockFrameworks.default_UTC)
-        );
-      });
-
-      test('it renders the correct tz when the default browser configuration exists', () => {
-        mockUseUiSetting$.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_browser)
-        );
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(wrapper.text()).toEqual(
-          configFormattedDateString(isoDateString, mockFrameworks.default_browser)
-        );
-      });
-
-      test('it renders the correct tz when a non-UTC configuration exists', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_MT));
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(wrapper.text()).toEqual(
-          configFormattedDateString(isoDateString, mockFrameworks.default_MT)
-        );
-      });
+    test('renders correctly against snapshot', () => {
+      mockUseDateFormat.mockImplementation(() => '');
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(toJson(wrapper)).toMatchSnapshot();
+    });
+
+    test('it renders the date with the default configuration', () => {
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper.text()).toEqual('Feb 25, 2019 @ 22:27:05.000');
+    });
+
+    test('it renders a UTC ISO8601 date string supplied when no date format configuration exists', () => {
+      mockUseDateFormat.mockImplementation(() => '');
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper.text()).toEqual('2019-02-25T22:27:05Z');
+    });
+
+    test('it renders the correct timezone when a non-UTC configuration exists', () => {
+      mockUseTimeZone.mockImplementation(() => 'America/Denver');
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper.text()).toEqual('Feb 25, 2019 @ 15:27:05.000');
+    });
+
+    test('it renders the date with a user-defined format', () => {
+      mockUseDateFormat.mockImplementation(() => 'MMM-DD-YYYY');
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper.text()).toEqual('Feb-25-2019');
     });
   });
 
   describe('FormattedDate', () => {
-    describe('rendering', () => {
-      test('it renders against a numeric epoch', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_UTC));
-        const wrapper = mount(<FormattedDate fieldName="@timestamp" value={1559079339000} />);
-        expect(wrapper.text()).toEqual('May 28, 2019 @ 21:35:39.000');
-      });
-
-      test('it renders against a string epoch', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_UTC));
-        const wrapper = mount(<FormattedDate fieldName="@timestamp" value={'1559079339000'} />);
-        expect(wrapper.text()).toEqual('May 28, 2019 @ 21:35:39.000');
-      });
-
-      test('it renders against a ISO string', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_UTC));
-        const wrapper = mount(
-          <FormattedDate fieldName="@timestamp" value={'2019-05-28T22:04:49.957Z'} />
-        );
-        expect(wrapper.text()).toEqual('May 28, 2019 @ 22:04:49.957');
-      });
-
-      test('it renders against an empty string as an empty string placeholder', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_UTC));
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedDate fieldName="@timestamp" value={''} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toEqual('(Empty String)');
-      });
-
-      test('it renders against an null as a EMPTY_VALUE', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_UTC));
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedDate fieldName="@timestamp" value={null} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toEqual(getEmptyValue());
-      });
-
-      test('it renders against an undefined as a EMPTY_VALUE', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_UTC));
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedDate fieldName="@timestamp" value={undefined} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toEqual(getEmptyValue());
-      });
-
-      test('it renders against an invalid date time as just the string its self', () => {
-        mockUseUiSetting$.mockImplementation(getMockKibanaUiSetting(mockFrameworks.default_UTC));
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedDate fieldName="@timestamp" value={'Rebecca Evan Braden'} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toEqual('Rebecca Evan Braden');
-      });
+    test('it renders against a numeric epoch', () => {
+      const wrapper = mount(<FormattedDate fieldName="@timestamp" value={1559079339000} />);
+      expect(wrapper.text()).toEqual('May 28, 2019 @ 21:35:39.000');
+    });
+
+    test('it renders against a string epoch', () => {
+      const wrapper = mount(<FormattedDate fieldName="@timestamp" value={'1559079339000'} />);
+      expect(wrapper.text()).toEqual('May 28, 2019 @ 21:35:39.000');
+    });
+
+    test('it renders against a ISO string', () => {
+      const wrapper = mount(
+        <FormattedDate fieldName="@timestamp" value={'2019-05-28T22:04:49.957Z'} />
+      );
+      expect(wrapper.text()).toEqual('May 28, 2019 @ 22:04:49.957');
+    });
+
+    test('it renders against an empty string as an empty string placeholder', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedDate fieldName="@timestamp" value={''} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toEqual(getEmptyString());
+    });
+
+    test('it renders against an null as a EMPTY_VALUE', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedDate fieldName="@timestamp" value={null} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toEqual(getEmptyValue());
+    });
+
+    test('it renders against an undefined as a EMPTY_VALUE', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedDate fieldName="@timestamp" value={undefined} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toEqual(getEmptyValue());
+    });
+
+    test('it renders against an invalid date time as just the string its self', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedDate fieldName="@timestamp" value={'Rebecca Evan Braden'} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toEqual('Rebecca Evan Braden');
     });
   });
 
   describe('FormattedRelativePreferenceDate', () => {
-    describe('rendering', () => {
-      test('renders time over an hour correctly against snapshot', () => {
-        const isoDateString = '2019-02-25T22:27:05.000Z';
-        const wrapper = shallow(<FormattedRelativePreferenceDate value={isoDateString} />);
-        expect(wrapper.find('[data-test-subj="preference-time"]').exists()).toBe(true);
-      });
-      test('renders time under an hour correctly against snapshot', () => {
-        const timeTwelveMinutesAgo = new Date(new Date().getTime() - 12 * 60 * 1000).toISOString();
-        const wrapper = shallow(<FormattedRelativePreferenceDate value={timeTwelveMinutesAgo} />);
-        expect(wrapper.find('[data-test-subj="relative-time"]').exists()).toBe(true);
-      });
-      test('renders empty string value correctly', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedRelativePreferenceDate value={''} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toBe(getEmptyString());
-      });
-
-      test('renders undefined value correctly', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedRelativePreferenceDate />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toBe(getEmptyValue());
-      });
-
-      test('renders null value correctly', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedRelativePreferenceDate value={null} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toBe(getEmptyValue());
-      });
+    test('renders time over an hour correctly against snapshot', () => {
+      const wrapper = shallow(<FormattedRelativePreferenceDate value={isoDateString} />);
+      expect(wrapper.find('[data-test-subj="preference-time"]').exists()).toBe(true);
+    });
+
+    test('renders time under an hour correctly against snapshot', () => {
+      const timeTwelveMinutesAgo = new Date(new Date().getTime() - 12 * 60 * 1000).toISOString();
+      const wrapper = shallow(<FormattedRelativePreferenceDate value={timeTwelveMinutesAgo} />);
+
+      expect(wrapper.find('[data-test-subj="relative-time"]').exists()).toBe(true);
+    });
+
+    test('renders empty string value correctly', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedRelativePreferenceDate value={''} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toBe(getEmptyString());
+    });
+
+    test('renders undefined value correctly', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedRelativePreferenceDate />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toBe(getEmptyValue());
+    });
+
+    test('renders null value correctly', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedRelativePreferenceDate value={null} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toBe(getEmptyValue());
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
index 169696d5fcde9e..4e5903c02abf7a 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
@@ -8,29 +8,16 @@ import moment from 'moment-timezone';
 import React from 'react';
 import { FormattedRelative } from '@kbn/i18n/react';
 
-import { useUiSetting$ } from '../../lib/kibana';
-
-import {
-  DEFAULT_DATE_FORMAT,
-  DEFAULT_DATE_FORMAT_TZ,
-  DEFAULT_TIMEZONE_BROWSER,
-} from '../../../common/constants';
+import { useDateFormat, useTimeZone } from '../../hooks';
 import { getOrEmptyTagFromValue } from '../empty_value';
 import { LocalizedDateTooltip } from '../localized_date_tooltip';
 import { getMaybeDate } from './maybe_date';
 
 export const PreferenceFormattedDate = React.memo<{ value: Date }>(({ value }) => {
-  const [dateFormat] = useUiSetting$<string>(DEFAULT_DATE_FORMAT);
-  const [dateFormatTz] = useUiSetting$<string>(DEFAULT_DATE_FORMAT_TZ);
-  const [timezone] = useUiSetting$<string>(DEFAULT_TIMEZONE_BROWSER);
+  const dateFormat = useDateFormat();
+  const timeZone = useTimeZone();
 
-  return (
-    <>
-      {dateFormat && dateFormatTz && timezone
-        ? moment.tz(value, dateFormatTz === 'Browser' ? timezone : dateFormatTz).format(dateFormat)
-        : moment.utc(value).toISOString()}
-    </>
-  );
+  return <>{moment.tz(value, timeZone).format(dateFormat)}</>;
 });
 
 PreferenceFormattedDate.displayName = 'PreferenceFormattedDate';
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
index 1eb5e96b868578..a7ef71f7a6a0d3 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
@@ -6,7 +6,7 @@
 
 import { ScaleType, niceTimeFormatter, Position } from '@elastic/charts';
 import { get, groupBy, map, toPairs } from 'lodash/fp';
-import numeral from '@elastic/numeral';
+
 import { UpdateDateRange, ChartSeriesData } from '../charts/common';
 import { MatrixHistogramDataTypes, MatrixHistogramMappingTypes } from './types';
 
@@ -87,7 +87,3 @@ export const getCustomChartData = (
     }, formattedChartData);
   else return formattedChartData;
 };
-
-export const bytesFormatter = (value: number) => {
-  return numeral(value).format('0,0.[0]b');
-};
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
index bce99c943c7a5d..48277b0b6fa52c 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
@@ -15,11 +15,8 @@ import { errorToToaster } from '../api/error_to_toaster';
 
 import * as i18n from './translations';
 import { useUiSetting$ } from '../../../lib/kibana';
-import {
-  DEFAULT_ANOMALY_SCORE,
-  DEFAULT_TIMEZONE_BROWSER,
-  DEFAULT_KBN_VERSION,
-} from '../../../../common/constants';
+import { DEFAULT_ANOMALY_SCORE } from '../../../../common/constants';
+import { useTimeZone } from '../../../hooks';
 
 interface Args {
   influencers?: InfluencerInput[];
@@ -67,9 +64,8 @@ export const useAnomaliesTableData = ({
   const capabilities = useContext(MlCapabilitiesContext);
   const userPermissions = hasMlUserPermissions(capabilities);
   const [, dispatchToaster] = useStateToaster();
-  const [timezone] = useUiSetting$<string>(DEFAULT_TIMEZONE_BROWSER);
+  const timeZone = useTimeZone();
   const [anomalyScore] = useUiSetting$<number>(DEFAULT_ANOMALY_SCORE);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
 
   const siemJobIds = siemJobs.filter(job => job.isInstalled).map(job => job.id);
 
@@ -95,11 +91,10 @@ export const useAnomaliesTableData = ({
               earliestMs,
               latestMs,
               influencers: influencersInput,
-              dateFormatTz: timezone,
+              dateFormatTz: timeZone,
               maxRecords: 500,
               maxExamples: 10,
             },
-            kbnVersion,
             abortCtrl.signal
           );
           if (isSubscribed) {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts b/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts
index e66d984a152941..10b2538d1e7852 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts
@@ -21,20 +21,15 @@ export interface Body {
   maxExamples: number;
 }
 
-export const anomaliesTableData = async (
-  body: Body,
-  kbnVersion: string,
-  signal: AbortSignal
-): Promise<Anomalies> => {
+export const anomaliesTableData = async (body: Body, signal: AbortSignal): Promise<Anomalies> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/results/anomalies_table_data`, {
     method: 'POST',
     credentials: 'same-origin',
     body: JSON.stringify(body),
     headers: {
-      'kbn-system-api': 'true',
       'content-Type': 'application/json',
-      'kbn-xsrf': kbnVersion,
-      'kbn-version': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
     signal,
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts b/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts
index c1654a1648f2b5..13339510284945 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts
@@ -22,18 +22,14 @@ export interface Body {
   maxExamples: number;
 }
 
-export const getMlCapabilities = async (
-  kbnVersion: string,
-  signal: AbortSignal
-): Promise<MlCapabilities> => {
+export const getMlCapabilities = async (signal: AbortSignal): Promise<MlCapabilities> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/ml_capabilities`, {
     method: 'GET',
     credentials: 'same-origin',
     headers: {
-      'kbn-system-api': 'true',
       'content-Type': 'application/json',
-      'kbn-xsrf': kbnVersion,
-      'kbn-version': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
     signal,
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx b/x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx
index b8d6908df464e7..cae05e26b115b1 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx
@@ -11,8 +11,6 @@ import { getMlCapabilities } from '../api/get_ml_capabilities';
 import { emptyMlCapabilities } from '../empty_ml_capabilities';
 import { errorToToaster } from '../api/error_to_toaster';
 import { useStateToaster } from '../../toasters';
-import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
 
 import * as i18n from './translations';
 
@@ -36,7 +34,6 @@ export const MlCapabilitiesProvider = React.memo<{ children: JSX.Element }>(({ c
     emptyMlCapabilitiesProvider
   );
   const [, dispatchToaster] = useStateToaster();
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
 
   useEffect(() => {
     let isSubscribed = true;
@@ -44,7 +41,7 @@ export const MlCapabilitiesProvider = React.memo<{ children: JSX.Element }>(({ c
 
     async function fetchMlCapabilities() {
       try {
-        const mlCapabilities = await getMlCapabilities(kbnVersion, abortCtrl.signal);
+        const mlCapabilities = await getMlCapabilities(abortCtrl.signal);
         if (isSubscribed) {
           setCapabilities({ ...mlCapabilities, capabilitiesFetched: true });
         }
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx
index 8e7bedd8f872a0..a04b8f4b996536 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx
@@ -25,12 +25,10 @@ import { throwIfNotOk } from '../../hooks/api/api';
  * Checks the ML Recognizer API to see if a given indexPattern has any compatible modules
  *
  * @param indexPatternName ES index pattern to check for compatible modules
- * @param headers optional headers to add
  * @param signal to cancel request
  */
 export const checkRecognizer = async ({
   indexPatternName,
-  kbnVersion,
   signal,
 }: CheckRecognizerProps): Promise<RecognizerModule[]> => {
   const response = await fetch(
@@ -39,10 +37,9 @@ export const checkRecognizer = async ({
       method: 'GET',
       credentials: 'same-origin',
       headers: {
-        'kbn-system-api': 'true',
         'content-type': 'application/json',
-        'kbn-version': kbnVersion,
-        'kbn-xsrf': kbnVersion,
+        'kbn-system-api': 'true',
+        'kbn-xsrf': 'true',
       },
       signal,
     }
@@ -55,22 +52,16 @@ export const checkRecognizer = async ({
  * Returns ML Module for given moduleId. Returns all modules if no moduleId specified
  *
  * @param moduleId id of the module to retrieve
- * @param headers optional headers to add optional headers to add
  * @param signal to cancel request
  */
-export const getModules = async ({
-  moduleId = '',
-  kbnVersion,
-  signal,
-}: GetModulesProps): Promise<Module[]> => {
+export const getModules = async ({ moduleId = '', signal }: GetModulesProps): Promise<Module[]> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/modules/get_module/${moduleId}`, {
     method: 'GET',
     credentials: 'same-origin',
     headers: {
-      'kbn-system-api': 'true',
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
     signal,
   });
@@ -93,7 +84,6 @@ export const setupMlJob = async ({
   indexPatternName = 'auditbeat-*',
   jobIdErrorFilter = [],
   groups = ['siem'],
-  kbnVersion,
   prefix = '',
 }: MlSetupArgs): Promise<SetupMlResponse> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/modules/setup/${configTemplate}`, {
@@ -107,10 +97,9 @@ export const setupMlJob = async ({
       useDedicatedIndex: true,
     }),
     headers: {
-      'kbn-system-api': 'true',
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
   });
   await throwIfNotOk(response);
@@ -124,16 +113,13 @@ export const setupMlJob = async ({
  *
  * @param datafeedIds
  * @param start
- * @param headers optional headers to add
  */
 export const startDatafeeds = async ({
   datafeedIds,
-  kbnVersion,
   start = 0,
 }: {
   datafeedIds: string[];
   start: number;
-  kbnVersion: string;
 }): Promise<StartDatafeedResponse> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/jobs/force_start_datafeeds`, {
     method: 'POST',
@@ -143,10 +129,9 @@ export const startDatafeeds = async ({
       ...(start !== 0 && { start }),
     }),
     headers: {
-      'kbn-system-api': 'true',
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
   });
   await throwIfNotOk(response);
@@ -163,10 +148,8 @@ export const startDatafeeds = async ({
  */
 export const stopDatafeeds = async ({
   datafeedIds,
-  kbnVersion,
 }: {
   datafeedIds: string[];
-  kbnVersion: string;
 }): Promise<[StopDatafeedResponse | ErrorResponse, CloseJobsResponse]> => {
   const stopDatafeedsResponse = await fetch(`${chrome.getBasePath()}/api/ml/jobs/stop_datafeeds`, {
     method: 'POST',
@@ -175,9 +158,9 @@ export const stopDatafeeds = async ({
       datafeedIds,
     }),
     headers: {
-      'kbn-system-api': 'true',
       'content-type': 'application/json',
-      'kbn-xsrf': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
   });
 
@@ -198,7 +181,7 @@ export const stopDatafeeds = async ({
     headers: {
       'content-type': 'application/json',
       'kbn-system-api': 'true',
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
   });
 
@@ -214,10 +197,7 @@ export const stopDatafeeds = async ({
  *
  * @param signal to cancel request
  */
-export const getJobsSummary = async (
-  signal: AbortSignal,
-  kbnVersion: string
-): Promise<JobSummary[]> => {
+export const getJobsSummary = async (signal: AbortSignal): Promise<JobSummary[]> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/jobs/jobs_summary`, {
     method: 'POST',
     credentials: 'same-origin',
@@ -225,8 +205,7 @@ export const getJobsSummary = async (
     headers: {
       'content-type': 'application/json',
       'kbn-system-api': 'true',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     signal,
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
index f9d110d711d075..9df93d087e1668 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
@@ -13,7 +13,7 @@ import { MlCapabilitiesContext } from '../../ml/permissions/ml_capabilities_prov
 import { useStateToaster } from '../../toasters';
 import { errorToToaster } from '../../ml/api/error_to_toaster';
 import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_INDEX_KEY, DEFAULT_KBN_VERSION } from '../../../../common/constants';
+import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 
 import * as i18n from './translations';
 import { createSiemJobs } from './use_siem_jobs_helpers';
@@ -34,7 +34,6 @@ export const useSiemJobs = (refetchData: boolean): Return => {
   const capabilities = useContext(MlCapabilitiesContext);
   const userPermissions = hasMlUserPermissions(capabilities);
   const [siemDefaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   useEffect(() => {
@@ -47,11 +46,10 @@ export const useSiemJobs = (refetchData: boolean): Return => {
         try {
           // Batch fetch all installed jobs, ML modules, and check which modules are compatible with siemDefaultIndex
           const [jobSummaryData, modulesData, compatibleModules] = await Promise.all([
-            getJobsSummary(abortCtrl.signal, kbnVersion),
-            getModules({ signal: abortCtrl.signal, kbnVersion }),
+            getJobsSummary(abortCtrl.signal),
+            getModules({ signal: abortCtrl.signal }),
             checkRecognizer({
               indexPatternName: siemDefaultIndex,
-              kbnVersion,
               signal: abortCtrl.signal,
             }),
           ]);
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
index c34ed51d229942..307be06424ee3f 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
@@ -10,8 +10,7 @@ import moment from 'moment';
 import React, { useContext, useReducer, useState } from 'react';
 import styled from 'styled-components';
 
-import { DEFAULT_KBN_VERSION } from '../../../common/constants';
-import { useKibana, useUiSetting$ } from '../../lib/kibana';
+import { useKibana } from '../../lib/kibana';
 import { METRIC_TYPE, TELEMETRY_EVENT, trackUiAction as track } from '../../lib/track_usage';
 import { errorToToaster } from '../ml/api/error_to_toaster';
 import { hasMlAdminPermissions } from '../ml/permissions/has_ml_admin_permissions';
@@ -97,7 +96,6 @@ export const MlPopover = React.memo(() => {
 
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const [filterProperties, setFilterProperties] = useState(defaultFilterProps);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
   const [isLoadingSiemJobs, siemJobs] = useSiemJobs(refreshToggle);
   const [, dispatchToaster] = useStateToaster();
   const capabilities = useContext(MlCapabilitiesContext);
@@ -114,7 +112,6 @@ export const MlPopover = React.memo(() => {
           indexPatternName: job.defaultIndexPattern,
           jobIdErrorFilter: [job.id],
           groups: job.groups,
-          kbnVersion,
         });
       } catch (error) {
         errorToToaster({ title: i18n.CREATE_JOB_FAILURE, error, dispatchToaster });
@@ -132,14 +129,14 @@ export const MlPopover = React.memo(() => {
     if (enable) {
       const startTime = Math.max(latestTimestampMs, maxStartTime);
       try {
-        await startDatafeeds({ datafeedIds: [`datafeed-${job.id}`], kbnVersion, start: startTime });
+        await startDatafeeds({ datafeedIds: [`datafeed-${job.id}`], start: startTime });
       } catch (error) {
         track(METRIC_TYPE.COUNT, TELEMETRY_EVENT.JOB_ENABLE_FAILURE);
         errorToToaster({ title: i18n.START_JOB_FAILURE, error, dispatchToaster });
       }
     } else {
       try {
-        await stopDatafeeds({ datafeedIds: [`datafeed-${job.id}`], kbnVersion });
+        await stopDatafeeds({ datafeedIds: [`datafeed-${job.id}`] });
       } catch (error) {
         track(METRIC_TYPE.COUNT, TELEMETRY_EVENT.JOB_DISABLE_FAILURE);
         errorToToaster({ title: i18n.STOP_JOB_FAILURE, error, dispatchToaster });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts b/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
index f8794c19639618..964ae8c8242d4b 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
@@ -14,7 +14,6 @@ export interface Group {
 
 export interface CheckRecognizerProps {
   indexPatternName: string[];
-  kbnVersion: string;
   signal: AbortSignal;
 }
 
@@ -30,7 +29,6 @@ export interface RecognizerModule {
 
 export interface GetModulesProps {
   moduleId?: string;
-  kbnVersion: string;
   signal: AbortSignal;
 }
 
@@ -97,7 +95,6 @@ export interface MlSetupArgs {
   jobIdErrorFilter: string[];
   groups: string[];
   prefix?: string;
-  kbnVersion: string;
 }
 
 /**
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
index 0c6976ef774e2c..4a836333f3311c 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
@@ -15,8 +15,6 @@ import { TestProviders } from '../../../../mock';
 
 import { FirstLastSeenHost, FirstLastSeenHostType } from '.';
 
-jest.mock('../../../../lib/kibana');
-
 describe('FirstLastSeen Component', () => {
   const firstSeen = 'Apr 8, 2019 @ 16:09:40.692';
   const lastSeen = 'Apr 8, 2019 @ 18:35:45.064';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/dns_histogram/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/dns_histogram/index.tsx
index 490efd08f0aa7d..e7b0d8e7d00d57 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/dns_histogram/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/dns_histogram/index.tsx
@@ -9,22 +9,23 @@ import React from 'react';
 import { ScaleType } from '@elastic/charts';
 import * as i18n from './translation';
 import { MatrixHistogram } from '../../../matrix_histogram';
-import { bytesFormatter } from '../../../matrix_histogram/utils';
 import { MatrixOverOrdinalHistogramData } from '../../../../graphql/types';
 import { MatrixHistogramBasicProps } from '../../../matrix_histogram/types';
+import { useFormatBytes } from '../../../formatted_bytes';
 
 export const NetworkDnsHistogram = (
   props: MatrixHistogramBasicProps<MatrixOverOrdinalHistogramData>
 ) => {
   const dataKey = 'histogram';
   const { ...matrixOverTimeProps } = props;
+  const formatBytes = useFormatBytes();
 
   return (
     <MatrixHistogram
       title={i18n.NETWORK_DNS_HISTOGRAM}
       dataKey={dataKey}
       scaleType={ScaleType.Ordinal}
-      yTickFormatter={bytesFormatter}
+      yTickFormatter={formatBytes}
       showLegend={false}
       {...matrixOverTimeProps}
     />
diff --git a/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
index e403963cbbe201..870d0b40d8cd48 100644
--- a/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
@@ -14,8 +14,6 @@ import { FilterManager, SearchBar } from '../../../../../../../src/plugins/data/
 import { QueryBar, QueryBarComponentProps } from '.';
 import { createKibanaContextProviderMock } from '../../mock/kibana_react';
 
-jest.mock('../../lib/kibana');
-
 const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
 
 describe('QueryBar ', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
index 5c25216cf8487a..975af67efd763c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
@@ -7,21 +7,16 @@
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import moment from 'moment-timezone';
 import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
-import { defaultHeaders, mockFrameworks, mockTimelineData, TestProviders } from '../../../../mock';
+import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../mock';
 import { getEmptyValue } from '../../../empty_value';
 import { useMountAppended } from '../../../../utils/use_mount_appended';
 
 import { plainColumnRenderer } from './plain_column_renderer';
 import { getValues, deleteItemIdx, findItem } from './helpers';
 
-jest.mock('../../../../lib/kibana');
-
-const mockFramework = mockFrameworks.default_UTC;
-
 describe('plain_column_renderer', () => {
   const mount = useMountAppended();
 
@@ -134,11 +129,7 @@ describe('plain_column_renderer', () => {
           <span>{column}</span>
         </TestProviders>
       );
-      expect(wrapper.text()).toEqual(
-        moment
-          .tz(getValues('@timestamp', mockDatum)![0], mockFramework.dateFormatTz!)
-          .format(mockFramework.dateFormat)
-      );
+      expect(wrapper.text()).toEqual('Nov 5, 2018 @ 19:03:25.937');
     });
 
     test('should return an empty value if destination ip is empty', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
index 62402ba8a4c4e4..4d3f2d71604e8c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
@@ -49,8 +49,6 @@ import {
 } from './generic_row_renderer';
 import * as i18n from './translations';
 
-jest.mock('../../../../../lib/kibana');
-
 describe('GenericRowRenderer', () => {
   const mount = useMountAppended();
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
index a3ee878e305b48..f9611995cdb047 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
@@ -23,17 +23,15 @@ import { DETECTION_ENGINE_RULES_URL } from '../../../../common/constants';
  * Add provided Rule
  *
  * @param rule to add
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal to cancel request
  */
-export const addRule = async ({ rule, kbnVersion, signal }: AddRulesProps): Promise<NewRule> => {
+export const addRule = async ({ rule, signal }: AddRulesProps): Promise<NewRule> => {
   const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}`, {
     method: rule.id != null ? 'PUT' : 'POST',
     credentials: 'same-origin',
     headers: {
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     body: JSON.stringify(rule),
     signal,
@@ -49,7 +47,6 @@ export const addRule = async ({ rule, kbnVersion, signal }: AddRulesProps): Prom
  * @param filterOptions desired filters (e.g. filter/sortField/sortOrder)
  * @param pagination desired pagination options (e.g. page/perPage)
  * @param id if specified, will return specific rule if exists
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal to cancel request
  */
 export const fetchRules = async ({
@@ -64,7 +61,6 @@ export const fetchRules = async ({
     total: 0,
   },
   id,
-  kbnVersion,
   signal,
 }: FetchRulesProps): Promise<FetchRulesResponse> => {
   const queryParams = [
@@ -101,16 +97,14 @@ export const fetchRules = async ({
  * Fetch a Rule by providing a Rule ID
  *
  * @param id Rule ID's (not rule_id)
- * @param kbnVersion current Kibana Version to use for headers
  */
-export const fetchRuleById = async ({ id, kbnVersion, signal }: FetchRuleProps): Promise<Rule> => {
+export const fetchRuleById = async ({ id, signal }: FetchRuleProps): Promise<Rule> => {
   const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}?id=${id}`, {
     method: 'GET',
     credentials: 'same-origin',
     headers: {
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     signal,
   });
@@ -124,21 +118,15 @@ export const fetchRuleById = async ({ id, kbnVersion, signal }: FetchRuleProps):
  *
  * @param ids array of Rule ID's (not rule_id) to enable/disable
  * @param enabled to enable or disable
- * @param kbnVersion current Kibana Version to use for headers
  */
-export const enableRules = async ({
-  ids,
-  enabled,
-  kbnVersion,
-}: EnableRulesProps): Promise<Rule[]> => {
+export const enableRules = async ({ ids, enabled }: EnableRulesProps): Promise<Rule[]> => {
   const requests = ids.map(id =>
     fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}`, {
       method: 'PUT',
       credentials: 'same-origin',
       headers: {
         'content-type': 'application/json',
-        'kbn-version': kbnVersion,
-        'kbn-xsrf': kbnVersion,
+        'kbn-xsrf': 'true',
       },
       body: JSON.stringify({ id, enabled }),
     })
@@ -155,9 +143,8 @@ export const enableRules = async ({
  * Deletes provided Rule ID's
  *
  * @param ids array of Rule ID's (not rule_id) to delete
- * @param kbnVersion current Kibana Version to use for headers
  */
-export const deleteRules = async ({ ids, kbnVersion }: DeleteRulesProps): Promise<Rule[]> => {
+export const deleteRules = async ({ ids }: DeleteRulesProps): Promise<Rule[]> => {
   // TODO: Don't delete if immutable!
   const requests = ids.map(id =>
     fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}?id=${id}`, {
@@ -165,8 +152,7 @@ export const deleteRules = async ({ ids, kbnVersion }: DeleteRulesProps): Promis
       credentials: 'same-origin',
       headers: {
         'content-type': 'application/json',
-        'kbn-version': kbnVersion,
-        'kbn-xsrf': kbnVersion,
+        'kbn-xsrf': 'true',
       },
     })
   );
@@ -182,20 +168,15 @@ export const deleteRules = async ({ ids, kbnVersion }: DeleteRulesProps): Promis
  * Duplicates provided Rules
  *
  * @param rule to duplicate
- * @param kbnVersion current Kibana Version to use for headers
  */
-export const duplicateRules = async ({
-  rules,
-  kbnVersion,
-}: DuplicateRulesProps): Promise<Rule[]> => {
+export const duplicateRules = async ({ rules }: DuplicateRulesProps): Promise<Rule[]> => {
   const requests = rules.map(rule =>
     fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}`, {
       method: 'POST',
       credentials: 'same-origin',
       headers: {
         'content-type': 'application/json',
-        'kbn-version': kbnVersion,
-        'kbn-xsrf': kbnVersion,
+        'kbn-xsrf': 'true',
       },
       body: JSON.stringify({
         ...rule,
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx
index 82490991236de5..ea03c34ec31ba8 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx
@@ -6,8 +6,6 @@
 
 import { useEffect, useState, Dispatch } from 'react';
 
-import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
 import { useStateToaster } from '../../../components/toasters';
 import { errorToToaster } from '../../../components/ml/api/error_to_toaster';
 
@@ -26,7 +24,6 @@ export const usePersistRule = (): Return => {
   const [rule, setRule] = useState<NewRule | null>(null);
   const [isSaved, setIsSaved] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   useEffect(() => {
@@ -37,7 +34,7 @@ export const usePersistRule = (): Return => {
       if (rule != null) {
         try {
           setIsLoading(true);
-          await persistRule({ rule, kbnVersion, signal: abortCtrl.signal });
+          await persistRule({ rule, signal: abortCtrl.signal });
 
           if (isSubscribed) {
             setIsSaved(true);
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
index 0885e541cead5d..9f3cba7189fb19 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
@@ -41,7 +41,6 @@ export type NewRule = t.TypeOf<typeof NewRuleSchema>;
 
 export interface AddRulesProps {
   rule: NewRule;
-  kbnVersion: string;
   signal: AbortSignal;
 }
 
@@ -98,7 +97,6 @@ export interface FetchRulesProps {
   pagination?: PaginationOptions;
   filterOptions?: FilterOptions;
   id?: string;
-  kbnVersion: string;
   signal: AbortSignal;
 }
 
@@ -117,22 +115,18 @@ export interface FetchRulesResponse {
 
 export interface FetchRuleProps {
   id: string;
-  kbnVersion: string;
   signal: AbortSignal;
 }
 
 export interface EnableRulesProps {
   ids: string[];
   enabled: boolean;
-  kbnVersion: string;
 }
 
 export interface DeleteRulesProps {
   ids: string[];
-  kbnVersion: string;
 }
 
 export interface DuplicateRulesProps {
   rules: Rules;
-  kbnVersion: string;
 }
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx
index ad0b87385ee790..22ba86cd09f743 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx
@@ -6,8 +6,6 @@
 
 import { useEffect, useState } from 'react';
 
-import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
 import { useStateToaster } from '../../../components/toasters';
 import { errorToToaster } from '../../../components/ml/api/error_to_toaster';
 import { fetchRuleById } from './api';
@@ -25,7 +23,6 @@ type Return = [boolean, Rule | null];
 export const useRule = (id: string | undefined): Return => {
   const [rule, setRule] = useState<Rule | null>(null);
   const [loading, setLoading] = useState(true);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   useEffect(() => {
@@ -37,7 +34,6 @@ export const useRule = (id: string | undefined): Return => {
         setLoading(true);
         const ruleResponse = await fetchRuleById({
           id: idToFetch,
-          kbnVersion,
           signal: abortCtrl.signal,
         });
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx
index 66285c804aa283..b49dd8d51d4f75 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx
@@ -6,8 +6,6 @@
 
 import { useEffect, useState } from 'react';
 
-import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
 import { FetchRulesResponse, FilterOptions, PaginationOptions } from './types';
 import { useStateToaster } from '../../../components/toasters';
 import { fetchRules } from './api';
@@ -35,7 +33,6 @@ export const useRules = (
     data: [],
   });
   const [loading, setLoading] = useState(true);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   useEffect(() => {
@@ -48,7 +45,6 @@ export const useRules = (
         const fetchRulesResult = await fetchRules({
           filterOptions,
           pagination,
-          kbnVersion,
           signal: abortCtrl.signal,
         });
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts
index e69bbfe1925fbb..e7641fd37678e2 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts
@@ -29,12 +29,10 @@ import { parseJsonFromBody } from '../../../utils/api';
  * Fetch Signals by providing a query
  *
  * @param query String to match a dsl
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal AbortSignal for cancelling request
  */
 export const fetchQuerySignals = async <Hit, Aggregations>({
   query,
-  kbnVersion,
   signal,
 }: QuerySignals): Promise<SignalSearchResponse<Hit, Aggregations>> => {
   const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_QUERY_SIGNALS_URL}`, {
@@ -42,8 +40,7 @@ export const fetchQuerySignals = async <Hit, Aggregations>({
     credentials: 'same-origin',
     headers: {
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     body: query,
     signal,
@@ -58,13 +55,11 @@ export const fetchQuerySignals = async <Hit, Aggregations>({
  *
  * @param query of signals to update
  * @param status to update to('open' / 'closed')
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal AbortSignal for cancelling request
  */
 export const updateSignalStatus = async ({
   query,
   status,
-  kbnVersion,
   signal,
 }: UpdateSignalStatusProps): Promise<unknown> => {
   const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_SIGNALS_STATUS_URL}`, {
@@ -72,8 +67,7 @@ export const updateSignalStatus = async ({
     credentials: 'same-origin',
     headers: {
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     body: JSON.stringify({ status, ...query }),
     signal,
@@ -86,20 +80,15 @@ export const updateSignalStatus = async ({
 /**
  * Fetch Signal Index
  *
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal AbortSignal for cancelling request
  */
-export const getSignalIndex = async ({
-  kbnVersion,
-  signal,
-}: BasicSignals): Promise<SignalsIndex | null> => {
+export const getSignalIndex = async ({ signal }: BasicSignals): Promise<SignalsIndex | null> => {
   const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_INDEX_URL}`, {
     method: 'GET',
     credentials: 'same-origin',
     headers: {
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     signal,
   });
@@ -117,20 +106,15 @@ export const getSignalIndex = async ({
 /**
  * Get User Privileges
  *
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal AbortSignal for cancelling request
  */
-export const getUserPrivilege = async ({
-  kbnVersion,
-  signal,
-}: BasicSignals): Promise<Privilege | null> => {
+export const getUserPrivilege = async ({ signal }: BasicSignals): Promise<Privilege | null> => {
   const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_PRIVILEGES_URL}`, {
     method: 'GET',
     credentials: 'same-origin',
     headers: {
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     signal,
   });
@@ -142,20 +126,15 @@ export const getUserPrivilege = async ({
 /**
  * Create Signal Index if needed it
  *
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal AbortSignal for cancelling request
  */
-export const createSignalIndex = async ({
-  kbnVersion,
-  signal,
-}: BasicSignals): Promise<SignalsIndex | null> => {
+export const createSignalIndex = async ({ signal }: BasicSignals): Promise<SignalsIndex | null> => {
   const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_INDEX_URL}`, {
     method: 'POST',
     credentials: 'same-origin',
     headers: {
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     signal,
   });
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/types.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/types.ts
index 118c2b367ca5b7..32f53691bae874 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/types.ts
@@ -7,7 +7,6 @@
 export * from './errors_types';
 
 export interface BasicSignals {
-  kbnVersion: string;
   signal: AbortSignal;
 }
 export interface QuerySignals extends BasicSignals {
@@ -39,7 +38,6 @@ export interface SignalSearchResponse<Hit = {}, Aggregations = undefined> extend
 export interface UpdateSignalStatusProps {
   query: object;
   status: 'open' | 'closed';
-  kbnVersion: string;
   signal?: AbortSignal; // TODO: implement cancelling
 }
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx
index 6f897703059f74..aa66df53d9fd9f 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx
@@ -6,8 +6,6 @@
 
 import { useEffect, useState } from 'react';
 
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
-import { useUiSetting$ } from '../../../lib/kibana';
 import { getUserPrivilege } from './api';
 
 type Return = [boolean, boolean | null, boolean | null];
@@ -20,7 +18,6 @@ export const usePrivilegeUser = (): Return => {
   const [loading, setLoading] = useState(true);
   const [isAuthenticated, setAuthenticated] = useState<boolean | null>(null);
   const [hasWrite, setHasWrite] = useState<boolean | null>(null);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
 
   useEffect(() => {
     let isSubscribed = true;
@@ -30,7 +27,6 @@ export const usePrivilegeUser = (): Return => {
     async function fetchData() {
       try {
         const privilege = await getUserPrivilege({
-          kbnVersion,
           signal: abortCtrl.signal,
         });
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_query.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_query.tsx
index 9501f1189a4839..65a5ac866e68d7 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_query.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_query.tsx
@@ -6,9 +6,6 @@
 
 import { useEffect, useState } from 'react';
 
-import { useUiSetting$ } from '../../../lib/kibana';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
-
 import { fetchQuerySignals } from './api';
 import { SignalSearchResponse } from './types';
 
@@ -23,7 +20,6 @@ type Return<Hit, Aggs> = [boolean, SignalSearchResponse<Hit, Aggs> | null];
 export const useQuerySignals = <Hit, Aggs>(query: string): Return<Hit, Aggs> => {
   const [signals, setSignals] = useState<SignalSearchResponse<Hit, Aggs> | null>(null);
   const [loading, setLoading] = useState(true);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
 
   useEffect(() => {
     let isSubscribed = true;
@@ -34,7 +30,6 @@ export const useQuerySignals = <Hit, Aggs>(query: string): Return<Hit, Aggs> =>
       try {
         const signalResponse = await fetchQuerySignals<Hit, Aggs>({
           query,
-          kbnVersion,
           signal: abortCtrl.signal,
         });
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx
index 347c90fa3b411d..1ff4422cf6411d 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx
@@ -6,10 +6,8 @@
 
 import { useEffect, useState, useRef } from 'react';
 
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
 import { errorToToaster } from '../../../components/ml/api/error_to_toaster';
 import { useStateToaster } from '../../../components/toasters';
-import { useUiSetting$ } from '../../../lib/kibana';
 import { createSignalIndex, getSignalIndex } from './api';
 import * as i18n from './translations';
 import { PostSignalError } from './types';
@@ -28,7 +26,6 @@ export const useSignalIndex = (): Return => {
   const [signalIndexName, setSignalIndexName] = useState<string | null>(null);
   const [signalIndexExists, setSignalIndexExists] = useState<boolean | null>(null);
   const createDeSignalIndex = useRef<Func | null>(null);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   useEffect(() => {
@@ -38,10 +35,7 @@ export const useSignalIndex = (): Return => {
     const fetchData = async () => {
       try {
         setLoading(true);
-        const signal = await getSignalIndex({
-          kbnVersion,
-          signal: abortCtrl.signal,
-        });
+        const signal = await getSignalIndex({ signal: abortCtrl.signal });
 
         if (isSubscribed && signal != null) {
           setSignalIndexName(signal.name);
@@ -62,10 +56,7 @@ export const useSignalIndex = (): Return => {
       let isFetchingData = false;
       try {
         setLoading(true);
-        await createSignalIndex({
-          kbnVersion,
-          signal: abortCtrl.signal,
-        });
+        await createSignalIndex({ signal: abortCtrl.signal });
 
         if (isSubscribed) {
           isFetchingData = true;
diff --git a/x-pack/legacy/plugins/siem/public/hooks/api/api.tsx b/x-pack/legacy/plugins/siem/public/hooks/api/api.tsx
index 12282241247cbc..8d319ffe239027 100644
--- a/x-pack/legacy/plugins/siem/public/hooks/api/api.tsx
+++ b/x-pack/legacy/plugins/siem/public/hooks/api/api.tsx
@@ -17,13 +17,9 @@ const emptyIndexPattern: IndexPatternSavedObject[] = [];
  *
  * TODO: Refactor to context provider: https://github.com/elastic/siem-team/issues/448
  *
- * @param headers
  * @param signal
  */
-export const getIndexPatterns = async (
-  signal: AbortSignal,
-  kbnVersion: string
-): Promise<IndexPatternSavedObject[]> => {
+export const getIndexPatterns = async (signal: AbortSignal): Promise<IndexPatternSavedObject[]> => {
   const response = await fetch(
     `${chrome.getBasePath()}/api/saved_objects/_find?type=index-pattern&fields=title&fields=type&per_page=10000`,
     {
@@ -31,9 +27,8 @@ export const getIndexPatterns = async (
       credentials: 'same-origin',
       headers: {
         'content-type': 'application/json',
-        'kbn-xsrf': kbnVersion,
-        'kbn-version': kbnVersion,
         'kbn-system-api': 'true',
+        'kbn-xsrf': 'true',
       },
       signal,
     }
diff --git a/x-pack/legacy/plugins/siem/public/app.ts b/x-pack/legacy/plugins/siem/public/hooks/index.ts
similarity index 79%
rename from x-pack/legacy/plugins/siem/public/app.ts
rename to x-pack/legacy/plugins/siem/public/hooks/index.ts
index b068f8a9becda5..5049e4587d3837 100644
--- a/x-pack/legacy/plugins/siem/public/app.ts
+++ b/x-pack/legacy/plugins/siem/public/hooks/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import './apps/index';
+export { useDateFormat, useTimeZone } from './use_ui_settings';
diff --git a/x-pack/legacy/plugins/siem/public/hooks/use_index_patterns.tsx b/x-pack/legacy/plugins/siem/public/hooks/use_index_patterns.tsx
index f5b595b0d01c61..7abe88402096c8 100644
--- a/x-pack/legacy/plugins/siem/public/hooks/use_index_patterns.tsx
+++ b/x-pack/legacy/plugins/siem/public/hooks/use_index_patterns.tsx
@@ -6,11 +6,9 @@
 
 import { useEffect, useState } from 'react';
 
-import { DEFAULT_KBN_VERSION } from '../../common/constants';
 import { useStateToaster } from '../components/toasters';
 import { errorToToaster } from '../components/ml/api/error_to_toaster';
 import { IndexPatternSavedObject } from '../components/ml_popover/types';
-import { useUiSetting$ } from '../lib/kibana';
 
 import { getIndexPatterns } from './api/api';
 import * as i18n from './translations';
@@ -21,7 +19,6 @@ export const useIndexPatterns = (refreshToggle = false): Return => {
   const [indexPatterns, setIndexPatterns] = useState<IndexPatternSavedObject[]>([]);
   const [isLoading, setIsLoading] = useState(true);
   const [, dispatchToaster] = useStateToaster();
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
 
   useEffect(() => {
     let isSubscribed = true;
@@ -30,7 +27,7 @@ export const useIndexPatterns = (refreshToggle = false): Return => {
 
     async function fetchIndexPatterns() {
       try {
-        const data = await getIndexPatterns(abortCtrl.signal, kbnVersion);
+        const data = await getIndexPatterns(abortCtrl.signal);
 
         if (isSubscribed) {
           setIndexPatterns(data);
diff --git a/x-pack/legacy/plugins/siem/public/hooks/use_ui_settings.ts b/x-pack/legacy/plugins/siem/public/hooks/use_ui_settings.ts
new file mode 100644
index 00000000000000..7eb0242e8e1160
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/hooks/use_ui_settings.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 moment from 'moment-timezone';
+
+import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../../common/constants';
+import { useUiSetting } from '../lib/kibana';
+
+export const useDateFormat = (): string => useUiSetting<string>(DEFAULT_DATE_FORMAT);
+
+export const useTimeZone = (): string => {
+  const timeZone = useUiSetting<string>(DEFAULT_DATE_FORMAT_TZ);
+  return timeZone === 'Browser' ? moment.tz.guess() : timeZone;
+};
diff --git a/x-pack/legacy/plugins/siem/public/index.ts b/x-pack/legacy/plugins/siem/public/index.ts
new file mode 100644
index 00000000000000..3a396a0637ea12
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Plugin, PluginInitializerContext } from './plugin';
+
+export const plugin = (context: PluginInitializerContext): Plugin => new Plugin(context);
diff --git a/x-pack/legacy/plugins/siem/public/legacy.ts b/x-pack/legacy/plugins/siem/public/legacy.ts
new file mode 100644
index 00000000000000..49a03c93120d4a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/legacy.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 { npSetup, npStart } from 'ui/new_platform';
+
+import { PluginInitializerContext } from '../../../../../src/core/public';
+import { plugin } from './';
+
+const pluginInstance = plugin({} as PluginInitializerContext);
+
+pluginInstance.setup(npSetup.core, npSetup.plugins);
+pluginInstance.start(npStart.core, npStart.plugins);
diff --git a/x-pack/legacy/plugins/siem/public/lib/compose/helpers.ts b/x-pack/legacy/plugins/siem/public/lib/compose/helpers.ts
index 80a42b91dbd32a..9cdd4148134ad2 100644
--- a/x-pack/legacy/plugins/siem/public/lib/compose/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/lib/compose/helpers.ts
@@ -20,9 +20,7 @@ export const getLinks = (cache: InMemoryCache) => [
   }),
   new HttpLink({
     credentials: 'same-origin',
-    headers: {
-      'kbn-xsrf': chrome.getXsrfToken(),
-    },
+    headers: { 'kbn-xsrf': 'true' },
     uri: `${chrome.getBasePath()}/api/siem/graphql`,
   }),
 ];
diff --git a/x-pack/legacy/plugins/siem/public/lib/kibana/index.ts b/x-pack/legacy/plugins/siem/public/lib/kibana/index.ts
index 96d9c8330d265d..012a1cfef5da2d 100644
--- a/x-pack/legacy/plugins/siem/public/lib/kibana/index.ts
+++ b/x-pack/legacy/plugins/siem/public/lib/kibana/index.ts
@@ -12,7 +12,7 @@ import {
   useUiSetting$,
   withKibana,
 } from '../../../../../../../src/plugins/kibana_react/public';
-import { StartServices } from '../../apps/plugin';
+import { StartServices } from '../../plugin';
 
 export type KibanaContext = KibanaReactContextValue<StartServices>;
 export interface WithKibanaProps {
diff --git a/x-pack/legacy/plugins/siem/public/lib/lib.ts b/x-pack/legacy/plugins/siem/public/lib/lib.ts
index 7a6cd32aa8864c..e7b39d2ea50f95 100644
--- a/x-pack/legacy/plugins/siem/public/lib/lib.ts
+++ b/x-pack/legacy/plugins/siem/public/lib/lib.ts
@@ -24,7 +24,6 @@ export interface AppFrameworkAdapter {
   darkMode?: boolean;
   indexPattern?: string;
   anomalyScore?: number;
-  kbnVersion?: string;
   scaledDateFormat?: string;
   timezone?: string;
 
diff --git a/x-pack/legacy/plugins/siem/public/mock/index.ts b/x-pack/legacy/plugins/siem/public/mock/index.ts
index 620e266618c5c9..dbf5f2e55e7134 100644
--- a/x-pack/legacy/plugins/siem/public/mock/index.ts
+++ b/x-pack/legacy/plugins/siem/public/mock/index.ts
@@ -8,7 +8,6 @@ export * from './global_state';
 export * from './header';
 export * from './hook_wrapper';
 export * from './index_pattern';
-export * from './kibana_config';
 export * from './mock_timeline_data';
 export * from './mock_detail_item';
 export * from './netflow';
diff --git a/x-pack/legacy/plugins/siem/public/mock/kibana_config.ts b/x-pack/legacy/plugins/siem/public/mock/kibana_config.ts
deleted file mode 100644
index 23f1f0e86dd6aa..00000000000000
--- a/x-pack/legacy/plugins/siem/public/mock/kibana_config.ts
+++ /dev/null
@@ -1,123 +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 {
-  DEFAULT_DATE_FORMAT,
-  DEFAULT_DATE_FORMAT_TZ,
-  DEFAULT_BYTES_FORMAT,
-  DEFAULT_KBN_VERSION,
-  DEFAULT_TIMEZONE_BROWSER,
-  DEFAULT_TIMEPICKER_QUICK_RANGES,
-} from '../../common/constants';
-
-export interface MockFrameworks {
-  bytesFormat: string;
-  dateFormat: string;
-  dateFormatTz: string;
-  timezone: string;
-}
-
-export const getMockKibanaUiSetting = (config: MockFrameworks) => (key: string) => {
-  if (key === DEFAULT_DATE_FORMAT) {
-    return [config.dateFormat];
-  } else if (key === DEFAULT_DATE_FORMAT_TZ) {
-    return [config.dateFormatTz];
-  } else if (key === DEFAULT_BYTES_FORMAT) {
-    return [config.bytesFormat];
-  } else if (key === DEFAULT_KBN_VERSION) {
-    return ['8.0.0'];
-  } else if (key === DEFAULT_TIMEZONE_BROWSER) {
-    return config && config.timezone ? [config.timezone] : ['America/New_York'];
-  } else if (key === DEFAULT_TIMEPICKER_QUICK_RANGES) {
-    return [
-      [
-        {
-          from: 'now/d',
-          to: 'now/d',
-          display: 'Today',
-        },
-        {
-          from: 'now/w',
-          to: 'now/w',
-          display: 'This week',
-        },
-        {
-          from: 'now-15m',
-          to: 'now',
-          display: 'Last 15 minutes',
-        },
-        {
-          from: 'now-30m',
-          to: 'now',
-          display: 'Last 30 minutes',
-        },
-        {
-          from: 'now-1h',
-          to: 'now',
-          display: 'Last 1 hour',
-        },
-        {
-          from: 'now-24h',
-          to: 'now',
-          display: 'Last 24 hours',
-        },
-        {
-          from: 'now-7d',
-          to: 'now',
-          display: 'Last 7 days',
-        },
-        {
-          from: 'now-30d',
-          to: 'now',
-          display: 'Last 30 days',
-        },
-        {
-          from: 'now-90d',
-          to: 'now',
-          display: 'Last 90 days',
-        },
-        {
-          from: 'now-1y',
-          to: 'now',
-          display: 'Last 1 year',
-        },
-      ],
-    ];
-  }
-  return [null];
-};
-
-export const mockFrameworks: Readonly<Record<string, MockFrameworks>> = {
-  bytes_short: {
-    bytesFormat: '0b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'Browser',
-    timezone: 'America/Denver',
-  },
-  default_browser: {
-    bytesFormat: '0,0.[0]b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'Browser',
-    timezone: 'America/Denver',
-  },
-  default_ET: {
-    bytesFormat: '0,0.[0]b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'America/New_York',
-    timezone: 'America/New_York',
-  },
-  default_MT: {
-    bytesFormat: '0,0.[0]b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'America/Denver',
-    timezone: 'America/Denver',
-  },
-  default_UTC: {
-    bytesFormat: '0,0.[0]b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'UTC',
-    timezone: 'UTC',
-  },
-};
diff --git a/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts b/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
index a6b4fe664efba0..7d843977d1f322 100644
--- a/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
+++ b/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
@@ -22,7 +22,7 @@ import {
   DEFAULT_TO,
   DEFAULT_INTERVAL_PAUSE,
   DEFAULT_INTERVAL_VALUE,
-  DEFAULT_TIMEZONE_BROWSER,
+  DEFAULT_BYTES_FORMAT,
 } from '../../common/constants';
 import { defaultIndexPattern } from '../../default_index_pattern';
 import { createKibanaCoreStartMock, createKibanaPluginsStartMock } from './kibana_core';
@@ -40,8 +40,8 @@ export const mockUiSettings: Record<string, any> = {
     value: DEFAULT_INTERVAL_VALUE,
   },
   [DEFAULT_INDEX_KEY]: defaultIndexPattern,
+  [DEFAULT_BYTES_FORMAT]: '0,0.[0]b',
   [DEFAULT_DATE_FORMAT_TZ]: 'UTC',
-  [DEFAULT_TIMEZONE_BROWSER]: 'America/New_York',
   [DEFAULT_DATE_FORMAT]: 'MMM D, YYYY @ HH:mm:ss.SSS',
   [DEFAULT_DARK_MODE]: false,
 };
@@ -87,11 +87,15 @@ export const createWithKibanaMock = () => {
 
 export const createKibanaContextProviderMock = () => {
   const kibana = createUseKibanaMock()();
+  const uiSettings = {
+    ...kibana.services.uiSettings,
+    get: createUseUiSettingMock(),
+  };
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return ({ services, ...rest }: any) =>
     React.createElement(KibanaContextProvider, {
       ...rest,
-      services: { ...kibana.services, ...services },
+      services: { ...kibana.services, uiSettings, ...services },
     });
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx
index c0ed58daeca7fc..d08e282a4c399b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx
@@ -42,18 +42,13 @@ export const updateSignalStatusAction = async ({
   status,
   setEventsLoading,
   setEventsDeleted,
-  kbnVersion,
 }: UpdateSignalStatusActionProps) => {
   try {
     setEventsLoading({ eventIds: signalIds, isLoading: true });
 
     const queryObject = query ? { query: JSON.parse(query) } : getUpdateSignalsQuery(signalIds);
 
-    await updateSignalStatus({
-      query: queryObject,
-      status,
-      kbnVersion,
-    });
+    await updateSignalStatus({ query: queryObject, status });
     // TODO: Only delete those that were successfully updated from updatedRules
     setEventsDeleted({ eventIds: signalIds, isDeleted: true });
   } catch (e) {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx
index 6b8cd5521c5337..1a7ad5822a2468 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx
@@ -172,13 +172,11 @@ export const getSignalsActions = ({
   setEventsDeleted,
   createTimeline,
   status,
-  kbnVersion,
 }: {
   setEventsLoading: ({ eventIds, isLoading }: SetEventsLoadingProps) => void;
   setEventsDeleted: ({ eventIds, isDeleted }: SetEventsDeletedProps) => void;
   createTimeline: CreateTimeline;
   status: 'open' | 'closed';
-  kbnVersion: string;
 }): TimelineAction[] => [
   {
     getAction: ({ eventId, data }: TimelineActionProps): JSX.Element => (
@@ -211,7 +209,6 @@ export const getSignalsActions = ({
               status,
               setEventsLoading,
               setEventsDeleted,
-              kbnVersion,
             })
           }
           iconType={status === FILTER_OPEN ? 'indexOpen' : 'indexClose'}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx
index f9e80334a88820..47a78482cfb6e9 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx
@@ -25,8 +25,7 @@ import {
   SignalFilterOption,
   SignalsTableFilterGroup,
 } from './signals_filter_group';
-import { useKibana, useUiSetting$ } from '../../../../lib/kibana';
-import { DEFAULT_KBN_VERSION } from '../../../../../common/constants';
+import { useKibana } from '../../../../lib/kibana';
 import { defaultHeaders } from '../../../../components/timeline/body/column_headers/default_headers';
 import { ColumnHeader } from '../../../../components/timeline/body/column_headers/column_header';
 import { esFilters, esQuery } from '../../../../../../../../../src/plugins/data/common/es_query';
@@ -121,7 +120,6 @@ export const SignalsTableComponent = React.memo<SignalsTableComponentProps>(
     const [showClearSelectionAction, setShowClearSelectionAction] = useState(false);
     const [filterGroup, setFilterGroup] = useState<SignalFilterOption>(FILTER_OPEN);
     const [{ browserFields, indexPatterns }] = useFetchIndexPatterns([signalsIndex]);
-    const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
     const kibana = useKibana();
 
     const getGlobalQuery = useCallback(() => {
@@ -208,7 +206,6 @@ export const SignalsTableComponent = React.memo<SignalsTableComponentProps>(
           status,
           setEventsDeleted: setEventsDeletedCallback,
           setEventsLoading: setEventsLoadingCallback,
-          kbnVersion,
         });
       },
       [
@@ -261,9 +258,8 @@ export const SignalsTableComponent = React.memo<SignalsTableComponentProps>(
           setEventsLoading: setEventsLoadingCallback,
           setEventsDeleted: setEventsDeletedCallback,
           status: filterGroup === FILTER_OPEN ? FILTER_CLOSED : FILTER_OPEN,
-          kbnVersion,
         }),
-      [createTimelineCallback, filterGroup, kbnVersion]
+      [createTimelineCallback, filterGroup]
     );
 
     const defaultIndices = useMemo(() => [signalsIndex], [signalsIndex]);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/types.ts
index b02b8eb0ef976e..51bea27ec6a4b7 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/types.ts
@@ -31,7 +31,6 @@ export interface UpdateSignalStatusActionProps {
   status: 'open' | 'closed';
   setEventsLoading: ({ eventIds, isLoading }: SetEventsLoadingProps) => void;
   setEventsDeleted: ({ eventIds, isDeleted }: SetEventsDeletedProps) => void;
-  kbnVersion: string;
 }
 
 export type SendSignalsToTimeline = () => void;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx
index 4de6136e9d3ded..f176109b1d7a53 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx
@@ -22,13 +22,9 @@ export const editRuleAction = (rule: Rule, history: H.History) => {
 
 export const runRuleAction = () => {};
 
-export const duplicateRuleAction = async (
-  rule: Rule,
-  dispatch: React.Dispatch<Action>,
-  kbnVersion: string
-) => {
+export const duplicateRuleAction = async (rule: Rule, dispatch: React.Dispatch<Action>) => {
   dispatch({ type: 'updateLoading', ids: [rule.id], isLoading: true });
-  const duplicatedRule = await duplicateRules({ rules: [rule], kbnVersion });
+  const duplicatedRule = await duplicateRules({ rules: [rule] });
   dispatch({ type: 'updateLoading', ids: [rule.id], isLoading: false });
   dispatch({ type: 'updateRules', rules: duplicatedRule, appendRuleId: rule.id });
 };
@@ -37,25 +33,20 @@ export const exportRulesAction = async (rules: Rule[], dispatch: React.Dispatch<
   dispatch({ type: 'setExportPayload', exportPayload: rules });
 };
 
-export const deleteRulesAction = async (
-  ids: string[],
-  dispatch: React.Dispatch<Action>,
-  kbnVersion: string
-) => {
+export const deleteRulesAction = async (ids: string[], dispatch: React.Dispatch<Action>) => {
   dispatch({ type: 'updateLoading', ids, isLoading: true });
-  const deletedRules = await deleteRules({ ids, kbnVersion });
+  const deletedRules = await deleteRules({ ids });
   dispatch({ type: 'deleteRules', rules: deletedRules });
 };
 
 export const enableRulesAction = async (
   ids: string[],
   enabled: boolean,
-  dispatch: React.Dispatch<Action>,
-  kbnVersion: string
+  dispatch: React.Dispatch<Action>
 ) => {
   try {
     dispatch({ type: 'updateLoading', ids, isLoading: true });
-    const updatedRules = await enableRules({ ids, enabled, kbnVersion });
+    const updatedRules = await enableRules({ ids, enabled });
     dispatch({ type: 'updateRules', rules: updatedRules });
   } catch {
     // TODO Add error toast support to actions (and @throw jsdoc to api calls)
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx
index c8fb9d98fde6ae..72d38454ad9bc3 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx
@@ -14,8 +14,7 @@ import { deleteRulesAction, enableRulesAction, exportRulesAction } from './actio
 export const getBatchItems = (
   selectedState: TableData[],
   dispatch: React.Dispatch<Action>,
-  closePopover: () => void,
-  kbnVersion: string
+  closePopover: () => void
 ) => {
   const containsEnabled = selectedState.some(v => v.activate);
   const containsDisabled = selectedState.some(v => !v.activate);
@@ -29,7 +28,7 @@ export const getBatchItems = (
       onClick={async () => {
         closePopover();
         const deactivatedIds = selectedState.filter(s => !s.activate).map(s => s.id);
-        await enableRulesAction(deactivatedIds, true, dispatch, kbnVersion);
+        await enableRulesAction(deactivatedIds, true, dispatch);
       }}
     >
       {i18n.BATCH_ACTION_ACTIVATE_SELECTED}
@@ -41,7 +40,7 @@ export const getBatchItems = (
       onClick={async () => {
         closePopover();
         const activatedIds = selectedState.filter(s => s.activate).map(s => s.id);
-        await enableRulesAction(activatedIds, false, dispatch, kbnVersion);
+        await enableRulesAction(activatedIds, false, dispatch);
       }}
     >
       {i18n.BATCH_ACTION_DEACTIVATE_SELECTED}
@@ -78,8 +77,7 @@ export const getBatchItems = (
         closePopover();
         await deleteRulesAction(
           selectedState.map(({ sourceRule: { id } }) => id),
-          dispatch,
-          kbnVersion
+          dispatch
         );
       }}
     >
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
index 1fcd8c7da82569..42c4bb1d0ef95d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
@@ -33,7 +33,7 @@ import * as i18n from '../translations';
 import { PreferenceFormattedDate } from '../../../../components/formatted_date';
 import { RuleSwitch } from '../components/rule_switch';
 
-const getActions = (dispatch: React.Dispatch<Action>, kbnVersion: string, history: H.History) => [
+const getActions = (dispatch: React.Dispatch<Action>, history: H.History) => [
   {
     description: i18n.EDIT_RULE_SETTINGS,
     icon: 'visControls',
@@ -52,7 +52,7 @@ const getActions = (dispatch: React.Dispatch<Action>, kbnVersion: string, histor
     description: i18n.DUPLICATE_RULE,
     icon: 'copy',
     name: i18n.DUPLICATE_RULE,
-    onClick: (rowItem: TableData) => duplicateRuleAction(rowItem.sourceRule, dispatch, kbnVersion),
+    onClick: (rowItem: TableData) => duplicateRuleAction(rowItem.sourceRule, dispatch),
   },
   {
     description: i18n.EXPORT_RULE,
@@ -64,14 +64,13 @@ const getActions = (dispatch: React.Dispatch<Action>, kbnVersion: string, histor
     description: i18n.DELETE_RULE,
     icon: 'trash',
     name: i18n.DELETE_RULE,
-    onClick: (rowItem: TableData) => deleteRulesAction([rowItem.id], dispatch, kbnVersion),
+    onClick: (rowItem: TableData) => deleteRulesAction([rowItem.id], dispatch),
   },
 ];
 
 // Michael: Are we able to do custom, in-table-header filters, as shown in my wireframes?
 export const getColumns = (
   dispatch: React.Dispatch<Action>,
-  kbnVersion: string,
   history: H.History
 ): Array<EuiBasicTableColumn<TableData> | EuiTableActionsColumnType<TableData>> => [
   {
@@ -173,7 +172,7 @@ export const getColumns = (
     width: '85px',
   },
   {
-    actions: getActions(dispatch, kbnVersion, history),
+    actions: getActions(dispatch, history),
     width: '40px',
   } as EuiTableActionsColumnType<TableData>,
 ];
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
index 442360bbf14846..060f8baccc3b73 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
@@ -31,8 +31,6 @@ import { getBatchItems } from './batch_actions';
 import { EuiBasicTableOnChange, TableData } from '../types';
 import { allRulesReducer, State } from './reducer';
 import * as i18n from '../translations';
-import { useUiSetting$ } from '../../../../lib/kibana';
-import { DEFAULT_KBN_VERSION } from '../../../../../common/constants';
 import { JSONDownloader } from '../components/json_downloader';
 import { useStateToaster } from '../../../../components/toasters';
 
@@ -78,16 +76,13 @@ export const AllRules = React.memo<{ importCompleteToggle: boolean }>(importComp
   const history = useHistory();
   const [isInitialLoad, setIsInitialLoad] = useState(true);
   const [isLoadingRules, rulesData] = useRules(pagination, filterOptions, refreshToggle);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   const getBatchItemsPopoverContent = useCallback(
     (closePopover: () => void) => (
-      <EuiContextMenuPanel
-        items={getBatchItems(selectedItems, dispatch, closePopover, kbnVersion)}
-      />
+      <EuiContextMenuPanel items={getBatchItems(selectedItems, dispatch, closePopover)} />
     ),
-    [selectedItems, dispatch, kbnVersion]
+    [selectedItems, dispatch]
   );
 
   useEffect(() => {
@@ -185,7 +180,7 @@ export const AllRules = React.memo<{ importCompleteToggle: boolean }>(importComp
             </UtilityBar>
 
             <EuiBasicTable
-              columns={getColumns(dispatch, kbnVersion, history)}
+              columns={getColumns(dispatch, history)}
               isSelectable
               itemId="rule_id"
               items={tableData}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
index 6d50fb768068fe..75be92f2fe8467 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
@@ -28,8 +28,6 @@ import { fold } from 'fp-ts/lib/Either';
 import uuid from 'uuid';
 
 import { duplicateRules, RulesSchema } from '../../../../../containers/detection_engine/rules';
-import { useUiSetting$ } from '../../../../../lib/kibana';
-import { DEFAULT_KBN_VERSION } from '../../../../../../common/constants';
 import { useStateToaster } from '../../../../../components/toasters';
 import { ndjsonToJSON } from '../json_downloader';
 import * as i18n from './translations';
@@ -54,7 +52,6 @@ export const ImportRuleModalComponent = ({
 }: ImportRuleModalProps) => {
   const [selectedFiles, setSelectedFiles] = useState<FileList | null>(null);
   const [isImporting, setIsImporting] = useState(false);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   const cleanupAndCloseModal = () => {
@@ -89,7 +86,7 @@ export const ImportRuleModalComponent = ({
           }, identity)
         );
 
-        const duplicatedRules = await duplicateRules({ rules: decodedRules, kbnVersion });
+        const duplicatedRules = await duplicateRules({ rules: decodedRules });
         importComplete();
         cleanupAndCloseModal();
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
index 4e7ff6fb3a886a..3fc29c472e4d73 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
@@ -9,7 +9,6 @@ import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { RuleSwitchComponent } from './index';
-jest.mock('../../../../../lib/kibana');
 
 describe('RuleSwitch', () => {
   test('renders correctly against snapshot', () => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx
index 54f0fc453830e1..a1fa4770a41acc 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx
@@ -15,9 +15,7 @@ import { isEmpty } from 'lodash/fp';
 import styled from 'styled-components';
 import React, { useCallback, useState, useEffect } from 'react';
 
-import { DEFAULT_KBN_VERSION } from '../../../../../../common/constants';
 import { enableRules } from '../../../../../containers/detection_engine/rules';
-import { useUiSetting$ } from '../../../../../lib/kibana';
 import { enableRulesAction } from '../../all/actions';
 import { Action } from '../../all/reducer';
 
@@ -50,19 +48,17 @@ export const RuleSwitchComponent = ({
 }: RuleSwitchProps) => {
   const [myIsLoading, setMyIsLoading] = useState(false);
   const [myEnabled, setMyEnabled] = useState(enabled ?? false);
-  const [kbnVersion] = useUiSetting$<string>(DEFAULT_KBN_VERSION);
 
   const onRuleStateChange = useCallback(
     async (event: EuiSwitchEvent) => {
       setMyIsLoading(true);
       if (dispatch != null) {
-        await enableRulesAction([id], event.target.checked!, dispatch, kbnVersion);
+        await enableRulesAction([id], event.target.checked!, dispatch);
       } else {
         try {
           const updatedRules = await enableRules({
             ids: [id],
             enabled: event.target.checked!,
-            kbnVersion,
           });
           setMyEnabled(updatedRules[0].enabled);
         } catch {
@@ -71,7 +67,7 @@ export const RuleSwitchComponent = ({
       }
       setMyIsLoading(false);
     },
-    [dispatch, id, kbnVersion]
+    [dispatch, id]
   );
 
   useEffect(() => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx
index 092c2463419d1c..aafeea6465fb3b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx
@@ -16,8 +16,6 @@ import { hostDetailsPagePath } from '../types';
 import { type } from './utils';
 import { useMountAppended } from '../../../utils/use_mount_appended';
 
-jest.mock('../../../lib/kibana');
-
 jest.mock('../../../containers/source', () => ({
   indicesExistOrDataTemporarilyUnavailable: () => true,
   WithSource: ({
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
index 729777745d689f..f7e0863465f9a7 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
@@ -20,8 +20,6 @@ import { SiemNavigation } from '../../components/navigation';
 import { HostsComponentProps } from './types';
 import { Hosts } from './hosts';
 
-jest.mock('../../lib/kibana');
-
 // Test will fail because we will to need to mock some core services to make the test work
 // For now let's forget about SiemSearchBar and QueryBar
 jest.mock('../../components/search_bar', () => ({
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
index bde41ac02bc0a4..347f15ed0a8498 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
@@ -28,8 +28,6 @@ const pop: Action = 'POP';
 
 type GlobalWithFetch = NodeJS.Global & { fetch: jest.Mock };
 
-jest.mock('../../../lib/kibana');
-
 // Test will fail because we will to need to mock some core services to make the test work
 // For now let's forget about SiemSearchBar and QueryBar
 jest.mock('../../../components/search_bar', () => ({
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx b/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
index 9c87d29cd1056e..26b2bd9dace48e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
@@ -16,8 +16,6 @@ import { mocksSource } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
 import { Network } from './network';
 
-jest.mock('../../lib/kibana');
-
 // Test will fail because we will to need to mock some core services to make the test work
 // For now let's forget about SiemSearchBar and QueryBar
 jest.mock('../../components/search_bar', () => ({
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
index 7f9f4b1eb70b03..eff61bf6a9710a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
@@ -14,8 +14,6 @@ import { TestProviders } from '../../mock';
 import { mocksSource } from '../../containers/source/mock';
 import { Overview } from './index';
 
-jest.mock('../../lib/kibana');
-
 let localSource: Array<{
   request: {};
   result: {
diff --git a/x-pack/legacy/plugins/siem/public/plugin.tsx b/x-pack/legacy/plugins/siem/public/plugin.tsx
new file mode 100644
index 00000000000000..44624f497a91be
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/plugin.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  AppMountParameters,
+  CoreSetup,
+  CoreStart,
+  PluginInitializerContext,
+  Plugin as IPlugin,
+} from '../../../../../src/core/public';
+import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
+import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { IEmbeddableStart } from '../../../../../src/plugins/embeddable/public';
+import { Start as InspectorStart } from '../../../../../src/plugins/inspector/public';
+import { IUiActionsStart } from '../../../../../src/plugins/ui_actions/public';
+
+export { AppMountParameters, CoreSetup, CoreStart, PluginInitializerContext };
+
+export interface SetupPlugins {
+  home: HomePublicPluginSetup;
+}
+export interface StartPlugins {
+  data: DataPublicPluginStart;
+  embeddable: IEmbeddableStart;
+  inspector: InspectorStart;
+  uiActions: IUiActionsStart;
+}
+export type StartServices = CoreStart & StartPlugins;
+
+export type Setup = ReturnType<Plugin['setup']>;
+export type Start = ReturnType<Plugin['start']>;
+
+export class Plugin implements IPlugin<Setup, Start> {
+  public id = 'siem';
+  public name = 'SIEM';
+  constructor(
+    // @ts-ignore this is added to satisfy the New Platform typing constraint,
+    // but we're not leveraging any of its functionality yet.
+    private readonly initializerContext: PluginInitializerContext
+  ) {}
+
+  public setup(core: CoreSetup, plugins: SetupPlugins) {
+    core.application.register({
+      id: this.id,
+      title: this.name,
+      async mount(context, params) {
+        const [coreStart, pluginsStart] = await core.getStartServices();
+        const { renderApp } = await import('./app');
+
+        return renderApp(coreStart, pluginsStart as StartPlugins, params);
+      },
+    });
+
+    return {};
+  }
+
+  public start(core: CoreStart, plugins: StartPlugins) {
+    return {};
+  }
+
+  public stop() {
+    return {};
+  }
+}
diff --git a/x-pack/legacy/plugins/siem/public/register_feature.ts b/x-pack/legacy/plugins/siem/public/register_feature.ts
index 36c4e28dbd8748..ca7a22408b6ff2 100644
--- a/x-pack/legacy/plugins/siem/public/register_feature.ts
+++ b/x-pack/legacy/plugins/siem/public/register_feature.ts
@@ -4,19 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  FeatureCatalogueCategory,
-  FeatureCatalogueRegistryProvider,
-} from 'ui/registry/feature_catalogue';
+import { npSetup } from 'ui/new_platform';
+import { FeatureCatalogueCategory } from '../../../../../src/plugins/home/public';
+import { APP_ID } from '../common/constants';
 
-const APP_ID = 'siem';
-
-FeatureCatalogueRegistryProvider.register(() => ({
-  id: 'siem',
+// TODO(rylnd): move this into Plugin.setup once we're on NP
+npSetup.plugins.home.featureCatalogue.register({
+  id: APP_ID,
   title: 'SIEM',
   description: 'Explore security metrics and logs for events and alerts',
   icon: 'securityAnalyticsApp',
   path: `/app/${APP_ID}`,
   showOnHomePage: true,
   category: FeatureCatalogueCategory.DATA,
-}));
+});

From f5448bd9f47fddfe095b16b96ce519fc11710027 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:38:25 -0600
Subject: [PATCH 38/96] [Logs UI] Refactor log position to hooks (#53540)

* Move URL state to hook

* Fix log filter URL state infinite loop

* Initial refactor of log position to hooks

* Simplify and reimplement controlsShouldDisplayTargetPosition

* Fix live streaming

* Flatten logposition destructuring

* Revert "Move URL state to hook"

This reverts commit 4e04aa061dca5222d3037d158308448c4f3047a2.

# Conflicts:
#	x-pack/legacy/plugins/infra/public/containers/logs/log_filter/use_log_filter_url_state.tsx
#	x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx

* Fix unused imports

* Fix link-to test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../log_text_stream/column_headers.tsx        |  22 ++-
 .../scrollable_log_text_stream_view.tsx       |  25 ++-
 .../containers/logs/log_entries/index.ts      |  39 ++++-
 .../containers/logs/log_highlights/index.ts   |   1 -
 .../logs/log_highlights/log_highlights.tsx    |  16 +-
 .../logs/log_highlights/next_and_previous.tsx |   8 +-
 .../log_highlights/redux_bridge_setters.tsx   |  23 ---
 .../logs/log_highlights/redux_bridges.tsx     |  41 -----
 .../containers/logs/log_position/index.ts     |  31 +---
 .../logs/log_position/log_position_state.ts   | 107 ++++++++++++
 .../with_log_position_url_state.tsx           |  94 ++++++++++
 .../logs/log_summary/with_summary.ts          |  50 +++---
 .../containers/logs/with_log_position.tsx     | 127 --------------
 .../logs/with_log_search_controls_props.ts    |  35 ----
 .../containers/logs/with_stream_items.ts      |   6 +-
 .../public/pages/link_to/redirect_to_logs.tsx |   2 +-
 .../pages/link_to/redirect_to_node_logs.tsx   |   2 +-
 .../pages/logs/stream/page_logs_content.tsx   | 160 ++++++++----------
 .../pages/logs/stream/page_providers.tsx      |  17 +-
 .../public/pages/logs/stream/page_toolbar.tsx |  39 ++---
 .../plugins/infra/public/store/actions.ts     |   7 +-
 .../infra/public/store/local/actions.ts       |   1 -
 .../store/local/log_position/actions.ts       |  39 -----
 .../public/store/local/log_position/epic.ts   |  53 ------
 .../public/store/local/log_position/index.ts  |  11 --
 .../store/local/log_position/reducer.ts       | 120 -------------
 .../store/local/log_position/selectors.ts     |  69 --------
 .../infra/public/store/local/reducer.ts       |   4 -
 .../infra/public/store/local/selectors.ts     |   6 -
 .../plugins/infra/public/store/selectors.ts   |   2 -
 .../plugins/infra/public/store/store.ts       |  13 +-
 x-pack/test/functional/apps/infra/link_to.ts  |   2 +-
 32 files changed, 391 insertions(+), 781 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridge_setters.tsx
 delete mode 100644 x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridges.tsx
 create mode 100644 x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.ts
 create mode 100644 x-pack/legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
 delete mode 100644 x-pack/legacy/plugins/infra/public/containers/logs/with_log_position.tsx
 delete mode 100644 x-pack/legacy/plugins/infra/public/containers/logs/with_log_search_controls_props.ts
 delete mode 100644 x-pack/legacy/plugins/infra/public/store/local/log_position/actions.ts
 delete mode 100644 x-pack/legacy/plugins/infra/public/store/local/log_position/epic.ts
 delete mode 100644 x-pack/legacy/plugins/infra/public/store/local/log_position/index.ts
 delete mode 100644 x-pack/legacy/plugins/infra/public/store/local/log_position/reducer.ts
 delete mode 100644 x-pack/legacy/plugins/infra/public/store/local/log_position/selectors.ts

diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
index bf4a09769d254b..6516993397e025 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useContext } from 'react';
 import { transparentize } from 'polished';
 
 import euiStyled from '../../../../../../common/eui_styled_components';
@@ -21,28 +21,26 @@ import {
   LogEntryColumnWidths,
 } from './log_entry_column';
 import { ASSUMED_SCROLLBAR_WIDTH } from './vertical_scroll_panel';
-import { WithLogPosition } from '../../../containers/logs/with_log_position';
+import { LogPositionState } from '../../../containers/logs/log_position';
 import { localizedDate } from '../../../utils/formatters/datetime';
 
 export const LogColumnHeaders: React.FunctionComponent<{
   columnConfigurations: LogColumnConfiguration[];
   columnWidths: LogEntryColumnWidths;
 }> = ({ columnConfigurations, columnWidths }) => {
+  const { firstVisiblePosition } = useContext(LogPositionState.Context);
   return (
     <LogColumnHeadersWrapper>
       {columnConfigurations.map(columnConfiguration => {
         if (isTimestampLogColumnConfiguration(columnConfiguration)) {
           return (
-            <WithLogPosition key={columnConfiguration.timestampColumn.id}>
-              {({ firstVisiblePosition }) => (
-                <LogColumnHeader
-                  columnWidth={columnWidths[columnConfiguration.timestampColumn.id]}
-                  data-test-subj="logColumnHeader timestampLogColumnHeader"
-                >
-                  {firstVisiblePosition ? localizedDate(firstVisiblePosition.time) : 'Timestamp'}
-                </LogColumnHeader>
-              )}
-            </WithLogPosition>
+            <LogColumnHeader
+              key={columnConfiguration.timestampColumn.id}
+              columnWidth={columnWidths[columnConfiguration.timestampColumn.id]}
+              data-test-subj="logColumnHeader timestampLogColumnHeader"
+            >
+              {firstVisiblePosition ? localizedDate(firstVisiblePosition.time) : 'Timestamp'}
+            </LogColumnHeader>
           );
         } else if (isMessageLogColumnConfiguration(columnConfiguration)) {
           return (
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
index a5b85788fdea9c..84bcfa911125a3 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
@@ -55,17 +55,13 @@ interface ScrollableLogTextStreamViewProps {
   setFlyoutVisibility: (visible: boolean) => void;
   highlightedItem: string | null;
   currentHighlightKey: UniqueTimeKey | null;
-  scrollLock: {
-    enable: () => void;
-    disable: () => void;
-    isEnabled: boolean;
-  };
 }
 
 interface ScrollableLogTextStreamViewState {
   target: TimeKey | null;
   targetId: string | null;
   items: StreamItem[];
+  isScrollLocked: boolean;
 }
 
 export class ScrollableLogTextStreamView extends React.PureComponent<
@@ -81,8 +77,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
 
     // Prevent new entries from being appended and moving the stream forward when
     // the user has scrolled up during live streaming
-    const nextItems =
-      hasItems && nextProps.scrollLock.isEnabled ? prevState.items : nextProps.items;
+    const nextItems = hasItems && prevState.isScrollLocked ? prevState.items : nextProps.items;
 
     if (nextProps.isStreaming && hasItems) {
       return {
@@ -121,6 +116,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
       target: null,
       targetId: null,
       items: props.items,
+      isScrollLocked: false,
     };
   }
 
@@ -137,9 +133,8 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
       lastLoadedTime,
       scale,
       wrap,
-      scrollLock,
     } = this.props;
-    const { targetId, items } = this.state;
+    const { targetId, items, isScrollLocked } = this.state;
     const hasItems = items.length > 0;
     return (
       <ScrollableLogTextStreamViewWrapper>
@@ -187,7 +182,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
                         target={targetId}
                         hideScrollbar={true}
                         data-test-subj={'logStream'}
-                        isLocked={scrollLock.isEnabled}
+                        isLocked={isScrollLocked}
                         entriesCount={items.length}
                       >
                         {registerChild => (
@@ -248,7 +243,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
                               lastStreamingUpdate={isStreaming ? lastLoadedTime : null}
                               onLoadMore={this.handleLoadNewerItems}
                             />
-                            {scrollLock.isEnabled && (
+                            {isScrollLocked && (
                               <LogTextStreamJumpToTail
                                 width={width}
                                 onClickJump={this.handleJumpToTail}
@@ -308,7 +303,9 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
       fromScroll: boolean;
     }) => {
       if (fromScroll && this.props.isStreaming) {
-        this.props.scrollLock[pagesBelow === 0 ? 'disable' : 'enable']();
+        this.setState({
+          isScrollLocked: pagesBelow !== 0,
+        });
       }
       this.props.reportVisibleInterval({
         endKey: parseStreamItemId(bottomChild),
@@ -322,11 +319,11 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
   );
 
   private handleJumpToTail = () => {
-    const { items, scrollLock } = this.props;
-    scrollLock.disable();
+    const { items } = this.props;
     const lastItemTarget = getStreamItemId(items[items.length - 1]);
     this.setState({
       targetId: lastItemTarget,
+      isScrollLocked: false,
     });
   };
 }
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
index 3020ad7eb5f84e..ed82c0854cdea3 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
@@ -5,7 +5,7 @@
  */
 import { useEffect, useState, useReducer, useCallback } from 'react';
 import createContainer from 'constate';
-import { pick, throttle } from 'lodash';
+import { pick, throttle, omit } from 'lodash';
 import { useGraphQLQueries } from './gql_queries';
 import { TimeKey, timeKeyIsBetween } from '../../../../common/time';
 import { InfraLogEntry } from './types';
@@ -45,6 +45,7 @@ interface LogEntriesProps {
   pagesAfterEnd: number | null;
   sourceId: string;
   isAutoReloading: boolean;
+  jumpToTargetPosition: (position: TimeKey) => void;
 }
 
 type FetchEntriesParams = Omit<LogEntriesProps, 'isAutoReloading'>;
@@ -65,7 +66,7 @@ export type LogEntriesStateParams = {
 } & LogEntriesResponse;
 
 export interface LogEntriesCallbacks {
-  fetchNewerEntries: () => Promise<void>;
+  fetchNewerEntries: () => Promise<TimeKey | null | undefined>;
 }
 export const logEntriesInitialCallbacks = {
   fetchNewerEntries: async () => {},
@@ -127,10 +128,13 @@ const useFetchEntriesEffect = (
   const [prevParams, cachePrevParams] = useState(props);
   const [startedStreaming, setStartedStreaming] = useState(false);
 
-  const runFetchNewEntriesRequest = async () => {
+  const runFetchNewEntriesRequest = async (override = {}) => {
     dispatch({ type: Action.FetchingNewEntries });
     try {
-      const payload = await getLogEntriesAround(props);
+      const payload = await getLogEntriesAround({
+        ...omit(props, 'jumpToTargetPosition'),
+        ...override,
+      });
       dispatch({ type: Action.ReceiveNewEntries, payload });
     } catch (e) {
       dispatch({ type: Action.ErrorOnNewEntries });
@@ -150,6 +154,7 @@ const useFetchEntriesEffect = (
         type: getEntriesBefore ? Action.ReceiveEntriesBefore : Action.ReceiveEntriesAfter,
         payload,
       });
+      return payload.entriesEnd;
     } catch (e) {
       dispatch({ type: Action.ErrorOnMoreEntries });
     }
@@ -185,19 +190,37 @@ const useFetchEntriesEffect = (
 
   const fetchNewerEntries = useCallback(
     throttle(() => runFetchMoreEntriesRequest(ShouldFetchMoreEntries.After), 500),
-    [props]
+    [props, state.entriesEnd]
   );
 
-  const streamEntriesEffectDependencies = [props.isAutoReloading, state.isLoadingMore];
+  const streamEntriesEffectDependencies = [
+    props.isAutoReloading,
+    state.isLoadingMore,
+    state.isReloading,
+  ];
   const streamEntriesEffect = () => {
     (async () => {
-      if (props.isAutoReloading && !state.isLoadingMore) {
+      if (props.isAutoReloading && !state.isLoadingMore && !state.isReloading) {
         if (startedStreaming) {
           await new Promise(res => setTimeout(res, 5000));
         } else {
+          const nowKey = {
+            tiebreaker: 0,
+            time: Date.now(),
+          };
+          props.jumpToTargetPosition(nowKey);
           setStartedStreaming(true);
+          if (state.hasMoreAfterEnd) {
+            runFetchNewEntriesRequest({
+              timeKey: nowKey,
+            });
+            return;
+          }
+        }
+        const newEntriesEnd = await runFetchMoreEntriesRequest(ShouldFetchMoreEntries.After);
+        if (newEntriesEnd) {
+          props.jumpToTargetPosition(newEntriesEnd);
         }
-        fetchNewerEntries();
       } else if (!props.isAutoReloading) {
         setStartedStreaming(false);
       }
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/index.ts
index 605e90914b174a..0d548a6a78b1c4 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/index.ts
@@ -5,4 +5,3 @@
  */
 
 export * from './log_highlights';
-export * from './redux_bridges';
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx
index fa1ccb4efa4bb7..a4a94851ad383d 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx
@@ -9,9 +9,9 @@ import { useState, useContext } from 'react';
 import { useLogEntryHighlights } from './log_entry_highlights';
 import { useLogSummaryHighlights } from './log_summary_highlights';
 import { useNextAndPrevious } from './next_and_previous';
-import { useReduxBridgeSetters } from './redux_bridge_setters';
 import { useLogSummaryBufferInterval } from '../log_summary';
 import { LogViewConfiguration } from '../log_view_configuration';
+import { LogPositionState } from '../log_position';
 import { TimeKey } from '../../../../common/time';
 
 export const useLogHighlightsState = ({
@@ -28,14 +28,7 @@ export const useLogHighlightsState = ({
   filterQuery: string | null;
 }) => {
   const [highlightTerms, setHighlightTerms] = useState<string[]>([]);
-  const {
-    visibleMidpoint,
-    setFilterQuery,
-    setVisibleMidpoint,
-    jumpToTarget,
-    setJumpToTarget,
-  } = useReduxBridgeSetters();
-
+  const { visibleMidpoint, jumpToTargetPosition } = useContext(LogPositionState.Context);
   const { intervalSize: summaryIntervalSize } = useContext(LogViewConfiguration.Context);
   const {
     start: summaryStart,
@@ -79,25 +72,22 @@ export const useLogHighlightsState = ({
     visibleMidpoint,
     logEntryHighlights,
     highlightTerms,
-    jumpToTarget,
+    jumpToTargetPosition,
   });
 
   return {
     highlightTerms,
     setHighlightTerms,
-    setFilterQuery,
     logEntryHighlights,
     logEntryHighlightsById,
     logSummaryHighlights,
     loadLogEntryHighlightsRequest,
     loadLogSummaryHighlightsRequest,
-    setVisibleMidpoint,
     currentHighlightKey,
     hasPreviousHighlight,
     hasNextHighlight,
     goToPreviousHighlight,
     goToNextHighlight,
-    setJumpToTarget,
   };
 };
 
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/next_and_previous.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/next_and_previous.tsx
index 62a43a5412825b..7557550883f113 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/next_and_previous.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/next_and_previous.tsx
@@ -17,12 +17,12 @@ import { LogEntryHighlights } from './log_entry_highlights';
 
 export const useNextAndPrevious = ({
   highlightTerms,
-  jumpToTarget,
+  jumpToTargetPosition,
   logEntryHighlights,
   visibleMidpoint,
 }: {
   highlightTerms: string[];
-  jumpToTarget: (target: TimeKey) => void;
+  jumpToTargetPosition: (target: TimeKey) => void;
   logEntryHighlights: LogEntryHighlights | undefined;
   visibleMidpoint: TimeKey | null;
 }) => {
@@ -41,9 +41,9 @@ export const useNextAndPrevious = ({
 
   useEffect(() => {
     if (currentTimeKey) {
-      jumpToTarget(currentTimeKey);
+      jumpToTargetPosition(currentTimeKey);
     }
-  }, [currentTimeKey, jumpToTarget]);
+  }, [currentTimeKey, jumpToTargetPosition]);
 
   useEffect(() => {
     if (currentTimeKey === null && entries.length > 0) {
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridge_setters.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridge_setters.tsx
deleted file mode 100644
index 0e778f35188f0a..00000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridge_setters.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useState } from 'react';
-import { TimeKey } from '../../../../common/time';
-
-export const useReduxBridgeSetters = () => {
-  const [filterQuery, setFilterQuery] = useState<string | null>(null);
-  const [visibleMidpoint, setVisibleMidpoint] = useState<TimeKey | null>(null);
-  const [jumpToTarget, setJumpToTarget] = useState<(target: TimeKey) => void>(() => undefined);
-
-  return {
-    filterQuery,
-    visibleMidpoint,
-    setFilterQuery,
-    setVisibleMidpoint,
-    jumpToTarget,
-    setJumpToTarget,
-  };
-};
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridges.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridges.tsx
deleted file mode 100644
index 393caae52511f8..00000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridges.tsx
+++ /dev/null
@@ -1,41 +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, { useEffect, useContext } from 'react';
-
-import { TimeKey } from '../../../../common/time';
-import { withLogPosition } from '../with_log_position';
-import { LogHighlightsState } from './log_highlights';
-
-// Bridges Redux container state with Hooks state. Once state is moved fully from
-// Redux to Hooks this can be removed.
-
-export const LogHighlightsPositionBridge = withLogPosition(
-  ({
-    visibleMidpoint,
-    jumpToTargetPosition,
-  }: {
-    visibleMidpoint: TimeKey | null;
-    jumpToTargetPosition: (target: TimeKey) => void;
-  }) => {
-    const { setJumpToTarget, setVisibleMidpoint } = useContext(LogHighlightsState.Context);
-    useEffect(() => {
-      setVisibleMidpoint(visibleMidpoint);
-    }, [setVisibleMidpoint, visibleMidpoint]);
-
-    useEffect(() => {
-      setJumpToTarget(() => jumpToTargetPosition);
-    }, [jumpToTargetPosition, setJumpToTarget]);
-
-    return null;
-  }
-);
-
-export const LogHighlightsBridge = () => (
-  <>
-    <LogHighlightsPositionBridge />
-  </>
-);
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/index.ts
index 7cc8050aafd146..54a2bc88ad3d01 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/index.ts
@@ -4,32 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useContext } from 'react';
-import createContainer from 'constate';
-import { ReduxStateContext } from '../../../utils/redux_context';
-import { logPositionSelectors as logPositionReduxSelectors } from '../../../store/local/selectors';
-import { TimeKey } from '../../../../common/time';
-
-export const useLogPositionState = () => {
-  const { local: state } = useContext(ReduxStateContext);
-  const timeKey = logPositionReduxSelectors.selectVisibleMidpointOrTarget(state);
-  const pages = logPositionReduxSelectors.selectPagesBeforeAndAfter(state);
-  const isAutoReloading = logPositionReduxSelectors.selectIsAutoReloading(state);
-  return { timeKey, isAutoReloading, ...pages };
-};
-
-export interface LogPositionStateParams {
-  timeKey: TimeKey | null;
-  pagesAfterEnd: number | null;
-  pagesBeforeStart: number | null;
-  isAutoReloading: boolean;
-}
-
-export const logPositionInitialState = {
-  timeKey: null,
-  pagesAfterEnd: null,
-  pagesBeforeStart: null,
-  isAutoReloading: false,
-};
-
-export const LogPositionState = createContainer(useLogPositionState);
+export * from './log_position_state';
+export * from './with_log_position_url_state';
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.ts
new file mode 100644
index 00000000000000..1a8274024bd265
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.ts
@@ -0,0 +1,107 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useState, useMemo, useEffect, useCallback } from 'react';
+import createContainer from 'constate';
+import { TimeKey } from '../../../../common/time';
+
+type TimeKeyOrNull = TimeKey | null;
+
+interface VisiblePositions {
+  startKey: TimeKeyOrNull;
+  middleKey: TimeKeyOrNull;
+  endKey: TimeKeyOrNull;
+  pagesAfterEnd: number;
+  pagesBeforeStart: number;
+}
+
+export interface LogPositionStateParams {
+  targetPosition: TimeKeyOrNull;
+  isAutoReloading: boolean;
+  firstVisiblePosition: TimeKeyOrNull;
+  pagesBeforeStart: number;
+  pagesAfterEnd: number;
+  visibleMidpoint: TimeKeyOrNull;
+  visibleMidpointTime: number | null;
+  visibleTimeInterval: { start: number; end: number } | null;
+}
+
+export interface LogPositionCallbacks {
+  jumpToTargetPosition: (pos: TimeKeyOrNull) => void;
+  jumpToTargetPositionTime: (time: number) => void;
+  reportVisiblePositions: (visPos: VisiblePositions) => void;
+  startLiveStreaming: () => void;
+  stopLiveStreaming: () => void;
+}
+
+const useVisibleMidpoint = (middleKey: TimeKeyOrNull, targetPosition: TimeKeyOrNull) => {
+  // Of the two dependencies `middleKey` and `targetPosition`, return
+  // whichever one was the most recently updated. This allows the UI controls
+  // to display a newly-selected `targetPosition` before loading new data;
+  // otherwise the previous `middleKey` would linger in the UI for the entirety
+  // of the loading operation, which the user could perceive as unresponsiveness
+  const [store, update] = useState({
+    middleKey,
+    targetPosition,
+    currentValue: middleKey || targetPosition,
+  });
+  useEffect(() => {
+    if (middleKey !== store.middleKey) {
+      update({ targetPosition, middleKey, currentValue: middleKey });
+    } else if (targetPosition !== store.targetPosition) {
+      update({ targetPosition, middleKey, currentValue: targetPosition });
+    }
+  }, [middleKey, targetPosition]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  return store.currentValue;
+};
+
+export const useLogPositionState: () => LogPositionStateParams & LogPositionCallbacks = () => {
+  const [targetPosition, jumpToTargetPosition] = useState<TimeKey | null>(null);
+  const [isAutoReloading, setIsAutoReloading] = useState(false);
+  const [visiblePositions, reportVisiblePositions] = useState<VisiblePositions>({
+    endKey: null,
+    middleKey: null,
+    startKey: null,
+    pagesBeforeStart: Infinity,
+    pagesAfterEnd: Infinity,
+  });
+
+  const { startKey, middleKey, endKey, pagesBeforeStart, pagesAfterEnd } = visiblePositions;
+
+  const visibleMidpoint = useVisibleMidpoint(middleKey, targetPosition);
+
+  const visibleTimeInterval = useMemo(
+    () => (startKey && endKey ? { start: startKey.time, end: endKey.time } : null),
+    [startKey, endKey]
+  );
+
+  const state = {
+    targetPosition,
+    isAutoReloading,
+    firstVisiblePosition: startKey,
+    pagesBeforeStart,
+    pagesAfterEnd,
+    visibleMidpoint,
+    visibleMidpointTime: visibleMidpoint ? visibleMidpoint.time : null,
+    visibleTimeInterval,
+  };
+
+  const callbacks = {
+    jumpToTargetPosition,
+    jumpToTargetPositionTime: useCallback(
+      (time: number) => jumpToTargetPosition({ tiebreaker: 0, time }),
+      [jumpToTargetPosition]
+    ),
+    reportVisiblePositions,
+    startLiveStreaming: useCallback(() => setIsAutoReloading(true), [setIsAutoReloading]),
+    stopLiveStreaming: useCallback(() => setIsAutoReloading(false), [setIsAutoReloading]),
+  };
+
+  return { ...state, ...callbacks };
+};
+
+export const LogPositionState = createContainer(useLogPositionState);
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
new file mode 100644
index 00000000000000..a877750587be4c
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.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 React, { useContext, useMemo } from 'react';
+
+import { pickTimeKey } from '../../../../common/time';
+import { replaceStateKeyInQueryString, UrlStateContainer } from '../../../utils/url_state';
+import { LogPositionState, LogPositionStateParams } from './log_position_state';
+
+/**
+ * Url State
+ */
+
+interface LogPositionUrlState {
+  position: LogPositionStateParams['visibleMidpoint'] | undefined;
+  streamLive?: boolean | undefined;
+}
+
+export const WithLogPositionUrlState = () => {
+  const {
+    visibleMidpoint,
+    isAutoReloading,
+    jumpToTargetPosition,
+    jumpToTargetPositionTime,
+    startLiveStreaming,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
+  const urlState = useMemo(
+    () => ({
+      position: visibleMidpoint ? pickTimeKey(visibleMidpoint) : null,
+      streamLive: isAutoReloading,
+    }),
+    [visibleMidpoint, isAutoReloading]
+  );
+  return (
+    <UrlStateContainer
+      urlState={urlState}
+      urlStateKey="logPosition"
+      mapToUrlState={mapToUrlState}
+      onChange={(newUrlState: LogPositionUrlState | undefined) => {
+        if (newUrlState && newUrlState.position) {
+          jumpToTargetPosition(newUrlState.position);
+        }
+        if (newUrlState && newUrlState.streamLive) {
+          startLiveStreaming();
+        } else if (
+          newUrlState &&
+          typeof newUrlState.streamLive !== 'undefined' &&
+          !newUrlState.streamLive
+        ) {
+          stopLiveStreaming();
+        }
+      }}
+      onInitialize={(initialUrlState: LogPositionUrlState | undefined) => {
+        if (initialUrlState && initialUrlState.position) {
+          jumpToTargetPosition(initialUrlState.position);
+        } else {
+          jumpToTargetPositionTime(Date.now());
+        }
+        if (initialUrlState && initialUrlState.streamLive) {
+          startLiveStreaming();
+        }
+      }}
+    />
+  );
+};
+
+const mapToUrlState = (value: any): LogPositionUrlState | undefined =>
+  value
+    ? {
+        position: mapToPositionUrlState(value.position),
+        streamLive: mapToStreamLiveUrlState(value.streamLive),
+      }
+    : undefined;
+
+const mapToPositionUrlState = (value: any) =>
+  value && typeof value.time === 'number' && typeof value.tiebreaker === 'number'
+    ? pickTimeKey(value)
+    : undefined;
+
+const mapToStreamLiveUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined);
+
+export const replaceLogPositionInQueryString = (time: number) =>
+  Number.isNaN(time)
+    ? (value: string) => value
+    : replaceStateKeyInQueryString<LogPositionUrlState>('logPosition', {
+        position: {
+          time,
+          tiebreaker: 0,
+        },
+      });
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts
index 7971c12bdfda0d..4db0d2e645448c 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts
@@ -5,40 +5,34 @@
  */
 
 import { useContext } from 'react';
-import { connect } from 'react-redux';
 
-import { logPositionSelectors, State } from '../../../store';
 import { RendererFunction } from '../../../utils/typed_react';
 import { Source } from '../../source';
 import { LogViewConfiguration } from '../log_view_configuration';
 import { LogSummaryBuckets, useLogSummary } from './log_summary';
 import { LogFilterState } from '../log_filter';
+import { LogPositionState } from '../log_position';
 
-export const WithSummary = connect((state: State) => ({
-  visibleMidpointTime: logPositionSelectors.selectVisibleMidpointOrTargetTime(state),
-}))(
-  ({
-    children,
-    visibleMidpointTime,
-  }: {
-    children: RendererFunction<{
-      buckets: LogSummaryBuckets;
-      start: number | null;
-      end: number | null;
-    }>;
-    visibleMidpointTime: number | null;
-  }) => {
-    const { intervalSize } = useContext(LogViewConfiguration.Context);
-    const { sourceId } = useContext(Source.Context);
-    const { filterQuery } = useContext(LogFilterState.Context);
+export const WithSummary = ({
+  children,
+}: {
+  children: RendererFunction<{
+    buckets: LogSummaryBuckets;
+    start: number | null;
+    end: number | null;
+  }>;
+}) => {
+  const { intervalSize } = useContext(LogViewConfiguration.Context);
+  const { sourceId } = useContext(Source.Context);
+  const { filterQuery } = useContext(LogFilterState.Context);
+  const { visibleMidpointTime } = useContext(LogPositionState.Context);
 
-    const { buckets, start, end } = useLogSummary(
-      sourceId,
-      visibleMidpointTime,
-      intervalSize,
-      filterQuery
-    );
+  const { buckets, start, end } = useLogSummary(
+    sourceId,
+    visibleMidpointTime,
+    intervalSize,
+    filterQuery
+  );
 
-    return children({ buckets, start, end });
-  }
-);
+  return children({ buckets, start, end });
+};
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_position.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/with_log_position.tsx
deleted file mode 100644
index 075f3904d994c2..00000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_position.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import { pickTimeKey } from '../../../common/time';
-import { logPositionActions, logPositionSelectors, State } from '../../store';
-import { asChildFunctionRenderer } from '../../utils/typed_react';
-import { bindPlainActionCreators } from '../../utils/typed_redux';
-import { replaceStateKeyInQueryString, UrlStateContainer } from '../../utils/url_state';
-
-export const withLogPosition = connect(
-  (state: State) => ({
-    firstVisiblePosition: logPositionSelectors.selectFirstVisiblePosition(state),
-    isAutoReloading: logPositionSelectors.selectIsAutoReloading(state),
-    isScrollLocked: logPositionSelectors.selectAutoReloadScrollLock(state),
-    lastVisiblePosition: logPositionSelectors.selectFirstVisiblePosition(state),
-    targetPosition: logPositionSelectors.selectTargetPosition(state),
-    urlState: selectPositionUrlState(state),
-    visibleTimeInterval: logPositionSelectors.selectVisibleTimeInterval(state),
-    visibleMidpoint: logPositionSelectors.selectVisibleMidpointOrTarget(state),
-    visibleMidpointTime: logPositionSelectors.selectVisibleMidpointOrTargetTime(state),
-  }),
-  bindPlainActionCreators({
-    jumpToTargetPosition: logPositionActions.jumpToTargetPosition,
-    jumpToTargetPositionTime: logPositionActions.jumpToTargetPositionTime,
-    reportVisiblePositions: logPositionActions.reportVisiblePositions,
-    startLiveStreaming: logPositionActions.startAutoReload,
-    stopLiveStreaming: logPositionActions.stopAutoReload,
-    scrollLockLiveStreaming: logPositionActions.lockAutoReloadScroll,
-    scrollUnlockLiveStreaming: logPositionActions.unlockAutoReloadScroll,
-  })
-);
-
-export const WithLogPosition = asChildFunctionRenderer(withLogPosition, {
-  onCleanup: ({ stopLiveStreaming }) => stopLiveStreaming(),
-});
-
-/**
- * Url State
- */
-
-interface LogPositionUrlState {
-  position?: ReturnType<typeof logPositionSelectors.selectVisibleMidpointOrTarget>;
-  streamLive?: ReturnType<typeof logPositionSelectors.selectIsAutoReloading>;
-}
-
-export const WithLogPositionUrlState = () => (
-  <WithLogPosition>
-    {({
-      jumpToTargetPosition,
-      jumpToTargetPositionTime,
-      startLiveStreaming,
-      stopLiveStreaming,
-      urlState,
-    }) => (
-      <UrlStateContainer
-        urlState={urlState}
-        urlStateKey="logPosition"
-        mapToUrlState={mapToUrlState}
-        onChange={newUrlState => {
-          if (newUrlState && newUrlState.position) {
-            jumpToTargetPosition(newUrlState.position);
-          }
-          if (newUrlState && newUrlState.streamLive) {
-            startLiveStreaming();
-          } else if (
-            newUrlState &&
-            typeof newUrlState.streamLive !== 'undefined' &&
-            !newUrlState.streamLive
-          ) {
-            stopLiveStreaming();
-          }
-        }}
-        onInitialize={initialUrlState => {
-          if (initialUrlState && initialUrlState.position) {
-            jumpToTargetPosition(initialUrlState.position);
-          } else {
-            jumpToTargetPositionTime(Date.now());
-          }
-          if (initialUrlState && initialUrlState.streamLive) {
-            startLiveStreaming();
-          }
-        }}
-      />
-    )}
-  </WithLogPosition>
-);
-
-const selectPositionUrlState = createSelector(
-  logPositionSelectors.selectVisibleMidpointOrTarget,
-  logPositionSelectors.selectIsAutoReloading,
-  (position, streamLive) => ({
-    position: position ? pickTimeKey(position) : null,
-    streamLive,
-  })
-);
-
-const mapToUrlState = (value: any): LogPositionUrlState | undefined =>
-  value
-    ? {
-        position: mapToPositionUrlState(value.position),
-        streamLive: mapToStreamLiveUrlState(value.streamLive),
-      }
-    : undefined;
-
-const mapToPositionUrlState = (value: any) =>
-  value && typeof value.time === 'number' && typeof value.tiebreaker === 'number'
-    ? pickTimeKey(value)
-    : undefined;
-
-const mapToStreamLiveUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined);
-
-export const replaceLogPositionInQueryString = (time: number) =>
-  Number.isNaN(time)
-    ? (value: string) => value
-    : replaceStateKeyInQueryString<LogPositionUrlState>('logPosition', {
-        position: {
-          time,
-          tiebreaker: 0,
-        },
-      });
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_search_controls_props.ts b/x-pack/legacy/plugins/infra/public/containers/logs/with_log_search_controls_props.ts
deleted file mode 100644
index e387da9575426c..00000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_search_controls_props.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/**
- * Temporary Workaround
- * This is not a well-designed container. It only exists to enable quick
- * migration of the redux-based logging ui into the infra-ui codebase. It will
- * be removed during the refactoring to graphql/apollo.
- */
-import { connect } from 'react-redux';
-import { bindPlainActionCreators } from '../../utils/typed_redux';
-
-import {
-  // searchActions,
-  // searchResultsSelectors,
-  // sharedSelectors,
-  logPositionActions,
-  State,
-} from '../../store';
-
-export const withLogSearchControlsProps = connect(
-  (state: State) => ({
-    // isLoadingSearchResults: searchResultsSelectors.selectIsLoadingSearchResults(state),
-    // nextSearchResult: sharedSelectors.selectNextSearchResultKey(state),
-    // previousSearchResult: sharedSelectors.selectPreviousSearchResultKey(state),
-  }),
-  bindPlainActionCreators({
-    // clearSearch: searchActions.clearSearch,
-    jumpToTarget: logPositionActions.jumpToTargetPosition,
-    // search: searchActions.search,
-  })
-);
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/with_stream_items.ts b/x-pack/legacy/plugins/infra/public/containers/logs/with_stream_items.ts
index 9b20676486af29..6da9cd7513cbab 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/with_stream_items.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/with_stream_items.ts
@@ -10,7 +10,6 @@ import { LogEntry, LogEntryHighlight } from '../../utils/log_entry';
 import { RendererFunction } from '../../utils/typed_react';
 // deep inporting to avoid a circular import problem
 import { LogHighlightsState } from './log_highlights/log_highlights';
-import { LogPositionState } from './log_position';
 import { LogEntriesState, LogEntriesStateParams, LogEntriesCallbacks } from './log_entries';
 import { UniqueTimeKey } from '../../../common/time';
 
@@ -24,18 +23,17 @@ export const WithStreamItems: React.FunctionComponent<{
   >;
 }> = ({ children }) => {
   const [logEntries, logEntriesCallbacks] = useContext(LogEntriesState.Context);
-  const { isAutoReloading } = useContext(LogPositionState.Context);
   const { currentHighlightKey, logEntryHighlightsById } = useContext(LogHighlightsState.Context);
 
   const items = useMemo(
     () =>
-      logEntries.isReloading && !isAutoReloading
+      logEntries.isReloading
         ? []
         : logEntries.entries.map(logEntry =>
             createLogEntryStreamItem(logEntry, logEntryHighlightsById[logEntry.gid] || [])
           ),
 
-    [isAutoReloading, logEntries.entries, logEntries.isReloading, logEntryHighlightsById]
+    [logEntries.entries, logEntries.isReloading, logEntryHighlightsById]
   );
 
   return children({
diff --git a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_logs.tsx b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_logs.tsx
index bfa1ede4236aa4..b3fcaff75aafdd 100644
--- a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_logs.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_logs.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { match as RouteMatch, Redirect, RouteComponentProps } from 'react-router-dom';
 
 import { replaceLogFilterInQueryString } from '../../containers/logs/log_filter';
-import { replaceLogPositionInQueryString } from '../../containers/logs/with_log_position';
+import { replaceLogPositionInQueryString } from '../../containers/logs/log_position';
 import { replaceSourceIdInQueryString } from '../../containers/source_id';
 import { getFilterFromLocation, getTimeFromLocation } from './query_params';
 
diff --git a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
index 73d0633cb901b2..99b558cf1cafab 100644
--- a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
@@ -12,7 +12,7 @@ import { Redirect, RouteComponentProps } from 'react-router-dom';
 
 import { LoadingPage } from '../../components/loading_page';
 import { replaceLogFilterInQueryString } from '../../containers/logs/log_filter';
-import { replaceLogPositionInQueryString } from '../../containers/logs/with_log_position';
+import { replaceLogPositionInQueryString } from '../../containers/logs/log_position';
 import { replaceSourceIdInQueryString } from '../../containers/source_id';
 import { InfraNodeType, SourceConfigurationFields } from '../../graphql/types';
 import { getFilterFromLocation, getTimeFromLocation } from './query_params';
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
index aff2a3b431067a..f789c16b67d9c8 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -21,14 +21,13 @@ import {
   WithFlyoutOptionsUrlState,
 } from '../../../containers/logs/log_flyout';
 import { WithLogMinimapUrlState } from '../../../containers/logs/with_log_minimap';
-import { WithLogPositionUrlState } from '../../../containers/logs/with_log_position';
-import { WithLogPosition } from '../../../containers/logs/with_log_position';
+import { LogPositionState } from '../../../containers/logs/log_position';
 import { WithLogTextviewUrlState } from '../../../containers/logs/with_log_textview';
 import { WithStreamItems } from '../../../containers/logs/with_stream_items';
 import { Source } from '../../../containers/source';
 
 import { LogsToolbar } from './page_toolbar';
-import { LogHighlightsBridge, LogHighlightsState } from '../../../containers/logs/log_highlights';
+import { LogHighlightsState } from '../../../containers/logs/log_highlights';
 
 export const LogsPageLogsContent: React.FunctionComponent = () => {
   const { source, sourceId, version } = useContext(Source.Context);
@@ -44,110 +43,91 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
   } = useContext(LogFlyoutState.Context);
   const { logSummaryHighlights } = useContext(LogHighlightsState.Context);
   const { applyLogFilterQuery } = useContext(LogFilterState.Context);
+  const {
+    isAutoReloading,
+    targetPosition,
+    visibleMidpointTime,
+    visibleTimeInterval,
+    reportVisiblePositions,
+    jumpToTargetPosition,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
   return (
     <>
-      <LogHighlightsBridge />
-      <WithLogPositionUrlState />
       <WithLogMinimapUrlState />
       <WithLogTextviewUrlState />
       <WithFlyoutOptionsUrlState />
       <LogsToolbar />
-      <WithLogPosition>
-        {({ jumpToTargetPosition, stopLiveStreaming }) =>
-          flyoutVisible ? (
-            <LogEntryFlyout
-              setFilter={applyLogFilterQuery}
-              setTarget={(timeKey, flyoutItemId) => {
-                jumpToTargetPosition(timeKey);
-                setSurroundingLogsId(flyoutItemId);
-                stopLiveStreaming();
-              }}
-              setFlyoutVisibility={setFlyoutVisibility}
-              flyoutItem={flyoutItem}
-              loading={isLoading}
-            />
-          ) : null
-        }
-      </WithLogPosition>
+      {flyoutVisible ? (
+        <LogEntryFlyout
+          setFilter={applyLogFilterQuery}
+          setTarget={(timeKey, flyoutItemId) => {
+            jumpToTargetPosition(timeKey);
+            setSurroundingLogsId(flyoutItemId);
+            stopLiveStreaming();
+          }}
+          setFlyoutVisibility={setFlyoutVisibility}
+          flyoutItem={flyoutItem}
+          loading={isLoading}
+        />
+      ) : null}
       <PageContent key={`${sourceId}-${version}`}>
-        <WithLogPosition>
+        <WithStreamItems>
           {({
-            isAutoReloading,
-            jumpToTargetPosition,
-            reportVisiblePositions,
-            targetPosition,
-            scrollLockLiveStreaming,
-            scrollUnlockLiveStreaming,
-            isScrollLocked,
+            currentHighlightKey,
+            hasMoreAfterEnd,
+            hasMoreBeforeStart,
+            isLoadingMore,
+            isReloading,
+            items,
+            lastLoadedTime,
+            fetchNewerEntries,
           }) => (
-            <WithStreamItems>
-              {({
-                currentHighlightKey,
-                hasMoreAfterEnd,
-                hasMoreBeforeStart,
-                isLoadingMore,
-                isReloading,
-                items,
-                lastLoadedTime,
-                fetchNewerEntries,
-              }) => (
-                <ScrollableLogTextStreamView
-                  columnConfigurations={(source && source.configuration.logColumns) || []}
-                  hasMoreAfterEnd={hasMoreAfterEnd}
-                  hasMoreBeforeStart={hasMoreBeforeStart}
-                  isLoadingMore={isLoadingMore}
-                  isReloading={isReloading}
-                  isStreaming={isAutoReloading}
-                  items={items}
-                  jumpToTarget={jumpToTargetPosition}
-                  lastLoadedTime={lastLoadedTime}
-                  loadNewerItems={fetchNewerEntries}
-                  reportVisibleInterval={reportVisiblePositions}
-                  scale={textScale}
-                  target={targetPosition}
-                  wrap={textWrap}
-                  setFlyoutItem={setFlyoutId}
-                  setFlyoutVisibility={setFlyoutVisibility}
-                  highlightedItem={surroundingLogsId ? surroundingLogsId : null}
-                  currentHighlightKey={currentHighlightKey}
-                  scrollLock={{
-                    enable: scrollLockLiveStreaming,
-                    disable: scrollUnlockLiveStreaming,
-                    isEnabled: isScrollLocked,
-                  }}
-                />
-              )}
-            </WithStreamItems>
+            <ScrollableLogTextStreamView
+              columnConfigurations={(source && source.configuration.logColumns) || []}
+              hasMoreAfterEnd={hasMoreAfterEnd}
+              hasMoreBeforeStart={hasMoreBeforeStart}
+              isLoadingMore={isLoadingMore}
+              isReloading={isReloading}
+              isStreaming={isAutoReloading}
+              items={items}
+              jumpToTarget={jumpToTargetPosition}
+              lastLoadedTime={lastLoadedTime}
+              loadNewerItems={fetchNewerEntries}
+              reportVisibleInterval={reportVisiblePositions}
+              scale={textScale}
+              target={targetPosition}
+              wrap={textWrap}
+              setFlyoutItem={setFlyoutId}
+              setFlyoutVisibility={setFlyoutVisibility}
+              highlightedItem={surroundingLogsId ? surroundingLogsId : null}
+              currentHighlightKey={currentHighlightKey}
+            />
           )}
-        </WithLogPosition>
+        </WithStreamItems>
+
         <AutoSizer content bounds detectAnyWindowResize="height">
           {({ measureRef, bounds: { height = 0 }, content: { width = 0 } }) => {
             return (
               <LogPageMinimapColumn ref={measureRef}>
                 <WithSummary>
                   {({ buckets }) => (
-                    <WithLogPosition>
-                      {({ jumpToTargetPosition, visibleMidpointTime, visibleTimeInterval }) => (
-                        <WithStreamItems>
-                          {({ isReloading }) => (
-                            <LogMinimap
-                              height={height}
-                              width={width}
-                              highlightedInterval={isReloading ? null : visibleTimeInterval}
-                              intervalSize={intervalSize}
-                              jumpToTarget={jumpToTargetPosition}
-                              summaryBuckets={buckets}
-                              summaryHighlightBuckets={
-                                logSummaryHighlights.length > 0
-                                  ? logSummaryHighlights[0].buckets
-                                  : []
-                              }
-                              target={visibleMidpointTime}
-                            />
-                          )}
-                        </WithStreamItems>
+                    <WithStreamItems>
+                      {({ isReloading }) => (
+                        <LogMinimap
+                          height={height}
+                          width={width}
+                          highlightedInterval={isReloading ? null : visibleTimeInterval}
+                          intervalSize={intervalSize}
+                          jumpToTarget={jumpToTargetPosition}
+                          summaryBuckets={buckets}
+                          summaryHighlightBuckets={
+                            logSummaryHighlights.length > 0 ? logSummaryHighlights[0].buckets : []
+                          }
+                          target={visibleMidpointTime}
+                        />
                       )}
-                    </WithLogPosition>
+                    </WithStreamItems>
                   )}
                 </WithSummary>
               </LogPageMinimapColumn>
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx
index 63425368b040f2..d19f27bf1286ea 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx
@@ -9,7 +9,7 @@ import React, { useContext } from 'react';
 import { LogFlyout } from '../../../containers/logs/log_flyout';
 import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
 import { LogHighlightsState } from '../../../containers/logs/log_highlights/log_highlights';
-import { LogPositionState } from '../../../containers/logs/log_position';
+import { LogPositionState, WithLogPositionUrlState } from '../../../containers/logs/log_position';
 import { LogFilterState, WithLogFilterUrlState } from '../../../containers/logs/log_filter';
 import { LogEntriesState } from '../../../containers/logs/log_entries';
 
@@ -28,17 +28,23 @@ const LogFilterStateProvider: React.FC = ({ children }) => {
 
 const LogEntriesStateProvider: React.FC = ({ children }) => {
   const { sourceId } = useContext(Source.Context);
-  const { timeKey, pagesBeforeStart, pagesAfterEnd, isAutoReloading } = useContext(
-    LogPositionState.Context
-  );
+  const {
+    targetPosition,
+    pagesBeforeStart,
+    pagesAfterEnd,
+    isAutoReloading,
+    jumpToTargetPosition,
+  } = useContext(LogPositionState.Context);
   const { filterQuery } = useContext(LogFilterState.Context);
+
   const entriesProps = {
-    timeKey,
+    timeKey: targetPosition,
     pagesBeforeStart,
     pagesAfterEnd,
     filterQuery,
     sourceId,
     isAutoReloading,
+    jumpToTargetPosition,
   };
   return <LogEntriesState.Provider {...entriesProps}>{children}</LogEntriesState.Provider>;
 };
@@ -62,6 +68,7 @@ export const LogsPageProviders: React.FunctionComponent = ({ children }) => {
     <LogViewConfiguration.Provider>
       <LogFlyout.Provider>
         <LogPositionState.Provider>
+          <WithLogPositionUrlState />
           <LogFilterStateProvider>
             <LogEntriesStateProvider>
               <LogHighlightsStateProvider>{children}</LogHighlightsStateProvider>
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
index 84be3eeaf238dd..000dfd1065f12f 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
@@ -20,7 +20,7 @@ import { LogTimeControls } from '../../../components/logging/log_time_controls';
 import { LogFlyout } from '../../../containers/logs/log_flyout';
 import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
 import { LogFilterState } from '../../../containers/logs/log_filter';
-import { WithLogPosition } from '../../../containers/logs/with_log_position';
+import { LogPositionState } from '../../../containers/logs/log_position';
 import { Source } from '../../../containers/source';
 import { WithKueryAutocompletion } from '../../../containers/with_kuery_autocompletion';
 
@@ -54,6 +54,13 @@ export const LogsToolbar = () => {
     goToPreviousHighlight,
     goToNextHighlight,
   } = useContext(LogHighlightsState.Context);
+  const {
+    visibleMidpointTime,
+    isAutoReloading,
+    jumpToTargetPositionTime,
+    startLiveStreaming,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
   return (
     <Toolbar>
       <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="s">
@@ -114,26 +121,16 @@ export const LogsToolbar = () => {
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <WithLogPosition resetOnUnmount>
-            {({
-              visibleMidpointTime,
-              isAutoReloading,
-              jumpToTargetPositionTime,
-              startLiveStreaming,
-              stopLiveStreaming,
-            }) => (
-              <LogTimeControls
-                currentTime={visibleMidpointTime}
-                isLiveStreaming={isAutoReloading}
-                jumpToTime={jumpToTargetPositionTime}
-                startLiveStreaming={() => {
-                  startLiveStreaming();
-                  setSurroundingLogsId(null);
-                }}
-                stopLiveStreaming={stopLiveStreaming}
-              />
-            )}
-          </WithLogPosition>
+          <LogTimeControls
+            currentTime={visibleMidpointTime}
+            isLiveStreaming={isAutoReloading}
+            jumpToTime={jumpToTargetPositionTime}
+            startLiveStreaming={() => {
+              startLiveStreaming();
+              setSurroundingLogsId(null);
+            }}
+            stopLiveStreaming={stopLiveStreaming}
+          />
         </EuiFlexItem>
       </EuiFlexGroup>
     </Toolbar>
diff --git a/x-pack/legacy/plugins/infra/public/store/actions.ts b/x-pack/legacy/plugins/infra/public/store/actions.ts
index ce0c0d8a4e01b4..8a5d1f6c668d0b 100644
--- a/x-pack/legacy/plugins/infra/public/store/actions.ts
+++ b/x-pack/legacy/plugins/infra/public/store/actions.ts
@@ -4,9 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export {
-  logPositionActions,
-  waffleFilterActions,
-  waffleTimeActions,
-  waffleOptionsActions,
-} from './local';
+export { waffleFilterActions, waffleTimeActions, waffleOptionsActions } from './local';
diff --git a/x-pack/legacy/plugins/infra/public/store/local/actions.ts b/x-pack/legacy/plugins/infra/public/store/local/actions.ts
index 1827005e5e5e13..1c79d5a515cd4e 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/actions.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/actions.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { logPositionActions } from './log_position';
 export { waffleFilterActions } from './waffle_filter';
 export { waffleTimeActions } from './waffle_time';
 export { waffleOptionsActions } from './waffle_options';
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/actions.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/actions.ts
deleted file mode 100644
index ad83b6fda1b04b..00000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/actions.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import actionCreatorFactory from 'typescript-fsa';
-
-import { TimeKey } from '../../../../common/time';
-
-const actionCreator = actionCreatorFactory('x-pack/infra/local/log_position');
-
-export const jumpToTargetPosition = actionCreator<TimeKey>('JUMP_TO_TARGET_POSITION');
-
-export const jumpToTargetPositionTime = (time: number, fromAutoReload: boolean = false) =>
-  jumpToTargetPosition({
-    tiebreaker: 0,
-    time,
-    fromAutoReload,
-  });
-
-export interface ReportVisiblePositionsPayload {
-  pagesAfterEnd: number;
-  pagesBeforeStart: number;
-  endKey: TimeKey | null;
-  middleKey: TimeKey | null;
-  startKey: TimeKey | null;
-  fromScroll: boolean;
-}
-
-export const reportVisiblePositions = actionCreator<ReportVisiblePositionsPayload>(
-  'REPORT_VISIBLE_POSITIONS'
-);
-
-export const startAutoReload = actionCreator('START_AUTO_RELOAD');
-export const stopAutoReload = actionCreator('STOP_AUTO_RELOAD');
-
-export const lockAutoReloadScroll = actionCreator('LOCK_AUTO_RELOAD_SCROLL');
-export const unlockAutoReloadScroll = actionCreator('UNLOCK_AUTO_RELOAD_SCROLL');
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/epic.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/epic.ts
deleted file mode 100644
index de9e806469b06d..00000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/epic.ts
+++ /dev/null
@@ -1,53 +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 { Action } from 'redux';
-import { Epic, combineEpics } from 'redux-observable';
-import { timer } from 'rxjs';
-import { exhaustMap, filter, map, takeUntil, mapTo, withLatestFrom } from 'rxjs/operators';
-
-import {
-  jumpToTargetPosition,
-  jumpToTargetPositionTime,
-  startAutoReload,
-  stopAutoReload,
-} from './actions';
-
-const LIVE_STREAM_INTERVAL = 5000;
-
-const createLiveStreamEpic = <State>(): Epic<
-  Action,
-  Action,
-  State,
-  { selectIsAutoReloadingScrollLocked: (state: State) => boolean }
-> => (action$, state$, { selectIsAutoReloadingScrollLocked }) =>
-  action$.pipe(
-    filter(startAutoReload.match),
-    exhaustMap(() =>
-      timer(0, LIVE_STREAM_INTERVAL).pipe(
-        withLatestFrom(state$),
-        filter(([, state]) => selectIsAutoReloadingScrollLocked(state) === false),
-        map(() => jumpToTargetPositionTime(Date.now(), true)),
-        takeUntil(action$.pipe(filter(stopAutoReload.match)))
-      )
-    )
-  );
-
-const createLiveStreamScrollCancelEpic = <State>(): Epic<
-  Action,
-  Action,
-  State,
-  { selectIsAutoReloadingLogEntries: (state: State) => boolean }
-> => (action$, state$, { selectIsAutoReloadingLogEntries }) =>
-  action$.pipe(
-    filter(action => jumpToTargetPosition.match(action) && !action.payload.fromAutoReload),
-    withLatestFrom(state$),
-    filter(([, state]) => selectIsAutoReloadingLogEntries(state)),
-    mapTo(stopAutoReload())
-  );
-
-export const createLogPositionEpic = <State>() =>
-  combineEpics(createLiveStreamEpic<State>(), createLiveStreamScrollCancelEpic<State>());
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/index.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/index.ts
deleted file mode 100644
index 3edb289985d55c..00000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/index.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.
- */
-
-import * as logPositionActions from './actions';
-import * as logPositionSelectors from './selectors';
-
-export { logPositionActions, logPositionSelectors };
-export * from './reducer';
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/reducer.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/reducer.ts
deleted file mode 100644
index 2ca8be8e40d868..00000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/reducer.ts
+++ /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 { combineReducers } from 'redux';
-import { reducerWithInitialState } from 'typescript-fsa-reducers/dist';
-
-import { TimeKey } from '../../../../common/time';
-import {
-  jumpToTargetPosition,
-  reportVisiblePositions,
-  startAutoReload,
-  stopAutoReload,
-  lockAutoReloadScroll,
-  unlockAutoReloadScroll,
-} from './actions';
-
-interface ManualTargetPositionUpdatePolicy {
-  policy: 'manual';
-}
-
-interface IntervalTargetPositionUpdatePolicy {
-  policy: 'interval';
-}
-
-type TargetPositionUpdatePolicy =
-  | ManualTargetPositionUpdatePolicy
-  | IntervalTargetPositionUpdatePolicy;
-
-export interface LogPositionState {
-  targetPosition: TimeKey | null;
-  updatePolicy: TargetPositionUpdatePolicy;
-  visiblePositions: {
-    startKey: TimeKey | null;
-    middleKey: TimeKey | null;
-    endKey: TimeKey | null;
-    pagesAfterEnd: number;
-    pagesBeforeStart: number;
-  };
-  controlsShouldDisplayTargetPosition: boolean;
-  autoReloadScrollLock: boolean;
-}
-
-export const initialLogPositionState: LogPositionState = {
-  targetPosition: null,
-  updatePolicy: {
-    policy: 'manual',
-  },
-  visiblePositions: {
-    endKey: null,
-    middleKey: null,
-    startKey: null,
-    pagesBeforeStart: Infinity,
-    pagesAfterEnd: Infinity,
-  },
-  controlsShouldDisplayTargetPosition: false,
-  autoReloadScrollLock: false,
-};
-
-const targetPositionReducer = reducerWithInitialState(initialLogPositionState.targetPosition).case(
-  jumpToTargetPosition,
-  (state, target) => target
-);
-
-const targetPositionUpdatePolicyReducer = reducerWithInitialState(
-  initialLogPositionState.updatePolicy
-)
-  .case(startAutoReload, () => ({
-    policy: 'interval',
-  }))
-  .case(stopAutoReload, () => ({
-    policy: 'manual',
-  }));
-
-const visiblePositionReducer = reducerWithInitialState(
-  initialLogPositionState.visiblePositions
-).case(
-  reportVisiblePositions,
-  (state, { startKey, middleKey, endKey, pagesBeforeStart, pagesAfterEnd }) => ({
-    endKey,
-    middleKey,
-    startKey,
-    pagesBeforeStart,
-    pagesAfterEnd,
-  })
-);
-
-// Determines whether to use the target position or the visible midpoint when
-// displaying a timestamp or time range in the toolbar and log minimap. When the
-// user jumps to a new target, the final visible midpoint is indeterminate until
-// all the new data has finished loading, so using this flag reduces the perception
-// that the UI is jumping around inaccurately
-const controlsShouldDisplayTargetPositionReducer = reducerWithInitialState(
-  initialLogPositionState.controlsShouldDisplayTargetPosition
-)
-  .case(jumpToTargetPosition, () => true)
-  .case(stopAutoReload, () => false)
-  .case(startAutoReload, () => true)
-  .case(reportVisiblePositions, (state, { fromScroll }) => {
-    if (fromScroll) return false;
-    return state;
-  });
-
-const autoReloadScrollLockReducer = reducerWithInitialState(
-  initialLogPositionState.autoReloadScrollLock
-)
-  .case(startAutoReload, () => false)
-  .case(stopAutoReload, () => false)
-  .case(lockAutoReloadScroll, () => true)
-  .case(unlockAutoReloadScroll, () => false);
-
-export const logPositionReducer = combineReducers<LogPositionState>({
-  targetPosition: targetPositionReducer,
-  updatePolicy: targetPositionUpdatePolicyReducer,
-  visiblePositions: visiblePositionReducer,
-  controlsShouldDisplayTargetPosition: controlsShouldDisplayTargetPositionReducer,
-  autoReloadScrollLock: autoReloadScrollLockReducer,
-});
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/selectors.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/selectors.ts
deleted file mode 100644
index 30fd4d3f77b5cd..00000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/selectors.ts
+++ /dev/null
@@ -1,69 +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 { createSelector } from 'reselect';
-
-import { LogPositionState } from './reducer';
-
-export const selectTargetPosition = (state: LogPositionState) => state.targetPosition;
-
-export const selectIsAutoReloading = (state: LogPositionState) =>
-  state.updatePolicy.policy === 'interval';
-
-export const selectAutoReloadScrollLock = (state: LogPositionState) => state.autoReloadScrollLock;
-
-export const selectFirstVisiblePosition = (state: LogPositionState) =>
-  state.visiblePositions.startKey ? state.visiblePositions.startKey : null;
-
-export const selectMiddleVisiblePosition = (state: LogPositionState) =>
-  state.visiblePositions.middleKey ? state.visiblePositions.middleKey : null;
-
-export const selectLastVisiblePosition = (state: LogPositionState) =>
-  state.visiblePositions.endKey ? state.visiblePositions.endKey : null;
-
-export const selectPagesBeforeAndAfter = (state: LogPositionState) =>
-  state.visiblePositions
-    ? {
-        pagesBeforeStart: state.visiblePositions.pagesBeforeStart,
-        pagesAfterEnd: state.visiblePositions.pagesAfterEnd,
-      }
-    : { pagesBeforeStart: null, pagesAfterEnd: null };
-export const selectControlsShouldDisplayTargetPosition = (state: LogPositionState) =>
-  state.controlsShouldDisplayTargetPosition;
-
-export const selectVisibleMidpointOrTarget = createSelector(
-  selectMiddleVisiblePosition,
-  selectTargetPosition,
-  selectControlsShouldDisplayTargetPosition,
-  (middleVisiblePosition, targetPosition, displayTargetPosition) => {
-    if (displayTargetPosition) {
-      return targetPosition;
-    } else if (middleVisiblePosition) {
-      return middleVisiblePosition;
-    } else if (targetPosition) {
-      return targetPosition;
-    } else {
-      return null;
-    }
-  }
-);
-
-export const selectVisibleMidpointOrTargetTime = createSelector(
-  selectVisibleMidpointOrTarget,
-  visibleMidpointOrTarget => (visibleMidpointOrTarget ? visibleMidpointOrTarget.time : null)
-);
-
-export const selectVisibleTimeInterval = createSelector(
-  selectFirstVisiblePosition,
-  selectLastVisiblePosition,
-  (firstVisiblePosition, lastVisiblePosition) =>
-    firstVisiblePosition && lastVisiblePosition
-      ? {
-          start: firstVisiblePosition.time,
-          end: lastVisiblePosition.time,
-        }
-      : null
-);
diff --git a/x-pack/legacy/plugins/infra/public/store/local/reducer.ts b/x-pack/legacy/plugins/infra/public/store/local/reducer.ts
index 5cc839af4c7cc1..9e194a5d37f493 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/reducer.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/reducer.ts
@@ -6,7 +6,6 @@
 
 import { combineReducers } from 'redux';
 
-import { initialLogPositionState, logPositionReducer, LogPositionState } from './log_position';
 import { initialWaffleFilterState, waffleFilterReducer, WaffleFilterState } from './waffle_filter';
 import {
   initialWaffleOptionsState,
@@ -16,21 +15,18 @@ import {
 import { initialWaffleTimeState, waffleTimeReducer, WaffleTimeState } from './waffle_time';
 
 export interface LocalState {
-  logPosition: LogPositionState;
   waffleFilter: WaffleFilterState;
   waffleTime: WaffleTimeState;
   waffleMetrics: WaffleOptionsState;
 }
 
 export const initialLocalState: LocalState = {
-  logPosition: initialLogPositionState,
   waffleFilter: initialWaffleFilterState,
   waffleTime: initialWaffleTimeState,
   waffleMetrics: initialWaffleOptionsState,
 };
 
 export const localReducer = combineReducers<LocalState>({
-  logPosition: logPositionReducer,
   waffleFilter: waffleFilterReducer,
   waffleTime: waffleTimeReducer,
   waffleMetrics: waffleOptionsReducer,
diff --git a/x-pack/legacy/plugins/infra/public/store/local/selectors.ts b/x-pack/legacy/plugins/infra/public/store/local/selectors.ts
index c367901353b3d1..56ffc53c2bc72a 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/selectors.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/selectors.ts
@@ -5,17 +5,11 @@
  */
 
 import { globalizeSelectors } from '../../utils/typed_redux';
-import { logPositionSelectors as innerLogPositionSelectors } from './log_position';
 import { LocalState } from './reducer';
 import { waffleFilterSelectors as innerWaffleFilterSelectors } from './waffle_filter';
 import { waffleOptionsSelectors as innerWaffleOptionsSelectors } from './waffle_options';
 import { waffleTimeSelectors as innerWaffleTimeSelectors } from './waffle_time';
 
-export const logPositionSelectors = globalizeSelectors(
-  (state: LocalState) => state.logPosition,
-  innerLogPositionSelectors
-);
-
 export const waffleFilterSelectors = globalizeSelectors(
   (state: LocalState) => state.waffleFilter,
   innerWaffleFilterSelectors
diff --git a/x-pack/legacy/plugins/infra/public/store/selectors.ts b/x-pack/legacy/plugins/infra/public/store/selectors.ts
index d98e8ae9a0aae4..f4011c232cba45 100644
--- a/x-pack/legacy/plugins/infra/public/store/selectors.ts
+++ b/x-pack/legacy/plugins/infra/public/store/selectors.ts
@@ -6,7 +6,6 @@
 
 import { globalizeSelectors } from '../utils/typed_redux';
 import {
-  logPositionSelectors as localLogPositionSelectors,
   waffleFilterSelectors as localWaffleFilterSelectors,
   waffleOptionsSelectors as localWaffleOptionsSelectors,
   waffleTimeSelectors as localWaffleTimeSelectors,
@@ -18,7 +17,6 @@ import { State } from './reducer';
 
 const selectLocal = (state: State) => state.local;
 
-export const logPositionSelectors = globalizeSelectors(selectLocal, localLogPositionSelectors);
 export const waffleFilterSelectors = globalizeSelectors(selectLocal, localWaffleFilterSelectors);
 export const waffleTimeSelectors = globalizeSelectors(selectLocal, localWaffleTimeSelectors);
 export const waffleOptionsSelectors = globalizeSelectors(selectLocal, localWaffleOptionsSelectors);
diff --git a/x-pack/legacy/plugins/infra/public/store/store.ts b/x-pack/legacy/plugins/infra/public/store/store.ts
index 2781b0b2cef3f3..cae0622c5e4a15 100644
--- a/x-pack/legacy/plugins/infra/public/store/store.ts
+++ b/x-pack/legacy/plugins/infra/public/store/store.ts
@@ -9,14 +9,7 @@ import { createEpicMiddleware } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import {
-  createRootEpic,
-  initialState,
-  logPositionSelectors,
-  reducer,
-  State,
-  waffleTimeSelectors,
-} from '.';
+import { createRootEpic, initialState, reducer, State, waffleTimeSelectors } from '.';
 import { InfraApolloClient, InfraObservableApi } from '../lib/lib';
 
 declare global {
@@ -36,10 +29,6 @@ export function createStore({ apolloClient, observableApi }: StoreDependencies)
   const middlewareDependencies = {
     postToApi$: observableApi.pipe(map(({ post }) => post)),
     apolloClient$: apolloClient,
-    selectIsAutoReloadingLogEntries: logPositionSelectors.selectIsAutoReloading,
-    selectIsAutoReloadingScrollLocked: logPositionSelectors.selectAutoReloadScrollLock,
-    selectLogTargetPosition: logPositionSelectors.selectTargetPosition,
-    selectVisibleLogMidpointOrTarget: logPositionSelectors.selectVisibleMidpointOrTarget,
     selectWaffleTimeUpdatePolicyInterval: waffleTimeSelectors.selectTimeUpdatePolicyInterval,
   };
 
diff --git a/x-pack/test/functional/apps/infra/link_to.ts b/x-pack/test/functional/apps/infra/link_to.ts
index d1ae7138ecc65f..639b65ec5eca87 100644
--- a/x-pack/test/functional/apps/infra/link_to.ts
+++ b/x-pack/test/functional/apps/infra/link_to.ts
@@ -22,7 +22,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         state: undefined,
       };
       const expectedSearchString =
-        "logFilter=(expression:'trace.id:433b4651687e18be2c6c8e3b11f53d09',kind:kuery)&logPosition=(position:(tiebreaker:0,time:1565707203194))&sourceId=default";
+        "logFilter=(expression:'trace.id:433b4651687e18be2c6c8e3b11f53d09',kind:kuery)&logPosition=(position:(tiebreaker:0,time:1565707203194),streamLive:!f)&sourceId=default";
       const expectedRedirectPath = '/logs/stream?';
 
       await pageObjects.common.navigateToActualUrl(

From 0d11ec7729573580019dd4648e24eebf0401445f Mon Sep 17 00:00:00 2001
From: Ryan Keairns <contactryank@gmail.com>
Date: Tue, 7 Jan 2020 17:26:36 -0600
Subject: [PATCH 39/96] change markdown element title (#54194)

---
 .../canvas/i18n/elements/element_strings.ts   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts b/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts
index f1df8eaec3064f..df23dff1c7127a 100644
--- a/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts
@@ -55,7 +55,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   dropdown_filter: {
     displayName: i18n.translate('xpack.canvas.elements.dropdownFilterDisplayName', {
-      defaultMessage: 'Dropdown Filter',
+      defaultMessage: 'Dropdown filter',
     }),
     help: i18n.translate('xpack.canvas.elements.dropdownFilterHelpText', {
       defaultMessage: 'A dropdown from which you can select values for an "exactly" filter',
@@ -63,7 +63,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   horizontalBarChart: {
     displayName: i18n.translate('xpack.canvas.elements.horizontalBarChartDisplayName', {
-      defaultMessage: 'Horizontal Bar chart',
+      defaultMessage: 'Horizontal bar chart',
     }),
     help: i18n.translate('xpack.canvas.elements.horizontalBarChartHelpText', {
       defaultMessage: 'A customizable horizontal bar chart',
@@ -71,7 +71,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   horizontalProgressBar: {
     displayName: i18n.translate('xpack.canvas.elements.horizontalProgressBarDisplayName', {
-      defaultMessage: 'Horizontal Progress Bar',
+      defaultMessage: 'Horizontal progress bar',
     }),
     help: i18n.translate('xpack.canvas.elements.horizontalProgressBarHelpText', {
       defaultMessage: 'Displays progress as a portion of a horizontal bar',
@@ -79,7 +79,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   horizontalProgressPill: {
     displayName: i18n.translate('xpack.canvas.elements.horizontalProgressPillDisplayName', {
-      defaultMessage: 'Horizontal Progress Pill',
+      defaultMessage: 'Horizontal progress pill',
     }),
     help: i18n.translate('xpack.canvas.elements.horizontalProgressPillHelpText', {
       defaultMessage: 'Displays progress as a portion of a horizontal pill',
@@ -103,10 +103,10 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   markdown: {
     displayName: i18n.translate('xpack.canvas.elements.markdownDisplayName', {
-      defaultMessage: 'Markdown',
+      defaultMessage: 'Text',
     }),
     help: i18n.translate('xpack.canvas.elements.markdownHelpText', {
-      defaultMessage: 'Markup from Markdown',
+      defaultMessage: 'Add text using Markdown',
     }),
   },
   metric: {
@@ -135,7 +135,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   progressGauge: {
     displayName: i18n.translate('xpack.canvas.elements.progressGaugeDisplayName', {
-      defaultMessage: 'Progress Gauge',
+      defaultMessage: 'Progress gauge',
     }),
     help: i18n.translate('xpack.canvas.elements.progressGaugeHelpText', {
       defaultMessage: 'Displays progress as a portion of a gauge',
@@ -143,7 +143,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   progressSemicircle: {
     displayName: i18n.translate('xpack.canvas.elements.progressSemicircleDisplayName', {
-      defaultMessage: 'Progress Semicircle',
+      defaultMessage: 'Progress semicircle',
     }),
     help: i18n.translate('xpack.canvas.elements.progressSemicircleHelpText', {
       defaultMessage: 'Displays progress as a portion of a semicircle',
@@ -151,7 +151,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   progressWheel: {
     displayName: i18n.translate('xpack.canvas.elements.progressWheelDisplayName', {
-      defaultMessage: 'Progress Wheel',
+      defaultMessage: 'Progress wheel',
     }),
     help: i18n.translate('xpack.canvas.elements.progressWheelHelpText', {
       defaultMessage: 'Displays progress as a portion of a wheel',
@@ -215,7 +215,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   verticalProgressBar: {
     displayName: i18n.translate('xpack.canvas.elements.verticalProgressBarDisplayName', {
-      defaultMessage: 'Vertical Progress Bar',
+      defaultMessage: 'Vertical progress bar',
     }),
     help: i18n.translate('xpack.canvas.elements.verticalProgressBarHelpText', {
       defaultMessage: 'Displays progress as a portion of a vertical bar',
@@ -223,7 +223,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   verticalProgressPill: {
     displayName: i18n.translate('xpack.canvas.elements.verticalProgressPillDisplayName', {
-      defaultMessage: 'Vertical Progress Pill',
+      defaultMessage: 'Vertical progress pill',
     }),
     help: i18n.translate('xpack.canvas.elements.verticalProgressPillHelpText', {
       defaultMessage: 'Displays progress as a portion of a vertical pill',

From b7284ca627f94ab7dc17133a873629e8a1b2588d Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Wed, 8 Jan 2020 09:18:35 +0100
Subject: [PATCH 40/96] fix ui exports doc (#54138)

---
 docs/developer/plugin/development-uiexports.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/developer/plugin/development-uiexports.asciidoc b/docs/developer/plugin/development-uiexports.asciidoc
index 6368446f7fb437..18d326cbfb9c08 100644
--- a/docs/developer/plugin/development-uiexports.asciidoc
+++ b/docs/developer/plugin/development-uiexports.asciidoc
@@ -9,8 +9,8 @@ An aggregate list of available UiExport types:
 | hacks | Any module that should be included in every application
 | visTypes | Modules that register providers with the `ui/registry/vis_types` registry.
 | inspectorViews | Modules that register custom inspector views via the `viewRegistry` in `ui/inspector`.
-| chromeNavControls | Modules that register providers with the `ui/registry/chrome_nav_controls` registry.
-| navbarExtensions | Modules that register providers with the `ui/registry/navbar_extensions` registry.
-| docViews | Modules that register providers with the `ui/registry/doc_views` registry.
+| chromeNavControls | Modules that register providers with the `ui/registry/chrome_header_nav_controls` registry.
+| navbarExtensions | Modules that register providers with the setup contract of the `navigation` plugin.
+| docViews | Modules that register providers with the setup contract method `addDocView` of the `discover` plugin.
 | app | Adds an application to the system. This uiExport type is defined as an object of metadata rather than just a module id.
 |=======================================================================

From 8eb000d62926ba57ade48523bebfbc69f373bacd Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Wed, 8 Jan 2020 09:28:38 +0100
Subject: [PATCH 41/96] [SIEM] Cleanup unnecessary use of enzyme-to-json
 (#53980)

---
 .../siem/public/components/arrows/index.test.tsx  |  3 +--
 .../components/autocomplete_field/index.test.tsx  |  3 +--
 .../utility_bar/utility_bar.test.tsx              |  3 +--
 .../utility_bar/utility_bar_action.test.tsx       |  3 +--
 .../utility_bar/utility_bar_group.test.tsx        |  3 +--
 .../utility_bar/utility_bar_section.test.tsx      |  3 +--
 .../utility_bar/utility_bar_text.test.tsx         |  3 +--
 .../drag_drop_context_wrapper.test.tsx            |  3 +--
 .../drag_and_drop/draggable_wrapper.test.tsx      |  3 +--
 .../drag_and_drop/droppable_wrapper.test.tsx      |  3 +--
 .../public/components/draggables/index.test.tsx   |  5 ++---
 .../components/embeddables/embeddable.test.tsx    |  3 +--
 .../embeddables/embeddable_header.test.tsx        |  3 +--
 .../components/embeddables/embedded_map.test.tsx  |  3 +--
 .../index_patterns_missing_prompt.test.tsx        |  3 +--
 .../map_tool_tip/line_tool_tip_content.test.tsx   |  3 +--
 .../map_tool_tip/map_tool_tip.test.tsx            |  5 ++---
 .../map_tool_tip/point_tool_tip_content.test.tsx  |  3 +--
 .../map_tool_tip/tooltip_footer.test.tsx          |  3 +--
 .../public/components/empty_page/index.test.tsx   |  3 +--
 .../components/empty_value/empty_value.test.tsx   |  3 +--
 .../error_toast_dispatcher/index.test.tsx         |  3 +--
 .../event_details/event_details.test.tsx          |  3 +--
 .../components/event_details/json_view.test.tsx   |  3 +--
 .../field_renderers/field_renderers.test.tsx      | 15 +++++++--------
 .../filters_global/filters_global.test.tsx        |  3 +--
 .../flow_controls/flow_direction_select.test.tsx  |  3 +--
 .../flow_controls/flow_target_select.test.tsx     |  3 +--
 .../siem/public/components/flyout/index.test.tsx  |  3 +--
 .../public/components/flyout/pane/index.test.tsx  |  3 +--
 .../components/formatted_bytes/index.test.tsx     |  3 +--
 .../components/formatted_date/index.test.tsx      |  3 +--
 .../components/header_global/index.test.tsx       |  3 +--
 .../public/components/header_page/index.test.tsx  |  3 +--
 .../components/header_section/index.test.tsx      |  3 +--
 .../siem/public/components/ip/index.test.tsx      |  3 +--
 .../public/components/link_icon/index.test.tsx    |  3 +--
 .../siem/public/components/loader/index.test.tsx  |  3 +--
 .../public/components/markdown/index.test.tsx     |  5 ++---
 .../components/markdown/markdown_hint.test.tsx    |  3 +--
 .../components/ml/entity_draggable.test.tsx       |  3 +--
 .../ml/influencers/create_influencers.test.tsx    |  3 +--
 .../components/ml/score/anomaly_score.test.tsx    |  3 +--
 .../components/ml/score/anomaly_scores.test.tsx   |  3 +--
 .../ml/score/create_descriptions_list.test.tsx    |  3 +--
 .../components/ml/score/draggable_score.test.tsx  |  5 ++---
 .../filters/groups_filter_popover.test.tsx        |  3 +--
 .../filters/jobs_table_filters.test.tsx           |  3 +--
 .../ml_popover/jobs_table/job_switch.test.tsx     |  3 +--
 .../ml_popover/jobs_table/jobs_table.test.tsx     |  3 +--
 .../ml_popover/jobs_table/showing_count.test.tsx  |  3 +--
 .../ml_popover/popover_description.test.tsx       |  3 +--
 .../ml_popover/upgrade_contents.test.tsx          |  3 +--
 .../siem/public/components/netflow/index.test.tsx |  3 +--
 .../components/notes/add_note/index.test.tsx      |  3 +--
 .../components/notes/add_note/new_note.test.tsx   |  3 +--
 .../notes/note_card/note_card_body.test.tsx       |  3 +--
 .../index.test.tsx                                |  3 +--
 .../histogram_signals/index.test.tsx              |  3 +--
 .../hosts/authentications_table/index.test.tsx    |  3 +--
 .../page/hosts/host_overview/index.test.tsx       |  3 +--
 .../page/hosts/hosts_table/index.test.tsx         |  3 +--
 .../page/hosts/kpi_hosts/index.test.tsx           |  7 +++----
 .../hosts/uncommon_process_table/index.test.tsx   |  3 +--
 .../page/network/ip_overview/index.test.tsx       |  3 +--
 .../page/network/kpi_network/index.test.tsx       |  5 ++---
 .../page/network/network_dns_table/index.test.tsx |  3 +--
 .../network_dns_table/is_ptr_included.test.tsx    |  3 +--
 .../network/network_http_table/index.test.tsx     |  3 +--
 .../network_top_countries_table/index.test.tsx    |  5 ++---
 .../network_top_n_flow_table/index.test.tsx       |  5 ++---
 .../page/network/tls_table/index.test.tsx         |  3 +--
 .../page/network/users_table/index.test.tsx       |  3 +--
 .../overview/overview_host_stats/index.test.tsx   |  3 +--
 .../overview_network_stats/index.test.tsx         |  3 +--
 .../components/paginated_table/index.test.tsx     |  3 +--
 .../siem/public/components/port/index.test.tsx    |  3 +--
 .../components/progress_inline/index.test.tsx     |  3 +--
 .../components/resize_handle/index.test.tsx       |  3 +--
 .../components/selectable_text/index.test.tsx     |  3 +--
 .../public/components/skeleton_row/index.test.tsx |  3 +--
 .../components/source_destination/index.test.tsx  |  3 +--
 .../public/components/stat_items/index.test.tsx   |  5 ++---
 .../public/components/subtitle/index.test.tsx     |  3 +--
 .../public/components/tables/helpers.test.tsx     |  9 ++++-----
 .../body/column_headers/filter/index.test.tsx     |  3 +--
 .../body/column_headers/header/index.test.tsx     |  3 +--
 .../header_tooltip_content/index.test.tsx         |  3 +--
 .../timeline/body/column_headers/index.test.tsx   |  3 +--
 .../column_headers/text_filter/index.test.tsx     |  3 +--
 .../body/data_driven_columns/index.test.tsx       |  3 +--
 .../timeline/body/renderers/args.test.tsx         |  3 +--
 .../renderers/auditd/generic_details.test.tsx     |  3 +--
 .../auditd/generic_file_details.test.tsx          |  3 +--
 .../auditd/generic_row_renderer.test.tsx          |  5 ++---
 .../auditd/primary_secondary_user_info.test.tsx   |  3 +--
 .../auditd/session_user_host_working_dir.test.tsx |  3 +--
 .../body/renderers/empty_column_renderer.test.tsx |  3 +--
 .../body/renderers/formatted_field.test.tsx       |  3 +--
 .../body/renderers/get_column_renderer.test.tsx   |  3 +--
 .../body/renderers/get_row_renderer.test.tsx      |  3 +--
 .../body/renderers/host_working_dir.test.tsx      |  3 +--
 .../netflow/netflow_row_renderer.test.tsx         |  3 +--
 .../body/renderers/plain_column_renderer.test.tsx |  3 +--
 .../body/renderers/plain_row_renderer.test.tsx    |  3 +--
 .../body/renderers/process_draggable.test.tsx     |  3 +--
 .../renderers/suricata/suricata_details.test.tsx  |  3 +--
 .../suricata/suricata_row_renderer.test.tsx       |  3 +--
 .../suricata/suricata_signature.test.tsx          |  3 +--
 .../body/renderers/system/auth_ssh.test.tsx       |  3 +--
 .../renderers/system/generic_details.test.tsx     |  3 +--
 .../system/generic_file_details.test.tsx          |  3 +--
 .../system/generic_row_renderer.test.tsx          |  5 ++---
 .../body/renderers/system/package.test.tsx        |  3 +--
 .../renderers/unknown_column_renderer.test.tsx    |  3 +--
 .../body/renderers/user_host_working_dir.test.tsx |  3 +--
 .../body/renderers/zeek/zeek_details.test.tsx     |  3 +--
 .../renderers/zeek/zeek_row_renderer.test.tsx     |  3 +--
 .../body/renderers/zeek/zeek_signature.test.tsx   |  3 +--
 .../timeline/body/sort/sort_indicator.test.tsx    |  3 +--
 .../data_providers/data_providers.test.tsx        |  3 +--
 .../timeline/data_providers/empty.test.tsx        |  3 +--
 .../timeline/data_providers/provider.test.tsx     |  3 +--
 .../timeline/data_providers/providers.test.tsx    |  3 +--
 .../components/timeline/footer/index.test.tsx     |  3 +--
 .../components/timeline/header/index.test.tsx     |  3 +--
 .../public/components/timeline/timeline.test.tsx  |  3 +--
 .../components/toasters/modal_all_errors.test.tsx |  3 +--
 .../components/truncatable_text/index.test.tsx    |  3 +--
 .../public/components/wrapper_page/index.test.tsx |  9 ++++-----
 .../components/import_rule_modal/index.test.tsx   |  3 +--
 .../components/json_downloader/index.test.tsx     |  3 +--
 .../rules/components/rule_switch/index.test.tsx   |  3 +--
 .../pages/network/ip_details/index.test.tsx       |  3 +--
 134 files changed, 158 insertions(+), 292 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
index 141365911a7c68..5404a1ac43844f 100644
--- a/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -20,7 +19,7 @@ describe('arrows', () => {
           <ArrowBody height={3} />
         </TestProviders>
       );
-      expect(toJson(wrapper.find('ArrowBody'))).toMatchSnapshot();
+      expect(wrapper.find('ArrowBody')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
index 26e6f6d4f56b48..27e87d25e286f5 100644
--- a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
@@ -7,7 +7,6 @@
 import { EuiFieldSearch } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { noop } from 'lodash/fp';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
@@ -117,7 +116,7 @@ describe('Autocomplete', () => {
           value={''}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it is rendering with placeholder', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar.test.tsx
index a5eac381f92150..eae0fc4ff422b8 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock';
@@ -44,7 +43,7 @@ describe('UtilityBar', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBar'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBar')).toMatchSnapshot();
   });
 
   test('it applies border styles when border is true', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_action.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_action.test.tsx
index 2610fb44532f59..2a8a71955a986a 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_action.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_action.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock';
@@ -19,7 +18,7 @@ describe('UtilityBarAction', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBarAction'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBarAction')).toMatchSnapshot();
   });
 
   test('it renders a popover', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_group.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_group.test.tsx
index 59ef7021d40493..e18e7d5e0b524f 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_group.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_group.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock';
@@ -21,6 +20,6 @@ describe('UtilityBarGroup', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBarGroup'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBarGroup')).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_section.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_section.test.tsx
index baa4331ced8f88..f849fa4b4ee46d 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_section.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_section.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock';
@@ -23,6 +22,6 @@ describe('UtilityBarSection', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBarSection'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBarSection')).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_text.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_text.test.tsx
index 794f207fd88e36..230dd80b1a86b7 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_text.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_text.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock';
@@ -19,6 +18,6 @@ describe('UtilityBarText', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBarText'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBarText')).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
index f7aa8d4fe50b4a..9e8bde8d9ff92c 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
@@ -28,7 +27,7 @@ describe('DragDropContextWrapper', () => {
           </MockedProvider>
         </TestProviders>
       );
-      expect(toJson(wrapper.find('DragDropContextWrapper'))).toMatchSnapshot();
+      expect(wrapper.find('DragDropContextWrapper')).toMatchSnapshot();
     });
 
     test('it renders the children', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
index 1174a58bb165ec..e846c923c5cbe3 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
@@ -33,7 +32,7 @@ describe('DraggableWrapper', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('DraggableWrapper'))).toMatchSnapshot();
+      expect(wrapper.find('DraggableWrapper')).toMatchSnapshot();
     });
 
     test('it renders the children passed to the render prop', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
index 1ba49d7b57023f..bd2f01721290fb 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
@@ -33,7 +32,7 @@ describe('DroppableWrapper', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('DroppableWrapper'))).toMatchSnapshot();
+      expect(wrapper.find('DroppableWrapper')).toMatchSnapshot();
     });
 
     test('it renders the children when a render prop is not provided', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
index 6793c3f8cbacac..76335e3c723061 100644
--- a/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -34,7 +33,7 @@ describe('draggables', () => {
           <span>{'A child of this'}</span>
         </DefaultDraggable>
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the default Badge', () => {
@@ -50,7 +49,7 @@ describe('draggables', () => {
           <span>{'A child of this'}</span>
         </DraggableBadge>
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx
index 884d5bc348d6f3..2dc3d8828675f8 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Embeddable } from './embeddable';
@@ -18,6 +17,6 @@ describe('Embeddable', () => {
       </Embeddable>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.test.tsx
index aa247b69eb4eb2..3b8e137618ab0c 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -15,7 +14,7 @@ describe('EmbeddableHeader', () => {
   test('it renders', () => {
     const wrapper = shallow(<EmbeddableHeader title="Test title" />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the title', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
index 897ee57b14c60d..c752273777d2f0 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { useIndexPatterns } from '../../hooks/use_index_patterns';
@@ -41,6 +40,6 @@ describe('EmbeddedMapComponent', () => {
         startDate={new Date('2019-08-28T05:50:47.877Z').getTime()}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
index 30d260709fdcda..4f617644a1fe14 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { IndexPatternsMissingPromptComponent } from './index_patterns_missing_prompt';
@@ -15,6 +14,6 @@ jest.mock('../../lib/kibana');
 describe('IndexPatternsMissingPrompt', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<IndexPatternsMissingPromptComponent />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
index 7113904738a2c0..824c717427763c 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { LineToolTipContentComponent } from './line_tool_tip_content';
 import { FeatureProperty } from '../types';
@@ -27,6 +26,6 @@ describe('LineToolTipContent', () => {
     const wrapper = shallow(
       <LineToolTipContentComponent contextId={'contextId'} featureProps={mockFeatureProps} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
index 8657b7a35f3b5a..2daaeb53e45f2c 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { MapToolTipComponent } from './map_tool_tip';
 import { MapFeature } from '../types';
@@ -19,7 +18,7 @@ jest.mock('../../search_bar', () => ({
 describe('MapToolTip', () => {
   test('placeholder component renders correctly against snapshot', () => {
     const wrapper = shallow(<MapToolTipComponent />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('full component renders correctly against snapshot', () => {
@@ -46,6 +45,6 @@ describe('MapToolTip', () => {
         loadFeatureGeometry={loadFeatureGeometry}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
index 94884add0bbd26..8741cfaa26ca6d 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { FeatureProperty } from '../types';
 import { getRenderedFieldValue, PointToolTipContentComponent } from './point_tool_tip_content';
@@ -49,7 +48,7 @@ describe('PointToolTipContent', () => {
         />
       </TestProviders>
     );
-    expect(toJson(wrapper.find('PointToolTipContentComponent'))).toMatchSnapshot();
+    expect(wrapper.find('PointToolTipContentComponent')).toMatchSnapshot();
   });
 
   test('renders array filter correctly', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
index e63577e5a63272..7351ea0a183c36 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { ToolTipFooterComponent } from './tooltip_footer';
 
@@ -27,7 +26,7 @@ describe('ToolTipFilter', () => {
         totalFeatures={100}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('Lower bounds', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/empty_page/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/empty_page/index.test.tsx
index 67b0c5ea64b515..6a14c12cee0f85 100644
--- a/x-pack/legacy/plugins/siem/public/components/empty_page/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/empty_page/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { EmptyPage } from './index';
@@ -18,5 +17,5 @@ test('renders correctly', () => {
       title="My Super Title"
     />
   );
-  expect(toJson(EmptyComponent)).toMatchSnapshot();
+  expect(EmptyComponent).toMatchSnapshot();
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/empty_value/empty_value.test.tsx b/x-pack/legacy/plugins/siem/public/components/empty_value/empty_value.test.tsx
index bd056c04acc894..fc1d30907ab092 100644
--- a/x-pack/legacy/plugins/siem/public/components/empty_value/empty_value.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/empty_value/empty_value.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
@@ -25,7 +24,7 @@ describe('EmptyValue', () => {
 
   test('it renders against snapshot', () => {
     const wrapper = shallow(<p>{getEmptyString()}</p>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('#getEmptyValue', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
index 3ae46132149494..6b90d9ccd08c48 100644
--- a/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { Provider } from 'react-redux';
 
@@ -30,7 +29,7 @@ describe('Error Toast Dispatcher', () => {
           <ErrorToastDispatcher toastLifeTimeMs={9999999999} />
         </Provider>
       );
-      expect(toJson(wrapper.find('Connect(ErrorToastDispatcherComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(ErrorToastDispatcherComponent)')).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
index 7498a3e02269d4..162fc8fd8bb343 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { mockDetailItemData, mockDetailItemDataId } from '../../mock/mock_detail_item';
@@ -34,7 +33,7 @@ describe('EventDetails', () => {
           toggleColumn={jest.fn()}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
index 32662b51ea3db3..0cf158c8ea90bf 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { mockDetailItemData } from '../../mock';
@@ -16,7 +15,7 @@ describe('JSON View', () => {
   describe('rendering', () => {
     test('should match snapshot', () => {
       const wrapper = shallow(<JsonView data={mockDetailItemData} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx b/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
index bd31f5314762ef..88d03d8db67611 100644
--- a/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { FlowTarget, GetIpOverviewQuery, HostEcsFields } from '../../graphql/types';
@@ -37,7 +36,7 @@ describe('Field Renderers', () => {
         locationRenderer(['source.geo.city_name', 'source.geo.region_name'], mockData.complete)
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when no fields provided', () => {
@@ -61,7 +60,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(dateRenderer(mockData.complete.source!.firstSeen));
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when invalid field provided', () => {
@@ -79,7 +78,7 @@ describe('Field Renderers', () => {
         autonomousSystemRenderer(mockData.complete.source!.autonomousSystem!, FlowTarget.source)
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when non-string field provided', () => {
@@ -111,7 +110,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(hostNameRenderer(mockData.complete.host, '10.10.10.10'));
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when non-matching IP is provided', () => {
@@ -154,7 +153,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(hostNameRenderer(mockData.complete.host, '10.10.10.10'));
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when non-matching IP is provided', () => {
@@ -188,7 +187,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(whoisRenderer('10.10.10.10'));
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
@@ -196,7 +195,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(<TestProviders>{reputationRenderer('10.10.10.10')}</TestProviders>);
 
-      expect(toJson(wrapper.find('DragDropContext'))).toMatchSnapshot();
+      expect(wrapper.find('DragDropContext')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.test.tsx b/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.test.tsx
index 7f377a57c3e9b0..ffac0496e9f1a4 100644
--- a/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import '../../mock/match_media';
@@ -19,6 +18,6 @@ describe('rendering', () => {
       </FiltersGlobal>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
index 2fce177735968a..f984b534c188d7 100644
--- a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { FlowDirection } from '../../graphql/types';
@@ -25,7 +24,7 @@ describe('Select Flow Direction', () => {
         />
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
index ba05a3961619ec..373cc3cdc4a92d 100644
--- a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { clone } from 'lodash/fp';
 import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
@@ -31,7 +30,7 @@ describe('FlowTargetSelect Component', () => {
     test('it renders the FlowTargetSelect', () => {
       const wrapper = shallow(<FlowTargetSelect {...mockProps} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
index 3894a64f3e084e..83b842956e10ea 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { set } from 'lodash/fp';
 import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
@@ -35,7 +34,7 @@ describe('Flyout', () => {
           />
         </TestProviders>
       );
-      expect(toJson(wrapper.find('Flyout'))).toMatchSnapshot();
+      expect(wrapper.find('Flyout')).toMatchSnapshot();
     });
 
     test('it renders the default flyout state as a button', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
index d94c5f4d0a4f2a..c1c890c5865761 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock';
@@ -32,7 +31,7 @@ describe('Pane', () => {
         </Pane>
       </TestProviders>
     );
-    expect(toJson(EmptyComponent.find('Pane'))).toMatchSnapshot();
+    expect(EmptyComponent.find('Pane')).toMatchSnapshot();
   });
 
   test('it should NOT let the flyout expand to take up the full width of the element that contains it', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
index 44121591144445..914d233bccc1fe 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { useUiSetting$ } from '../../lib/kibana';
@@ -23,7 +22,7 @@ describe('PreferenceFormattedBytes', () => {
     mockUseUiSetting$.mockImplementation(() => [DEFAULT_BYTES_FORMAT_VALUE]);
     const wrapper = shallow(<PreferenceFormattedBytesComponent value={bytes} />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders bytes to Numeral formatting when no format setting exists', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
index 1b6f63f944882c..0d8222ce85e1be 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { useDateFormat, useTimeZone } from '../../hooks';
@@ -34,7 +33,7 @@ describe('formatted_date', () => {
       mockUseDateFormat.mockImplementation(() => '');
       const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the date with the default configuration', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/header_global/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/header_global/index.test.tsx
index a45bed87829bfb..098de39bbfef53 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_global/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_global/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import '../../mock/match_media';
@@ -23,6 +22,6 @@ describe('HeaderGlobal', () => {
   test('it renders', () => {
     const wrapper = shallow(<HeaderGlobal />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/header_page/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/header_page/index.test.tsx
index 633ff90524de67..83a70fd90d82b5 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_page/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_page/index.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -29,7 +28,7 @@ describe('HeaderPage', () => {
       </HeaderPage>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the title', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
index fbd8642c01facd..2bc80be20e42da 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -16,7 +15,7 @@ describe('HeaderSection', () => {
   test('it renders', () => {
     const wrapper = shallow(<HeaderSection title="Test title" />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the title', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
index c042c3590c53fb..cac372a27180e6 100644
--- a/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
@@ -20,7 +19,7 @@ describe('Port', () => {
     const wrapper = shallow(
       <Ip contextId="test" eventId="abcd" fieldName="destination.ip" value="10.1.2.3" />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the the ip address', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/link_icon/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/link_icon/index.test.tsx
index 87761a51a431f4..59f2acba4121bf 100644
--- a/x-pack/legacy/plugins/siem/public/components/link_icon/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/link_icon/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -19,7 +18,7 @@ describe('LinkIcon', () => {
       </LinkIcon>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders an action button when onClick is provided', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/loader/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/loader/index.test.tsx
index 1c97e766345aae..48dd91922583fa 100644
--- a/x-pack/legacy/plugins/siem/public/components/loader/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/loader/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Loader } from './index';
@@ -17,6 +16,6 @@ describe('rendering', () => {
         {'Loading'}
       </Loader>
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
index 9e97ce56130093..de662c162fc0a1 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Markdown } from '.';
@@ -98,7 +97,7 @@ describe('Markdown', () => {
     test('it renders the expected table content', () => {
       const wrapper = shallow(<Markdown raw={rawTable} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
@@ -152,7 +151,7 @@ describe('Markdown', () => {
     test('it renders the expected content containing a link', () => {
       const wrapper = shallow(<Markdown raw={markdownWithLink} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
index 81aa2d586a83b0..59aae5abce5c4e 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { MarkdownHintComponent } from './markdown_hint';
@@ -89,7 +88,7 @@ describe('MarkdownHintComponent ', () => {
     test('it renders the expected hints', () => {
       const wrapper = shallow(<MarkdownHintComponent show={true} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/entity_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/entity_draggable.test.tsx
index 562e3c15675a7f..c48a5590b49cfd 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/entity_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/entity_draggable.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import React from 'react';
-import toJson from 'enzyme-to-json';
 import { shallow } from 'enzyme';
 import { EntityDraggableComponent } from './entity_draggable';
 import { TestProviders } from '../../mock/test_providers';
@@ -22,7 +21,7 @@ describe('entity_draggable', () => {
         entityValue="entity-value"
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('renders with entity name with entity value as text', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx
index 615e83d208dd63..d49c3008b696cf 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import React from 'react';
-import toJson from 'enzyme-to-json';
 import { mockAnomalies } from '../mock';
 import { cloneDeep } from 'lodash/fp';
 import { shallow, mount } from 'enzyme';
@@ -20,7 +19,7 @@ describe('create_influencers', () => {
 
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<span>{createInfluencers(anomalies.anomalies[0].influencers)}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it returns an empty string when influencers is undefined', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
index dcd0a55ca4bd16..9ff0081f4359f0 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 import { AnomalyScoreComponent } from './anomaly_score';
@@ -36,7 +35,7 @@ describe('anomaly_scores', () => {
         narrowDateRange={narrowDateRange}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should not show a popover on initial render', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
index 68795dd1046912..3041134f669eeb 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 import { AnomalyScoresComponent, createJobKey } from './anomaly_scores';
@@ -36,7 +35,7 @@ describe('anomaly_scores', () => {
         narrowDateRange={narrowDateRange}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('renders spinner when isLoading is true is passed', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
index 89b2c61bd46895..7c8900bf77d95b 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow, mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { mockAnomalies } from '../mock';
 import { createDescriptionList } from './create_description_list';
@@ -35,7 +34,7 @@ describe('create_description_list', () => {
         )}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it calls the narrow date range function on click', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.test.tsx
index 0d389ae14a8255..f7759bb74c3abc 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import React from 'react';
-import toJson from 'enzyme-to-json';
 import { mockAnomalies } from '../mock';
 import { cloneDeep } from 'lodash/fp';
 import { shallow } from 'enzyme';
@@ -22,13 +21,13 @@ describe('draggable_score', () => {
     const wrapper = shallow(
       <DraggableScoreComponent id="some-id" index={0} score={anomalies.anomalies[0]} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('renders correctly against snapshot when the index is not included', () => {
     const wrapper = shallow(
       <DraggableScoreComponent id="some-id" score={anomalies.anomalies[0]} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
index 9a76c82fd3f60a..a14ff789f10787 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { GroupsFilterPopoverComponent } from './groups_filter_popover';
 import { mockSiemJobs } from '../../__mocks__/api';
@@ -23,7 +22,7 @@ describe('GroupsFilterPopover', () => {
     const wrapper = shallow(
       <GroupsFilterPopoverComponent siemJobs={siemJobs} onSelectedGroupsChanged={jest.fn()} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('when a filter is clicked, it becomes checked ', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
index 266f844c8956e5..cbee7248021560 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { JobsTableFiltersComponent } from './jobs_table_filters';
 import { SiemJob } from '../../types';
@@ -23,7 +22,7 @@ describe('JobsTableFilters', () => {
     const wrapper = shallow(
       <JobsTableFiltersComponent siemJobs={siemJobs} onFilterChanged={jest.fn()} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('when you click Elastic Jobs filter, state is updated and it is selected', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
index 69ea1929dc7ea8..1186573e3e2090 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow, mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { isChecked, isFailure, isJobLoading, JobSwitchComponent } from './job_switch';
@@ -29,7 +28,7 @@ describe('JobSwitch', () => {
         onJobStateChange={onJobStateChangeMock}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should call onJobStateChange when the switch is clicked to be true/open', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
index a791ebef4773e8..fa524d8ff3dbc6 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow, mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { JobsTableComponent } from './jobs_table';
 import { mockSiemJobs } from '../__mocks__/api';
@@ -28,7 +27,7 @@ describe('JobsTableComponent', () => {
         onJobStateChange={onJobStateChangeMock}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should render the hyperlink which points specifically to the job id', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
index c2a11af5f997b3..bf1802f42084e3 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
@@ -5,13 +5,12 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { ShowingCountComponent } from './showing_count';
 
 describe('ShowingCount', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<ShowingCountComponent filterResultsLength={2} />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
index 81f5bb726e0825..e611a5234da5ed 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
@@ -5,13 +5,12 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { PopoverDescriptionComponent } from './popover_description';
 
 describe('JobsTableFilters', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<PopoverDescriptionComponent />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
index b62307c17cb168..2ba08073b25b94 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
@@ -5,13 +5,12 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { UpgradeContentsComponent } from './upgrade_contents';
 
 describe('JobsTableFilters', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<UpgradeContentsComponent />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
index 2c0b1237138ed9..ecf162ebf2739a 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
 import React from 'react';
 import { shallow } from 'enzyme';
@@ -123,7 +122,7 @@ describe('Netflow', () => {
 
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(getNetflowInstance());
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders a destination label', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
index 30789b042b4ade..ca6abc90d317b8 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { AddNote } from '.';
@@ -24,7 +23,7 @@ describe('AddNote', () => {
         updateNote={jest.fn()}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the Cancel button when onCancelAddNote is provided', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
index 9c4a32aad195b4..24db5c5ec8125e 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import * as i18n from '../translations';
@@ -19,7 +18,7 @@ describe('NewNote', () => {
     const wrapper = shallow(
       <NewNote noteInputHeight={200} note={note} updateNewNote={jest.fn()} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders a tab labeled "Note"', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
index d1e08c19a1b658..46e1bab37495a1 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
@@ -24,7 +23,7 @@ describe('NoteCardBody', () => {
         <NoteCardBody rawNote={rawNote} />
       </ThemeProvider>
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the text of the note in an h1', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx
index c7e620ded1d296..345701c97901f6 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../mock';
@@ -63,7 +62,7 @@ describe('AddFilterToGlobalSearchBar Component', () => {
       </AddFilterToGlobalSearchBar>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('Rendering tooltip', async () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.test.tsx
index ad1d80a7618543..5d2f3256ef5091 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../../mock';
@@ -19,6 +18,6 @@ describe('HistogramSignals', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('HistogramSignals'))).toMatchSnapshot();
+    expect(wrapper.find('HistogramSignals')).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
index 964efbd79e4045..d7c25e97b3838d 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
@@ -49,7 +48,7 @@ describe('Authentication Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(AuthenticationTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(AuthenticationTableComponent)')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
index 6ac551f8ed0ca8..90cfe696610d94 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { TestProviders } from '../../../../mock';
 
@@ -31,7 +30,7 @@ describe('Host Summary Component', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('HostOverview'))).toMatchSnapshot();
+      expect(wrapper.find('HostOverview')).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
index 2981984c93e968..e561594013deaa 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
@@ -61,7 +60,7 @@ describe('Hosts Table', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('HostsTable'))).toMatchSnapshot();
+      expect(wrapper.find('HostsTable')).toMatchSnapshot();
     });
 
     describe('Sorting on Table', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
index 577ec5ff514700..dc2340d42ebd90 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
@@ -7,7 +7,6 @@
 import { mockKpiHostsData, mockKpiHostDetailsData } from './mock';
 import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { KpiHostsComponentBase } from '.';
 import * as statItems from '../../../stat_items';
 import { kpiHostsMapping } from './kpi_hosts_mapping';
@@ -30,7 +29,7 @@ describe('kpiHostsComponent', () => {
           narrowDateRange={narrowDateRange}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it should render KpiHostsData', () => {
@@ -44,7 +43,7 @@ describe('kpiHostsComponent', () => {
           narrowDateRange={narrowDateRange}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it should render KpiHostDetailsData', () => {
@@ -58,7 +57,7 @@ describe('kpiHostsComponent', () => {
           narrowDateRange={narrowDateRange}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
index 115c4f38725739..76fc2a0c389c38 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 
@@ -45,7 +44,7 @@ describe('Uncommon Process Table Component', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('UncommonProcessTable'))).toMatchSnapshot();
+      expect(wrapper.find('UncommonProcessTable')).toMatchSnapshot();
     });
 
     test('it has a double dash (empty value) without any hosts at all', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
index 9407eca9732b42..3038d7f41c632e 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
 
@@ -52,7 +51,7 @@ describe('IP Overview Component', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('IpOverview'))).toMatchSnapshot();
+      expect(wrapper.find('IpOverview')).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
index 181d61d0aa8531..48d3b25f59e4a2 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
@@ -42,7 +41,7 @@ describe('KpiNetwork Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('KpiNetworkComponent'))).toMatchSnapshot();
+      expect(wrapper.find('KpiNetworkComponent')).toMatchSnapshot();
     });
 
     test('it renders the default widget', () => {
@@ -59,7 +58,7 @@ describe('KpiNetwork Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('KpiNetworkComponent'))).toMatchSnapshot();
+      expect(wrapper.find('KpiNetworkComponent')).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
index 96209635e9fce9..e425057dd0f75f 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
@@ -50,7 +49,7 @@ describe('NetworkTopNFlow Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkDnsTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkDnsTableComponent)')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
index 182d33f202e65e..31a1b1667087a7 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { FlowDirection } from '../../../../graphql/types';
@@ -19,7 +18,7 @@ describe('NetworkTopNFlow Select direction', () => {
     test('it renders the basic switch to include PTR in table', () => {
       const wrapper = shallow(<IsPtrIncluded isPtrIncluded={true} onChange={mockOnChange} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx
index 212a88060cc9ab..6ce87728ebff7e 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
@@ -51,7 +50,7 @@ describe('NetworkHttp Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkHttpTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkHttpTableComponent)')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
index 5b359c1cb53726..764e440a5a4be8 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
@@ -59,7 +58,7 @@ describe('NetworkTopCountries Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkTopCountriesTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkTopCountriesTableComponent)')).toMatchSnapshot();
     });
     test('it renders the IP Details NetworkTopCountries table', () => {
       const wrapper = shallow(
@@ -84,7 +83,7 @@ describe('NetworkTopCountries Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkTopCountriesTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkTopCountriesTableComponent)')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
index 6d53b15e3285b9..24f68ef03d8917 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
@@ -59,7 +58,7 @@ describe('NetworkTopNFlow Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkTopNFlowTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkTopNFlowTableComponent)')).toMatchSnapshot();
     });
 
     test('it renders the default NetworkTopNFlow table on the IP Details page', () => {
@@ -85,7 +84,7 @@ describe('NetworkTopNFlow Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkTopNFlowTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkTopNFlowTableComponent)')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
index 7abbc90353bb4e..81a472f3175e51 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
@@ -47,7 +46,7 @@ describe('Tls Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(TlsTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(TlsTableComponent)')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
index 139ccac1d3293e..b23c7bd504fb7d 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
@@ -55,7 +54,7 @@ describe('Users Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(UsersTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(UsersTableComponent)')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
index 57ec07ce1f306c..f99b2687d70728 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { OverviewHostStats } from '.';
@@ -15,7 +14,7 @@ describe('Overview Host Stat Data', () => {
   describe('rendering', () => {
     test('it renders the default OverviewHostStats', () => {
       const wrapper = shallow(<OverviewHostStats data={mockData.OverviewHost} loading={false} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
   describe('loading', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
index fda0e7dc8b7ab3..08093c5d38c151 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { OverviewNetworkStats } from '.';
@@ -17,7 +16,7 @@ describe('Overview Network Stat Data', () => {
       const wrapper = shallow(
         <OverviewNetworkStats data={mockData.OverviewNetwork} loading={false} />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
   describe('loading', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
index 150c728a38206a..947bdee6a5cd23 100644
--- a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Direction } from '../../graphql/types';
@@ -58,7 +57,7 @@ describe('Paginated Table Component', () => {
         </ThemeProvider>
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the loading panel at the beginning ', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
index 99cd0c158bbc48..6ab587f266a8a4 100644
--- a/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
@@ -20,7 +19,7 @@ describe('Port', () => {
     const wrapper = shallow(
       <Port contextId="test" eventId="abcd" fieldName="destination.port" value="443" />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the port', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/progress_inline/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/progress_inline/index.test.tsx
index 8ecc50402cef10..e5c39b365d9796 100644
--- a/x-pack/legacy/plugins/siem/public/components/progress_inline/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/progress_inline/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { ProgressInline } from './index';
@@ -18,6 +17,6 @@ describe('ProgressInline', () => {
       </ProgressInline>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
index 52abc9e9935449..1237a6538a4c19 100644
--- a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
@@ -107,7 +106,7 @@ describe('Resizeable', () => {
       />
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('resize cursor styling', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
index 98f3574375c24c..430cffa520c005 100644
--- a/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { SelectableText } from '.';
@@ -13,7 +12,7 @@ import { SelectableText } from '.';
 describe('SelectableText', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<SelectableText>{'You may select this text'}</SelectableText>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it applies the user-select: text style', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.test.tsx
index de463f8e29f916..1fdcd8eee941fd 100644
--- a/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -14,7 +13,7 @@ import { SkeletonRow } from './index';
 describe('SkeletonRow', () => {
   test('it renders', () => {
     const wrapper = shallow(<SkeletonRow />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the correct number of cells if cellCount is specified', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
index 9282a05232ce18..3dee668d66a707 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
@@ -6,7 +6,6 @@
 
 import numeral from '@elastic/numeral';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
 import React from 'react';
 
@@ -101,7 +100,7 @@ describe('SourceDestination', () => {
 
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<div>{getSourceDestinationInstance()}</div>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders a destination label', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
index 43d845590ec752..e68cf47500555b 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
@@ -8,7 +8,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, ReactWrapper } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
@@ -93,7 +92,7 @@ describe('Stat Items Component', () => {
     ],
   ])('disable charts', wrapper => {
     test('it renders the default widget', () => {
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should render titles', () => {
@@ -182,7 +181,7 @@ describe('Stat Items Component', () => {
       );
     });
     test('it renders the default widget', () => {
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should handle multiple titles', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/subtitle/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/subtitle/index.test.tsx
index 3424c05f32d637..155b219c04b920 100644
--- a/x-pack/legacy/plugins/siem/public/components/subtitle/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/subtitle/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -15,7 +14,7 @@ describe('Subtitle', () => {
   test('it renders', () => {
     const wrapper = shallow(<Subtitle items="Test subtitle" />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders one subtitle string item', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
index 0b8807915732b8..17c7c0bac8fa21 100644
--- a/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
@@ -12,7 +12,6 @@ import {
 } from './helpers';
 import React from 'react';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { TestProviders } from '../../mock';
 import { getEmptyValue } from '../empty_value';
 import { useMountAppended } from '../../utils/use_mount_appended';
@@ -29,7 +28,7 @@ describe('Table Helpers', () => {
         idPrefix: 'idPrefix',
       });
       const wrapper = shallow(<TestProviders>{rowItem}</TestProviders>);
-      expect(toJson(wrapper.find('DraggableWrapper'))).toMatchSnapshot();
+      expect(wrapper.find('DraggableWrapper')).toMatchSnapshot();
     });
 
     test('it returns empty value when rowItem is undefined', () => {
@@ -97,7 +96,7 @@ describe('Table Helpers', () => {
         idPrefix: 'idPrefix',
       });
       const wrapper = shallow(<TestProviders>{rowItems}</TestProviders>);
-      expect(toJson(wrapper.find('DragDropContext'))).toMatchSnapshot();
+      expect(wrapper.find('DragDropContext')).toMatchSnapshot();
     });
 
     test('it returns empty value when rowItems is undefined', () => {
@@ -193,7 +192,7 @@ describe('Table Helpers', () => {
     test('it returns correctly against snapshot', () => {
       const rowItemOverflow = getRowItemOverflow(items, 'attrName', 1, 1);
       const wrapper = shallow(<div>{rowItemOverflow}</div>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it does not show "more not shown" when maxOverflowItems are not exceeded', () => {
@@ -215,7 +214,7 @@ describe('Table Helpers', () => {
       const wrapper = shallow(
         <OverflowFieldComponent value={overflowString} showToolTip={false} />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it does not truncates as per custom overflowLength value', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
index 48c9c991b24b46..b9cfee395bafb3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { ColumnHeaderType } from '../column_header';
@@ -24,7 +23,7 @@ describe('Filter', () => {
     };
 
     const wrapper = shallow(<Filter header={textFilterColumnHeader} />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('rendering', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
index f1b412319a3772..64f32674cd0422 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Direction } from '../../../../../graphql/types';
@@ -40,7 +39,7 @@ describe('Header', () => {
         timelineId={timelineId}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('rendering', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
index aec0267061f551..20c139ae1d0503 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -89,6 +88,6 @@ describe('HeaderToolTipContent', () => {
   test('it renders the expected table content', () => {
     const wrapper = shallow(<HeaderToolTipContent header={header} />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
index f40c93aaba3a46..0fdd7d78ae2530 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../helpers';
@@ -54,7 +53,7 @@ describe('ColumnHeaders', () => {
           toggleColumn={jest.fn()}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the field browser', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
index 0323629638001b..4378a96b2919a0 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { DEFAULT_PLACEHOLDER, TextFilter } from '.';
@@ -14,7 +13,7 @@ describe('TextFilter', () => {
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(<TextFilter columnId="foo" minWidth={100} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     describe('placeholder', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
index 0638f2d96808f4..36427015260a7f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 
 import React from 'react';
 
@@ -29,6 +28,6 @@ describe('Columns', () => {
       />
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
index f0d63ff0465cf5..53a20544124400 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { useMountAppended } from '../../../../utils/use_mount_appended';
@@ -25,7 +24,7 @@ describe('Args', () => {
           processTitle="process-title-1"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns an empty string when both args and process title are undefined', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
index 260e713474ac62..21cccc88f4fbce 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
@@ -30,7 +29,7 @@ describe('GenericDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns auditd if the data does contain auditd data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
index 1abcb459b77206..fce0e1d645e164 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
@@ -31,7 +30,7 @@ describe('GenericFileDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns auditd if the data does contain auditd data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
index 4f66793ffae324..b78d9261849cb8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -46,7 +45,7 @@ describe('GenericRowRenderer', () => {
       });
 
       const wrapper = shallow(<span>{children}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return false if not a auditd datum', () => {
@@ -125,7 +124,7 @@ describe('GenericRowRenderer', () => {
       });
 
       const wrapper = shallow(<span>{children}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return false if not a auditd datum', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
index 8212f4c9c7974d..598769e854b422 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
@@ -26,7 +25,7 @@ describe('UserPrimarySecondary', () => {
           secondary="secondary-1"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should render user name only if that is all that is present', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
index ec56e38ffade30..a0a9977f5765e3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
@@ -6,7 +6,6 @@
 
 import { EuiFlexItem } from '@elastic/eui';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
@@ -32,7 +31,7 @@ describe('SessionUserHostWorkingDir', () => {
           />
         </EuiFlexItem>
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders with just eventId and contextId', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx
index 04f7cd9b560a69..b31d01b8e94a0f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -36,7 +35,7 @@ describe('empty_column_renderer', () => {
       timelineId: 'test',
     });
     const wrapper = shallow(<span>{emptyColumn}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should return isInstance true if source is empty', () => {
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 1e7c3bfedc9b9c..73f7b004ca3f71 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
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
 import React from 'react';
 
@@ -33,7 +32,7 @@ describe('Events', () => {
         />
       </TestProviders>
     );
-    expect(toJson(wrapper.find('FormattedFieldValue'))).toMatchSnapshot();
+    expect(wrapper.find('FormattedFieldValue')).toMatchSnapshot();
   });
 
   test('it renders a localized date tooltip for a field type of date that has a valid timestamp', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
index 908e01ef110c02..25d5c71caf48ab 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -41,7 +40,7 @@ describe('get_column_renderer', () => {
     });
 
     const wrapper = shallow(<span>{column}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should render event severity when dealing with data that is not suricata', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
index e73802b9295d67..f367769b78f40d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 
@@ -44,7 +43,7 @@ describe('get_column_renderer', () => {
     });
 
     const wrapper = shallow(<span>{row}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should render plain row data when it is a non suricata row', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx
index 6c58b1ec6f35c9..d84dfcc5618826 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { mockTimelineData, TestProviders } from '../../../../mock';
@@ -24,7 +23,7 @@ describe('HostWorkingDir', () => {
         workingDirectory="[working-directory-123]"
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders a hostname without a workingDirectory', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
index 188e9babfaf454..68629a9a70058c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
@@ -38,7 +37,7 @@ describe('netflowRowRenderer', () => {
     });
 
     const wrapper = shallow(<span>{children}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('#isInstance', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
index 975af67efd763c..8a22307767a40b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -36,7 +35,7 @@ describe('plain_column_renderer', () => {
         timelineId: 'test',
       });
       const wrapper = shallow(<span>{column}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return isInstance false if source is empty', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx
index 355f3fb248238e..50ea7ca05b921a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
@@ -30,7 +29,7 @@ describe('plain_row_renderer', () => {
       timelineId: 'test',
     });
     const wrapper = shallow(<span>{children}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should always return isInstance true', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
index a9dae95d700c3f..8cc7323ed358f8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../../mock';
@@ -28,7 +27,7 @@ describe('ProcessDraggable', () => {
           processPid={123}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns null if everything is null', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
index c8921fb616e56c..027aa0df8bcdd3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -26,7 +25,7 @@ describe('SuricataDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns text if the data does contain suricata data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
index be8d557b638111..170d17e8e279ea 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -35,7 +34,7 @@ describe('suricata_row_renderer', () => {
     });
 
     const wrapper = shallow(<span>{children}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should return false if not a suricata datum', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
index 3e643fe5c78300..beae16af558ed5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
@@ -30,7 +29,7 @@ describe('SuricataSignature', () => {
           signature="ET SCAN ATTACK Hello"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
index 5831af59545078..4e4e1a0b7bf6fa 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { AuthSsh } from './auth_ssh';
@@ -21,7 +20,7 @@ describe('AuthSsh', () => {
           sshMethod="[ssh-method]"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns null if sshSignature and sshMethod are both null', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
index ca3445c23cecf5..19113d93f7cb03 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
@@ -30,7 +29,7 @@ describe('SystemGenericDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns system rendering if the data does contain system data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
index cd721b109090f1..cab7191c13aef5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
@@ -30,7 +29,7 @@ describe('SystemGenericFileDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns system rendering if the data does contain system data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
index 4d3f2d71604e8c..5f809d595f1b05 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -75,7 +74,7 @@ describe('GenericRowRenderer', () => {
       });
 
       const wrapper = shallow(<span>{children}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return false if not a system datum', () => {
@@ -139,7 +138,7 @@ describe('GenericRowRenderer', () => {
       });
 
       const wrapper = shallow(<span>{children}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return false if not a auditd datum', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
index e561ad462ae4e8..100c8fbe5a9888 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
@@ -26,7 +25,7 @@ describe('Package', () => {
           packageVersion="package-version-123"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns null if all of the package information is null ', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx
index 41a71f55cae19f..73d1d5cb441ef3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
@@ -34,7 +33,7 @@ describe('unknown_column_renderer', () => {
       timelineId: 'test',
     });
     const wrapper = shallow(<span>{emptyColumn}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should return isInstance true with a made up column name', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
index 8ecc917a383b89..45b670acb569ab 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../../mock';
@@ -27,7 +26,7 @@ describe('UserHostWorkingDir', () => {
           workingDirectory="[working-directory-123]"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns null if userDomain, userName, hostName, and workingDirectory are all null', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
index a2c0f0403c801b..7617a01acf1d91 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -26,7 +25,7 @@ describe('ZeekDetails', () => {
           />
         </TestProviders>
       );
-      expect(toJson(wrapper.find('ZeekDetails'))).toMatchSnapshot();
+      expect(wrapper.find('ZeekDetails')).toMatchSnapshot();
     });
 
     test('it returns zeek.connection if the data does contain zeek.connection data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
index b61b445a5dd753..4242308a55a646 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -34,7 +33,7 @@ describe('zeek_row_renderer', () => {
     });
 
     const wrapper = shallow(<span>{children}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should return false if not a zeek datum', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
index 763d10e732c576..c09bd6b7a356de 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -37,7 +36,7 @@ describe('ZeekSignature', () => {
   describe('rendering', () => {
     test('it renders the default Zeek', () => {
       const wrapper = shallow(<ZeekSignature data={zeek} timelineId="test" />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
index f3116bc2f4bf45..db3e96a4e26502 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Direction } from '../../../../graphql/types';
@@ -16,7 +15,7 @@ describe('SortIndicator', () => {
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(<SortIndicator sortDirection={Direction.desc} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the sort indicator', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
index 43425bd6c51303..a88062d9093d77 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
@@ -36,7 +35,7 @@ describe('DataProviders', () => {
           show={true}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it should render a placeholder when there are zero data providers', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
index 18bb0b20b30615..10586657b52a3d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Empty } from './empty';
@@ -15,7 +14,7 @@ describe('Empty', () => {
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(<Empty />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     const dropMessage = ['Drop', 'anything', 'highlighted', 'here'];
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
index e47117c9550fe9..f0d7ca83fb391e 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
@@ -17,7 +16,7 @@ describe('Provider', () => {
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(<Provider dataProvider={mockDataProviders[0]} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the data provider', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
index 246fefda8d5236..d8076ac90e6b20 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
@@ -36,7 +35,7 @@ describe('Providers', () => {
           onToggleDataProviderExcluded={jest.fn()}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the data providers', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
index 2d8c0e73029443..b6ca4fe125c696 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
 import React from 'react';
 
@@ -41,7 +40,7 @@ describe('Footer Timeline Component', () => {
         />
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the loading panel at the beginning ', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
index d8f56507bf3655..5af7aff4f87955 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Direction } from '../../../graphql/types';
@@ -44,7 +43,7 @@ describe('Header', () => {
           }}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the data providers', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
index 34e62cf2c22479..2971053bc5252b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
@@ -78,7 +77,7 @@ describe('Timeline', () => {
           toggleColumn={jest.fn()}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the timeline header', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx b/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
index 7c19b61c4b49df..bfca035e891e8e 100644
--- a/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 
 import React from 'react';
 
@@ -30,7 +29,7 @@ describe('Modal all errors', () => {
       const wrapper = shallow(
         <ModalAllErrors isShowing={true} toast={mockToast} toggle={toggle} />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders null when isShowing is negative', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
index e4c799822ba170..92868b23a3ccd8 100644
--- a/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TruncatableText } from '.';
@@ -13,7 +12,7 @@ import { TruncatableText } from '.';
 describe('TruncatableText', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<TruncatableText>{'Hiding in plain sight'}</TruncatableText>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it adds the hidden overflow style', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/wrapper_page/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/wrapper_page/index.test.tsx
index 5d73e9bcf8e71c..788ea14f4bd22d 100644
--- a/x-pack/legacy/plugins/siem/public/components/wrapper_page/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/wrapper_page/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -21,7 +20,7 @@ describe('WrapperPage', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('WrapperPage'))).toMatchSnapshot();
+    expect(wrapper.find('WrapperPage')).toMatchSnapshot();
   });
 
   describe('restrict width', () => {
@@ -34,7 +33,7 @@ describe('WrapperPage', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('WrapperPage'))).toMatchSnapshot();
+      expect(wrapper.find('WrapperPage')).toMatchSnapshot();
     });
 
     test('custom max width when restrictWidth is number', () => {
@@ -46,7 +45,7 @@ describe('WrapperPage', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('WrapperPage'))).toMatchSnapshot();
+      expect(wrapper.find('WrapperPage')).toMatchSnapshot();
     });
 
     test('custom max width when restrictWidth is string', () => {
@@ -58,7 +57,7 @@ describe('WrapperPage', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('WrapperPage'))).toMatchSnapshot();
+      expect(wrapper.find('WrapperPage')).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
index 7544edac5a5503..e10194853e7f93 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { ImportRuleModalComponent } from './index';
 
@@ -20,6 +19,6 @@ describe('ImportRuleModal', () => {
         importComplete={jest.fn()}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
index e5ba3b8d6ddbd0..859918cdc8e605 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { JSONDownloaderComponent, jsonToNDJSON, ndjsonToJSON } from './index';
 
@@ -37,7 +36,7 @@ describe('JSONDownloader', () => {
     const wrapper = shallow(
       <JSONDownloaderComponent filename={'export_rules.ndjson'} onExportComplete={jest.fn()} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('jsonToNDJSON', () => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
index 3fc29c472e4d73..104eff34c91b31 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { RuleSwitchComponent } from './index';
@@ -15,6 +14,6 @@ describe('RuleSwitch', () => {
     const wrapper = shallow(
       <RuleSwitchComponent optionLabel="rule-switch" enabled={true} id={'7'} isLoading={false} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
index 347f15ed0a8498..9a9d1cf085eb95 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 import { Router } from 'react-router-dom';
@@ -129,7 +128,7 @@ describe('Ip Details', () => {
 
   test('it matches the snapshot', () => {
     const wrapper = shallow(<IPDetailsComponent {...getMockProps('123.456.78.90')} />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders ipv6 headline', async () => {

From 56041f03ada9730e701508dbc10032b69de9f218 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 8 Jan 2020 12:01:47 +0300
Subject: [PATCH 42/96] Don't expose Elasticsearch client as Observable
 (#53824)

* expose ES clients without observables

* expose observable-less api to plugins

* update core api and mocks

* update plugins

* NP SO & legacy use updated API

* update SO tests

* update TSDocs

* update types

* update docs

* document createCluster analog in np

* typo
---
 ...a-plugin-public.savedobjectsclient.find.md |  2 +-
 ...kibana-plugin-public.savedobjectsclient.md |  2 +-
 ...na-plugin-server.clusterclient.asscoped.md |  4 +-
 .../kibana-plugin-server.clusterclient.md     |  2 +-
 ...r.elasticsearchservicesetup.adminclient.md | 22 +++++++
 ....elasticsearchservicesetup.adminclient_.md | 19 ------
 ....elasticsearchservicesetup.createclient.md |  2 +-
 ...er.elasticsearchservicesetup.dataclient.md | 22 +++++++
 ...r.elasticsearchservicesetup.dataclient_.md | 19 ------
 ...plugin-server.elasticsearchservicesetup.md | 16 +----
 .../kibana-plugin-server.iclusterclient.md    |  4 +-
 ...bana-plugin-server.icustomclusterclient.md | 15 +++++
 .../core/server/kibana-plugin-server.md       |  6 +-
 .../kibana-plugin-server.scopeablerequest.md  | 15 +++++
 src/core/MIGRATION.md                         |  1 +
 .../server/elasticsearch/cluster_client.ts    | 30 +++++++--
 .../elasticsearch_service.mock.ts             | 60 +++++++++++++----
 .../elasticsearch_service.test.ts             | 22 +++++++
 .../elasticsearch/elasticsearch_service.ts    | 65 +++++++++++++++++--
 src/core/server/elasticsearch/index.ts        |  8 ++-
 src/core/server/elasticsearch/types.ts        | 27 ++++----
 src/core/server/index.ts                      |  2 +
 src/core/server/legacy/legacy_service.ts      |  4 +-
 src/core/server/mocks.ts                      |  4 +-
 src/core/server/plugins/plugin_context.ts     |  4 +-
 .../saved_objects_service.test.ts             |  9 ++-
 .../saved_objects/saved_objects_service.ts    |  8 +--
 .../service/lib/scoped_client_provider.ts     |  6 --
 src/core/server/server.api.md                 | 16 +++--
 src/core/server/server.ts                     |  3 +-
 .../core_plugins/elasticsearch/index.js       | 23 ++-----
 .../saved_objects/saved_objects_mixin.test.js |  7 +-
 src/plugins/testbed/server/index.ts           |  6 +-
 .../legacy/plugins/actions/server/plugin.ts   |  2 +-
 .../legacy/plugins/alerting/server/plugin.ts  |  4 +-
 .../plugins/watcher/server/np_ready/plugin.ts |  3 +-
 x-pack/plugins/apm/server/plugin.ts           | 18 +++--
 .../plugins/licensing/server/plugin.test.ts   | 21 +++---
 x-pack/plugins/licensing/server/plugin.ts     |  2 +-
 x-pack/plugins/security/server/plugin.test.ts |  8 +--
 x-pack/plugins/security/server/plugin.ts      |  4 +-
 .../spaces/server/lib/create_default_space.ts |  2 +-
 .../on_post_auth_interceptor.test.ts          |  2 +-
 .../spaces_tutorial_context_factory.test.ts   |  2 +-
 x-pack/plugins/spaces/server/plugin.ts        |  6 +-
 .../routes/api/external/copy_to_space.test.ts |  2 +-
 .../server/routes/api/external/delete.test.ts |  2 +-
 .../server/routes/api/external/get.test.ts    |  2 +-
 .../routes/api/external/get_all.test.ts       |  2 +-
 .../server/routes/api/external/post.test.ts   |  2 +-
 .../server/routes/api/external/put.test.ts    |  2 +-
 .../api/internal/get_active_space.test.ts     |  2 +-
 .../spaces_service/spaces_service.test.ts     |  2 +-
 .../server/spaces_service/spaces_service.ts   | 10 +--
 54 files changed, 353 insertions(+), 202 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient.md
 delete mode 100644 docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md
 create mode 100644 docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient.md
 delete mode 100644 docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md
 create mode 100644 docs/development/core/server/kibana-plugin-server.icustomclusterclient.md
 create mode 100644 docs/development/core/server/kibana-plugin-server.scopeablerequest.md

diff --git a/docs/development/core/public/kibana-plugin-public.savedobjectsclient.find.md b/docs/development/core/public/kibana-plugin-public.savedobjectsclient.find.md
index 1ce18834f53196..a4fa3f17d0d94f 100644
--- a/docs/development/core/public/kibana-plugin-public.savedobjectsclient.find.md
+++ b/docs/development/core/public/kibana-plugin-public.savedobjectsclient.find.md
@@ -9,5 +9,5 @@ Search for objects
 <b>Signature:</b>
 
 ```typescript
-find: <T extends SavedObjectAttributes>(options: Pick<SavedObjectFindOptionsServer, "search" | "filter" | "type" | "page" | "fields" | "searchFields" | "defaultSearchOperator" | "hasReference" | "sortField" | "perPage">) => Promise<SavedObjectsFindResponsePublic<T>>;
+find: <T extends SavedObjectAttributes>(options: Pick<SavedObjectFindOptionsServer, "search" | "filter" | "type" | "page" | "perPage" | "sortField" | "fields" | "searchFields" | "hasReference" | "defaultSearchOperator">) => Promise<SavedObjectsFindResponsePublic<T>>;
 ```
diff --git a/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md b/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md
index 3b916db9726738..88485aa71f7c54 100644
--- a/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md
+++ b/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md
@@ -24,7 +24,7 @@ The constructor for this class is marked as internal. Third-party code should no
 |  [bulkGet](./kibana-plugin-public.savedobjectsclient.bulkget.md) |  | <code>(objects?: {</code><br/><code>        id: string;</code><br/><code>        type: string;</code><br/><code>    }[]) =&gt; Promise&lt;SavedObjectsBatchResponse&lt;SavedObjectAttributes&gt;&gt;</code> | Returns an array of objects by id |
 |  [create](./kibana-plugin-public.savedobjectsclient.create.md) |  | <code>&lt;T extends SavedObjectAttributes&gt;(type: string, attributes: T, options?: SavedObjectsCreateOptions) =&gt; Promise&lt;SimpleSavedObject&lt;T&gt;&gt;</code> | Persists an object |
 |  [delete](./kibana-plugin-public.savedobjectsclient.delete.md) |  | <code>(type: string, id: string) =&gt; Promise&lt;{}&gt;</code> | Deletes an object |
-|  [find](./kibana-plugin-public.savedobjectsclient.find.md) |  | <code>&lt;T extends SavedObjectAttributes&gt;(options: Pick&lt;SavedObjectFindOptionsServer, &quot;search&quot; &#124; &quot;filter&quot; &#124; &quot;type&quot; &#124; &quot;page&quot; &#124; &quot;fields&quot; &#124; &quot;searchFields&quot; &#124; &quot;defaultSearchOperator&quot; &#124; &quot;hasReference&quot; &#124; &quot;sortField&quot; &#124; &quot;perPage&quot;&gt;) =&gt; Promise&lt;SavedObjectsFindResponsePublic&lt;T&gt;&gt;</code> | Search for objects |
+|  [find](./kibana-plugin-public.savedobjectsclient.find.md) |  | <code>&lt;T extends SavedObjectAttributes&gt;(options: Pick&lt;SavedObjectFindOptionsServer, &quot;search&quot; &#124; &quot;filter&quot; &#124; &quot;type&quot; &#124; &quot;page&quot; &#124; &quot;perPage&quot; &#124; &quot;sortField&quot; &#124; &quot;fields&quot; &#124; &quot;searchFields&quot; &#124; &quot;hasReference&quot; &#124; &quot;defaultSearchOperator&quot;&gt;) =&gt; Promise&lt;SavedObjectsFindResponsePublic&lt;T&gt;&gt;</code> | Search for objects |
 |  [get](./kibana-plugin-public.savedobjectsclient.get.md) |  | <code>&lt;T extends SavedObjectAttributes&gt;(type: string, id: string) =&gt; Promise&lt;SimpleSavedObject&lt;T&gt;&gt;</code> | Fetches a single object |
 
 ## Methods
diff --git a/docs/development/core/server/kibana-plugin-server.clusterclient.asscoped.md b/docs/development/core/server/kibana-plugin-server.clusterclient.asscoped.md
index ed7d028a1ec8a2..bb1f481c9ef4fb 100644
--- a/docs/development/core/server/kibana-plugin-server.clusterclient.asscoped.md
+++ b/docs/development/core/server/kibana-plugin-server.clusterclient.asscoped.md
@@ -9,14 +9,14 @@ Creates an instance of [IScopedClusterClient](./kibana-plugin-server.iscopedclus
 <b>Signature:</b>
 
 ```typescript
-asScoped(request?: KibanaRequest | LegacyRequest | FakeRequest): IScopedClusterClient;
+asScoped(request?: ScopeableRequest): IScopedClusterClient;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  request | <code>KibanaRequest &#124; LegacyRequest &#124; FakeRequest</code> | Request the <code>IScopedClusterClient</code> instance will be scoped to. Supports request optionality, Legacy.Request &amp; FakeRequest for BWC with LegacyPlatform |
+|  request | <code>ScopeableRequest</code> | Request the <code>IScopedClusterClient</code> instance will be scoped to. Supports request optionality, Legacy.Request &amp; FakeRequest for BWC with LegacyPlatform |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.clusterclient.md b/docs/development/core/server/kibana-plugin-server.clusterclient.md
index 5fdda7ef3e499a..d547b846e65b79 100644
--- a/docs/development/core/server/kibana-plugin-server.clusterclient.md
+++ b/docs/development/core/server/kibana-plugin-server.clusterclient.md
@@ -4,7 +4,7 @@
 
 ## ClusterClient class
 
-Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
+Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
 
 See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->.
 
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient.md
new file mode 100644
index 00000000000000..415423f555266d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) &gt; [adminClient](./kibana-plugin-server.elasticsearchservicesetup.adminclient.md)
+
+## ElasticsearchServiceSetup.adminClient property
+
+A client for the `admin` cluster. All Elasticsearch config value changes are processed under the hood. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+readonly adminClient: IClusterClient;
+```
+
+## Example
+
+
+```js
+const client = core.elasticsearch.adminClient;
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md
deleted file mode 100644
index b5bfc68d3ca0c4..00000000000000
--- a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) &gt; [adminClient$](./kibana-plugin-server.elasticsearchservicesetup.adminclient_.md)
-
-## ElasticsearchServiceSetup.adminClient$ property
-
-Observable of clients for the `admin` cluster. Observable emits when Elasticsearch config changes on the Kibana server. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
-
-
-```js
-const client = await elasticsearch.adminClient$.pipe(take(1)).toPromise();
-
-```
-
-<b>Signature:</b>
-
-```typescript
-readonly adminClient$: Observable<IClusterClient>;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md
index 3d26f2d4cec889..797f402cc25807 100644
--- a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md
@@ -9,7 +9,7 @@ Create application specific Elasticsearch cluster API client with customized con
 <b>Signature:</b>
 
 ```typescript
-readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => IClusterClient;
+readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
 ```
 
 ## Example
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient.md
new file mode 100644
index 00000000000000..e9845dce6915d0
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) &gt; [dataClient](./kibana-plugin-server.elasticsearchservicesetup.dataclient.md)
+
+## ElasticsearchServiceSetup.dataClient property
+
+A client for the `data` cluster. All Elasticsearch config value changes are processed under the hood. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+readonly dataClient: IClusterClient;
+```
+
+## Example
+
+
+```js
+const client = core.elasticsearch.dataClient;
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md
deleted file mode 100644
index 9411f2f6b86946..00000000000000
--- a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) &gt; [dataClient$](./kibana-plugin-server.elasticsearchservicesetup.dataclient_.md)
-
-## ElasticsearchServiceSetup.dataClient$ property
-
-Observable of clients for the `data` cluster. Observable emits when Elasticsearch config changes on the Kibana server. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
-
-
-```js
-const client = await elasticsearch.dataClient$.pipe(take(1)).toPromise();
-
-```
-
-<b>Signature:</b>
-
-```typescript
-readonly dataClient$: Observable<IClusterClient>;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.md
index e3d151cdc0d8bb..2de3f6e6d1bbca 100644
--- a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.md
@@ -15,17 +15,7 @@ export interface ElasticsearchServiceSetup
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [adminClient$](./kibana-plugin-server.elasticsearchservicesetup.adminclient_.md) | <code>Observable&lt;IClusterClient&gt;</code> | Observable of clients for the <code>admin</code> cluster. Observable emits when Elasticsearch config changes on the Kibana server. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
-```js
-const client = await elasticsearch.adminClient$.pipe(take(1)).toPromise();
-
-```
- |
-|  [createClient](./kibana-plugin-server.elasticsearchservicesetup.createclient.md) | <code>(type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; IClusterClient</code> | Create application specific Elasticsearch cluster API client with customized config. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->. |
-|  [dataClient$](./kibana-plugin-server.elasticsearchservicesetup.dataclient_.md) | <code>Observable&lt;IClusterClient&gt;</code> | Observable of clients for the <code>data</code> cluster. Observable emits when Elasticsearch config changes on the Kibana server. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
-```js
-const client = await elasticsearch.dataClient$.pipe(take(1)).toPromise();
-
-```
- |
+|  [adminClient](./kibana-plugin-server.elasticsearchservicesetup.adminclient.md) | <code>IClusterClient</code> | A client for the <code>admin</code> cluster. All Elasticsearch config value changes are processed under the hood. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->. |
+|  [createClient](./kibana-plugin-server.elasticsearchservicesetup.createclient.md) | <code>(type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ICustomClusterClient</code> | Create application specific Elasticsearch cluster API client with customized config. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->. |
+|  [dataClient](./kibana-plugin-server.elasticsearchservicesetup.dataclient.md) | <code>IClusterClient</code> | A client for the <code>data</code> cluster. All Elasticsearch config value changes are processed under the hood. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.iclusterclient.md b/docs/development/core/server/kibana-plugin-server.iclusterclient.md
index 834afa6db51570..e7435a9d91a74d 100644
--- a/docs/development/core/server/kibana-plugin-server.iclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-server.iclusterclient.md
@@ -4,12 +4,12 @@
 
 ## IClusterClient type
 
-Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
+Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
 
 See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->.
 
 <b>Signature:</b>
 
 ```typescript
-export declare type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+export declare type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.icustomclusterclient.md b/docs/development/core/server/kibana-plugin-server.icustomclusterclient.md
new file mode 100644
index 00000000000000..bc9ea71bc23893
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.icustomclusterclient.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ICustomClusterClient](./kibana-plugin-server.icustomclusterclient.md)
+
+## ICustomClusterClient type
+
+Represents an Elasticsearch cluster API client created by a plugin.. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
+
+See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+export declare type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.md b/docs/development/core/server/kibana-plugin-server.md
index 5e7f84c55244d4..3f01048846fe1a 100644
--- a/docs/development/core/server/kibana-plugin-server.md
+++ b/docs/development/core/server/kibana-plugin-server.md
@@ -17,7 +17,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  Class | Description |
 |  --- | --- |
 |  [BasePath](./kibana-plugin-server.basepath.md) | Access or manipulate the Kibana base path |
-|  [ClusterClient](./kibana-plugin-server.clusterclient.md) | Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
+|  [ClusterClient](./kibana-plugin-server.clusterclient.md) | Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
 |  [CspConfig](./kibana-plugin-server.cspconfig.md) | CSP configuration for use in Kibana. |
 |  [ElasticsearchErrorHelpers](./kibana-plugin-server.elasticsearcherrorhelpers.md) | Helpers for working with errors returned from the Elasticsearch service.Since the internal data of errors are subject to change, consumers of the Elasticsearch service should always use these helpers to classify errors instead of checking error internals such as <code>body.error.header[WWW-Authenticate]</code> |
 |  [KibanaRequest](./kibana-plugin-server.kibanarequest.md) | Kibana specific abstraction for an incoming request. |
@@ -175,8 +175,9 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [Headers](./kibana-plugin-server.headers.md) | Http request headers to read. |
 |  [HttpResponsePayload](./kibana-plugin-server.httpresponsepayload.md) | Data send to the client as a response payload. |
 |  [IBasePath](./kibana-plugin-server.ibasepath.md) | Access or manipulate the Kibana base path[BasePath](./kibana-plugin-server.basepath.md) |
-|  [IClusterClient](./kibana-plugin-server.iclusterclient.md) | Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
+|  [IClusterClient](./kibana-plugin-server.iclusterclient.md) | Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
 |  [IContextProvider](./kibana-plugin-server.icontextprovider.md) | A function that returns a context value for a specific key of given context type. |
+|  [ICustomClusterClient](./kibana-plugin-server.icustomclusterclient.md) | Represents an Elasticsearch cluster API client created by a plugin.. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
 |  [IsAuthenticated](./kibana-plugin-server.isauthenticated.md) | Return authentication status for a request. |
 |  [ISavedObjectsRepository](./kibana-plugin-server.isavedobjectsrepository.md) | See [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) |
 |  [IScopedClusterClient](./kibana-plugin-server.iscopedclusterclient.md) | Serves the same purpose as "normal" <code>ClusterClient</code> but exposes additional <code>callAsCurrentUser</code> method that doesn't use credentials of the Kibana internal user (as <code>callAsInternalUser</code> does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API.<!-- -->See [ScopedClusterClient](./kibana-plugin-server.scopedclusterclient.md)<!-- -->. |
@@ -213,6 +214,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsClientContract](./kibana-plugin-server.savedobjectsclientcontract.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing plugin state.<!-- -->\#\# SavedObjectsClient errors<!-- -->Since the SavedObjectsClient has its hands in everything we are a little paranoid about the way we present errors back to to application code. Ideally, all errors will be either:<!-- -->1. Caused by bad implementation (ie. undefined is not a function) and as such unpredictable 2. An error that has been classified and decorated appropriately by the decorators in [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md)<!-- -->Type 1 errors are inevitable, but since all expected/handle-able errors should be Type 2 the <code>isXYZError()</code> helpers exposed at <code>SavedObjectsErrorHelpers</code> should be used to understand and manage error responses from the <code>SavedObjectsClient</code>.<!-- -->Type 2 errors are decorated versions of the source error, so if the elasticsearch client threw an error it will be decorated based on its type. That means that rather than looking for <code>error.body.error.type</code> or doing substring checks on <code>error.body.error.reason</code>, just use the helpers to understand the meaning of the error:<!-- -->\`\`\`<!-- -->js if (SavedObjectsErrorHelpers.isNotFoundError(error)) { // handle 404 }<!-- -->if (SavedObjectsErrorHelpers.isNotAuthorizedError(error)) { // 401 handling should be automatic, but in case you wanted to know }<!-- -->// always rethrow the error unless you handle it throw error; \`\`\`<!-- -->\#\#\# 404s from missing index<!-- -->From the perspective of application code and APIs the SavedObjectsClient is a black box that persists objects. One of the internal details that users have no control over is that we use an elasticsearch index for persistance and that index might be missing.<!-- -->At the time of writing we are in the process of transitioning away from the operating assumption that the SavedObjects index is always available. Part of this transition is handling errors resulting from an index missing. These used to trigger a 500 error in most cases, and in others cause 404s with different error messages.<!-- -->From my (Spencer) perspective, a 404 from the SavedObjectsApi is a 404; The object the request/call was targeting could not be found. This is why \#14141 takes special care to ensure that 404 errors are generic and don't distinguish between index missing or document missing.<!-- -->\#\#\# 503s from missing index<!-- -->Unlike all other methods, create requests are supposed to succeed even when the Kibana index does not exist because it will be automatically created by elasticsearch. When that is not the case it is because Elasticsearch's <code>action.auto_create_index</code> setting prevents it from being created automatically so we throw a special 503 with the intention of informing the user that their Elasticsearch settings need to be updated.<!-- -->See [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) See [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) |
 |  [SavedObjectsClientFactory](./kibana-plugin-server.savedobjectsclientfactory.md) | Describes the factory used to create instances of the Saved Objects Client. |
 |  [SavedObjectsClientWrapperFactory](./kibana-plugin-server.savedobjectsclientwrapperfactory.md) | Describes the factory used to create instances of Saved Objects Client Wrappers. |
+|  [ScopeableRequest](./kibana-plugin-server.scopeablerequest.md) | A user credentials container. It accommodates the necessary auth credentials to impersonate the current user.<!-- -->See [KibanaRequest](./kibana-plugin-server.kibanarequest.md)<!-- -->. |
 |  [SharedGlobalConfig](./kibana-plugin-server.sharedglobalconfig.md) |  |
 |  [UiSettingsType](./kibana-plugin-server.uisettingstype.md) | UI element type to represent the settings. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.scopeablerequest.md b/docs/development/core/server/kibana-plugin-server.scopeablerequest.md
new file mode 100644
index 00000000000000..5a9443376996d1
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.scopeablerequest.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ScopeableRequest](./kibana-plugin-server.scopeablerequest.md)
+
+## ScopeableRequest type
+
+A user credentials container. It accommodates the necessary auth credentials to impersonate the current user.
+
+See [KibanaRequest](./kibana-plugin-server.kibanarequest.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+export declare type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
+```
diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
index 1c78de966c46f7..b70ac610f24a79 100644
--- a/src/core/MIGRATION.md
+++ b/src/core/MIGRATION.md
@@ -1194,6 +1194,7 @@ In server code, `core` can be accessed from either `server.newPlatform` or `kbnS
 | `request.getBasePath()`                                                       | [`core.http.basePath.get`](/docs/development/core/server/kibana-plugin-server.httpservicesetup.basepath.md)                                                                                                                                                                                                 |                                                                             |
 | `server.plugins.elasticsearch.getCluster('data')`                             | [`context.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)                                                                                                                                                                                            |                                                                             |
 | `server.plugins.elasticsearch.getCluster('admin')`                            | [`context.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)                                                                                                                                                                                           |                                                                             |
+| `server.plugins.elasticsearch.createCluster(...)`                            | [`core.elasticsearch.createClient`](/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md)                                                                                                                                                                                           |                                                                             |
 | `server.savedObjects.setScopedSavedObjectsClientFactory`                      | [`core.savedObjects.setClientFactory`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md)                                                                                                                                                                     |                                                                             |
 | `server.savedObjects.addScopedSavedObjectsClientWrapperFactory`               | [`core.savedObjects.addClientWrapper`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.addclientwrapper.md)                                                                                                                                                                     |                                                                             |
 | `server.savedObjects.getSavedObjectsRepository`                               | [`core.savedObjects.createInternalRepository`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.createinternalrepository.md) [`core.savedObjects.createScopedRepository`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.createscopedrepository.md) |                                                                             |
diff --git a/src/core/server/elasticsearch/cluster_client.ts b/src/core/server/elasticsearch/cluster_client.ts
index d43ab9d546ed2e..2352677b8d3e0a 100644
--- a/src/core/server/elasticsearch/cluster_client.ts
+++ b/src/core/server/elasticsearch/cluster_client.ts
@@ -89,15 +89,35 @@ export interface FakeRequest {
 }
 
 /**
- * Represents an Elasticsearch cluster API client and allows to call API on behalf
- * of the internal Kibana user and the actual user that is derived from the request
- * headers (via `asScoped(...)`).
+ * Represents an Elasticsearch cluster API client created by the platform.
+ * It allows to call API on behalf of the internal Kibana user and
+ * the actual user that is derived from the request headers (via `asScoped(...)`).
  *
  * See {@link ClusterClient}.
  *
  * @public
  */
-export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+
+/**
+ * Represents an Elasticsearch cluster API client created by a plugin.
+ * It allows to call API on behalf of the internal Kibana user and
+ * the actual user that is derived from the request headers (via `asScoped(...)`).
+ *
+ * See {@link ClusterClient}.
+ *
+ * @public
+ */
+export type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+
+/**
+ A user credentials container.
+ * It accommodates the necessary auth credentials to impersonate the current user.
+ *
+ * @public
+ * See {@link KibanaRequest}.
+ */
+export type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
 
 /**
  * {@inheritDoc IClusterClient}
@@ -174,7 +194,7 @@ export class ClusterClient implements IClusterClient {
    * @param request - Request the `IScopedClusterClient` instance will be scoped to.
    * Supports request optionality, Legacy.Request & FakeRequest for BWC with LegacyPlatform
    */
-  public asScoped(request?: KibanaRequest | LegacyRequest | FakeRequest): IScopedClusterClient {
+  public asScoped(request?: ScopeableRequest): IScopedClusterClient {
     // It'd have been quite expensive to create and configure client for every incoming
     // request since it involves parsing of the config, reading of the SSL certificate and
     // key files etc. Moreover scoped client needs two Elasticsearch JS clients at the same
diff --git a/src/core/server/elasticsearch/elasticsearch_service.mock.ts b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
index d935d1a66eccfd..1b52f22c4da09a 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.mock.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
@@ -18,33 +18,67 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { IClusterClient } from './cluster_client';
+import { IClusterClient, ICustomClusterClient } from './cluster_client';
 import { IScopedClusterClient } from './scoped_cluster_client';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchService } from './elasticsearch_service';
-import { InternalElasticsearchServiceSetup } from './types';
+import { InternalElasticsearchServiceSetup, ElasticsearchServiceSetup } from './types';
 
 const createScopedClusterClientMock = (): jest.Mocked<IScopedClusterClient> => ({
   callAsInternalUser: jest.fn(),
   callAsCurrentUser: jest.fn(),
 });
 
-const createClusterClientMock = (): jest.Mocked<IClusterClient> => ({
-  callAsInternalUser: jest.fn(),
-  asScoped: jest.fn().mockImplementation(createScopedClusterClientMock),
+const createCustomClusterClientMock = (): jest.Mocked<ICustomClusterClient> => ({
+  ...createClusterClientMock(),
   close: jest.fn(),
 });
 
+function createClusterClientMock() {
+  const client: jest.Mocked<IClusterClient> = {
+    callAsInternalUser: jest.fn(),
+    asScoped: jest.fn(),
+  };
+  client.asScoped.mockReturnValue(createScopedClusterClientMock());
+  return client;
+}
+
+type MockedElasticSearchServiceSetup = jest.Mocked<
+  ElasticsearchServiceSetup & {
+    adminClient: jest.Mocked<IClusterClient>;
+    dataClient: jest.Mocked<IClusterClient>;
+  }
+>;
+
 const createSetupContractMock = () => {
-  const setupContract: jest.Mocked<InternalElasticsearchServiceSetup> = {
+  const setupContract: MockedElasticSearchServiceSetup = {
+    createClient: jest.fn(),
+    adminClient: createClusterClientMock(),
+    dataClient: createClusterClientMock(),
+  };
+  setupContract.createClient.mockReturnValue(createCustomClusterClientMock());
+  setupContract.adminClient.asScoped.mockReturnValue(createScopedClusterClientMock());
+  setupContract.dataClient.asScoped.mockReturnValue(createScopedClusterClientMock());
+  return setupContract;
+};
+
+type MockedInternalElasticSearchServiceSetup = jest.Mocked<
+  InternalElasticsearchServiceSetup & {
+    adminClient: jest.Mocked<IClusterClient>;
+    dataClient: jest.Mocked<IClusterClient>;
+  }
+>;
+const createInternalSetupContractMock = () => {
+  const setupContract: MockedInternalElasticSearchServiceSetup = {
+    ...createSetupContractMock(),
     legacy: {
       config$: new BehaviorSubject({} as ElasticsearchConfig),
     },
-
-    createClient: jest.fn().mockImplementation(createClusterClientMock),
-    adminClient$: new BehaviorSubject((createClusterClientMock() as unknown) as IClusterClient),
-    dataClient$: new BehaviorSubject((createClusterClientMock() as unknown) as IClusterClient),
+    adminClient$: new BehaviorSubject(createClusterClientMock()),
+    dataClient$: new BehaviorSubject(createClusterClientMock()),
   };
+  setupContract.adminClient.asScoped.mockReturnValue(createScopedClusterClientMock());
+  setupContract.dataClient.asScoped.mockReturnValue(createScopedClusterClientMock());
   return setupContract;
 };
 
@@ -55,14 +89,16 @@ const createMock = () => {
     start: jest.fn(),
     stop: jest.fn(),
   };
-  mocked.setup.mockResolvedValue(createSetupContractMock());
+  mocked.setup.mockResolvedValue(createInternalSetupContractMock());
   mocked.stop.mockResolvedValue();
   return mocked;
 };
 
 export const elasticsearchServiceMock = {
   create: createMock,
-  createSetupContract: createSetupContractMock,
+  createInternalSetup: createInternalSetupContractMock,
+  createSetup: createSetupContractMock,
   createClusterClient: createClusterClientMock,
+  createCustomClusterClient: createCustomClusterClientMock,
   createScopedClusterClient: createScopedClusterClientMock,
 };
diff --git a/src/core/server/elasticsearch/elasticsearch_service.test.ts b/src/core/server/elasticsearch/elasticsearch_service.test.ts
index 6c4a1f263bc713..aefc8b1fdf047e 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.test.ts
@@ -30,6 +30,7 @@ import { loggingServiceMock } from '../logging/logging_service.mock';
 import { httpServiceMock } from '../http/http_service.mock';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchService } from './elasticsearch_service';
+import { elasticsearchServiceMock } from './elasticsearch_service.mock';
 
 let elasticsearchService: ElasticsearchService;
 const configService = configServiceMock.create();
@@ -69,6 +70,27 @@ describe('#setup', () => {
     );
   });
 
+  it('returns data and admin client as a part of the contract', async () => {
+    const mockAdminClusterClientInstance = elasticsearchServiceMock.createClusterClient();
+    const mockDataClusterClientInstance = elasticsearchServiceMock.createClusterClient();
+    MockClusterClient.mockImplementationOnce(
+      () => mockAdminClusterClientInstance
+    ).mockImplementationOnce(() => mockDataClusterClientInstance);
+
+    const setupContract = await elasticsearchService.setup(deps);
+
+    const adminClient = setupContract.adminClient;
+    const dataClient = setupContract.dataClient;
+
+    expect(mockAdminClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(0);
+    await adminClient.callAsInternalUser('any');
+    expect(mockAdminClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(1);
+
+    expect(mockDataClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(0);
+    await dataClient.callAsInternalUser('any');
+    expect(mockDataClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(1);
+  });
+
   it('returns data and admin client observables as a part of the contract', async () => {
     const mockAdminClusterClientInstance = { close: jest.fn() };
     const mockDataClusterClientInstance = { close: jest.fn() };
diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts
index be0a817c54146c..de32e7f6cf2258 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.ts
@@ -18,17 +18,18 @@
  */
 
 import { ConnectableObservable, Observable, Subscription } from 'rxjs';
-import { filter, first, map, publishReplay, switchMap } from 'rxjs/operators';
+import { filter, first, map, publishReplay, switchMap, take } from 'rxjs/operators';
 
 import { CoreService } from '../../types';
 import { merge } from '../../utils';
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
-import { ClusterClient } from './cluster_client';
+import { ClusterClient, ScopeableRequest } from './cluster_client';
 import { ElasticsearchClientConfig } from './elasticsearch_client_config';
 import { ElasticsearchConfig, ElasticsearchConfigType } from './elasticsearch_config';
 import { InternalHttpServiceSetup, GetAuthHeaders } from '../http/';
 import { InternalElasticsearchServiceSetup } from './types';
+import { CallAPIOptions } from './api_types';
 
 /** @internal */
 interface CoreClusterClients {
@@ -94,11 +95,67 @@ export class ElasticsearchService implements CoreService<InternalElasticsearchSe
 
     const config = await this.config$.pipe(first()).toPromise();
 
+    const adminClient$ = clients$.pipe(map(clients => clients.adminClient));
+    const dataClient$ = clients$.pipe(map(clients => clients.dataClient));
+
+    const adminClient = {
+      async callAsInternalUser(
+        endpoint: string,
+        clientParams: Record<string, any> = {},
+        options?: CallAPIOptions
+      ) {
+        const client = await adminClient$.pipe(take(1)).toPromise();
+        return await client.callAsInternalUser(endpoint, clientParams, options);
+      },
+      asScoped(request: ScopeableRequest) {
+        return {
+          callAsInternalUser: adminClient.callAsInternalUser,
+          async callAsCurrentUser(
+            endpoint: string,
+            clientParams: Record<string, any> = {},
+            options?: CallAPIOptions
+          ) {
+            const client = await adminClient$.pipe(take(1)).toPromise();
+            return await client
+              .asScoped(request)
+              .callAsCurrentUser(endpoint, clientParams, options);
+          },
+        };
+      },
+    };
+    const dataClient = {
+      async callAsInternalUser(
+        endpoint: string,
+        clientParams: Record<string, any> = {},
+        options?: CallAPIOptions
+      ) {
+        const client = await dataClient$.pipe(take(1)).toPromise();
+        return await client.callAsInternalUser(endpoint, clientParams, options);
+      },
+      asScoped(request: ScopeableRequest) {
+        return {
+          callAsInternalUser: dataClient.callAsInternalUser,
+          async callAsCurrentUser(
+            endpoint: string,
+            clientParams: Record<string, any> = {},
+            options?: CallAPIOptions
+          ) {
+            const client = await dataClient$.pipe(take(1)).toPromise();
+            return await client
+              .asScoped(request)
+              .callAsCurrentUser(endpoint, clientParams, options);
+          },
+        };
+      },
+    };
+
     return {
       legacy: { config$: clients$.pipe(map(clients => clients.config)) },
 
-      adminClient$: clients$.pipe(map(clients => clients.adminClient)),
-      dataClient$: clients$.pipe(map(clients => clients.dataClient)),
+      adminClient$,
+      dataClient$,
+      adminClient,
+      dataClient,
 
       createClient: (type: string, clientConfig: Partial<ElasticsearchClientConfig> = {}) => {
         const finalConfig = merge({}, config, clientConfig);
diff --git a/src/core/server/elasticsearch/index.ts b/src/core/server/elasticsearch/index.ts
index 1f99f86d9887bb..5d64fadfaa1842 100644
--- a/src/core/server/elasticsearch/index.ts
+++ b/src/core/server/elasticsearch/index.ts
@@ -18,7 +18,13 @@
  */
 
 export { ElasticsearchService } from './elasticsearch_service';
-export { IClusterClient, ClusterClient, FakeRequest } from './cluster_client';
+export {
+  ClusterClient,
+  FakeRequest,
+  IClusterClient,
+  ICustomClusterClient,
+  ScopeableRequest,
+} from './cluster_client';
 export { IScopedClusterClient, ScopedClusterClient, Headers } from './scoped_cluster_client';
 export { ElasticsearchClientConfig } from './elasticsearch_client_config';
 export { config } from './elasticsearch_config';
diff --git a/src/core/server/elasticsearch/types.ts b/src/core/server/elasticsearch/types.ts
index 505b57c7c9e8ec..22340bf3f2fc62 100644
--- a/src/core/server/elasticsearch/types.ts
+++ b/src/core/server/elasticsearch/types.ts
@@ -20,7 +20,7 @@
 import { Observable } from 'rxjs';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchClientConfig } from './elasticsearch_client_config';
-import { IClusterClient } from './cluster_client';
+import { IClusterClient, ICustomClusterClient } from './cluster_client';
 
 /**
  * @public
@@ -46,29 +46,29 @@ export interface ElasticsearchServiceSetup {
   readonly createClient: (
     type: string,
     clientConfig?: Partial<ElasticsearchClientConfig>
-  ) => IClusterClient;
+  ) => ICustomClusterClient;
 
   /**
-   * Observable of clients for the `admin` cluster. Observable emits when Elasticsearch config changes on the Kibana
-   * server. See {@link IClusterClient}.
+   * A client for the `admin` cluster. All Elasticsearch config value changes are processed under the hood.
+   * See {@link IClusterClient}.
    *
-   * @exmaple
+   * @example
    * ```js
-   * const client = await elasticsearch.adminClient$.pipe(take(1)).toPromise();
+   * const client = core.elasticsearch.adminClient;
    * ```
    */
-  readonly adminClient$: Observable<IClusterClient>;
+  readonly adminClient: IClusterClient;
 
   /**
-   * Observable of clients for the `data` cluster. Observable emits when Elasticsearch config changes on the Kibana
-   * server. See {@link IClusterClient}.
+   * A client for the `data` cluster. All Elasticsearch config value changes are processed under the hood.
+   * See {@link IClusterClient}.
    *
-   * @exmaple
+   * @example
    * ```js
-   * const client = await elasticsearch.dataClient$.pipe(take(1)).toPromise();
+   * const client = core.elasticsearch.dataClient;
    * ```
    */
-  readonly dataClient$: Observable<IClusterClient>;
+  readonly dataClient: IClusterClient;
 }
 
 /** @internal */
@@ -77,4 +77,7 @@ export interface InternalElasticsearchServiceSetup extends ElasticsearchServiceS
   readonly legacy: {
     readonly config$: Observable<ElasticsearchConfig>;
   };
+
+  readonly adminClient$: Observable<IClusterClient>;
+  readonly dataClient$: Observable<IClusterClient>;
 }
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 953fa0738597c0..eccf3985fc495a 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -74,6 +74,7 @@ export { CspConfig, ICspConfig } from './csp';
 export {
   ClusterClient,
   IClusterClient,
+  ICustomClusterClient,
   Headers,
   ScopedClusterClient,
   IScopedClusterClient,
@@ -83,6 +84,7 @@ export {
   ElasticsearchServiceSetup,
   APICaller,
   FakeRequest,
+  ScopeableRequest,
 } from './elasticsearch';
 export * from './elasticsearch/api_types';
 export {
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index e17de7364ce59c..cc36b90ec526d7 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -249,8 +249,8 @@ export class LegacyService implements CoreService {
       capabilities: setupDeps.core.capabilities,
       context: setupDeps.core.context,
       elasticsearch: {
-        adminClient$: setupDeps.core.elasticsearch.adminClient$,
-        dataClient$: setupDeps.core.elasticsearch.dataClient$,
+        adminClient: setupDeps.core.elasticsearch.adminClient,
+        dataClient: setupDeps.core.elasticsearch.dataClient,
         createClient: setupDeps.core.elasticsearch.createClient,
       },
       http: {
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index 53849b040c413c..073d380d3aa67b 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -107,7 +107,7 @@ function createCoreSetupMock() {
   const mock: MockedKeys<CoreSetup> = {
     capabilities: capabilitiesServiceMock.createSetupContract(),
     context: contextServiceMock.createSetupContract(),
-    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createSetup(),
     http: httpMock,
     savedObjects: savedObjectsServiceMock.createSetupContract(),
     uiSettings: uiSettingsMock,
@@ -131,7 +131,7 @@ function createInternalCoreSetupMock() {
   const setupDeps: InternalCoreSetup = {
     capabilities: capabilitiesServiceMock.createSetupContract(),
     context: contextServiceMock.createSetupContract(),
-    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createInternalSetup(),
     http: httpServiceMock.createSetupContract(),
     uiSettings: uiSettingsServiceMock.createSetupContract(),
     savedObjects: savedObjectsServiceMock.createSetupContract(),
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index 6e9a7967e9ecaf..6d82a8d3ec6cf1 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -145,8 +145,8 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       createContextContainer: deps.context.createContextContainer,
     },
     elasticsearch: {
-      adminClient$: deps.elasticsearch.adminClient$,
-      dataClient$: deps.elasticsearch.dataClient$,
+      adminClient: deps.elasticsearch.adminClient,
+      dataClient: deps.elasticsearch.dataClient,
       createClient: deps.elasticsearch.createClient,
     },
     http: {
diff --git a/src/core/server/saved_objects/saved_objects_service.test.ts b/src/core/server/saved_objects/saved_objects_service.test.ts
index f58939c58e85e4..deb6f98e17b7b7 100644
--- a/src/core/server/saved_objects/saved_objects_service.test.ts
+++ b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -23,7 +23,6 @@ import { SavedObjectsService, SavedObjectsSetupDeps } from './saved_objects_serv
 import { mockCoreContext } from '../core_context.mock';
 // @ts-ignore Typescript doesn't know about the jest mock
 import { KibanaMigrator, mockKibanaMigratorInstance } from './migrations/kibana/kibana_migrator';
-import { of } from 'rxjs';
 import * as legacyElasticsearch from 'elasticsearch';
 import { Env } from '../config';
 import { configServiceMock } from '../mocks';
@@ -49,7 +48,7 @@ describe('SavedObjectsService', () => {
 
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
-        elasticsearch: { adminClient$: of(clusterClient) },
+        elasticsearch: { adminClient: clusterClient },
         legacyPlugins: { uiExports: { savedObjectMappings: [] }, pluginExtendedConfig: {} },
       } as unknown) as SavedObjectsSetupDeps;
 
@@ -68,7 +67,7 @@ describe('SavedObjectsService', () => {
       });
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
-        elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
+        elasticsearch: { adminClient: { callAsInternalUser: jest.fn() } },
         legacyPlugins: { uiExports: {}, pluginExtendedConfig: {} },
       } as unknown) as SavedObjectsSetupDeps;
 
@@ -82,7 +81,7 @@ describe('SavedObjectsService', () => {
       const coreContext = mockCoreContext.create({ configService });
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
-        elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
+        elasticsearch: { adminClient: { callAsInternalUser: jest.fn() } },
         legacyPlugins: { uiExports: {}, pluginExtendedConfig: {} },
       } as unknown) as SavedObjectsSetupDeps;
 
@@ -96,7 +95,7 @@ describe('SavedObjectsService', () => {
       const coreContext = mockCoreContext.create({ configService });
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
-        elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
+        elasticsearch: { adminClient: { callAsInternalUser: jest.fn() } },
         legacyPlugins: { uiExports: {}, pluginExtendedConfig: {} },
       } as unknown) as SavedObjectsSetupDeps;
 
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index 5079b4f633df26..69ca8306ca4da8 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -29,7 +29,7 @@ import {
 import { KibanaMigrator, IKibanaMigrator } from './migrations';
 import { CoreContext } from '../core_context';
 import { LegacyServiceDiscoverPlugins } from '../legacy';
-import { ElasticsearchServiceSetup, APICaller } from '../elasticsearch';
+import { InternalElasticsearchServiceSetup, APICaller } from '../elasticsearch';
 import { KibanaConfigType } from '../kibana_config';
 import { migrationsRetryCallCluster } from '../elasticsearch/retry_call_cluster';
 import { SavedObjectsConfigType } from './saved_objects_config';
@@ -174,7 +174,7 @@ export interface InternalSavedObjectsServiceStart extends SavedObjectsServiceSta
 /** @internal */
 export interface SavedObjectsSetupDeps {
   legacyPlugins: LegacyServiceDiscoverPlugins;
-  elasticsearch: ElasticsearchServiceSetup;
+  elasticsearch: InternalElasticsearchServiceSetup;
 }
 
 /** @internal */
@@ -206,8 +206,6 @@ export class SavedObjectsService
 
     const savedObjectSchemas = new SavedObjectsSchema(savedObjectsSchemasDefinition);
 
-    const adminClient = await setupDeps.elasticsearch.adminClient$.pipe(first()).toPromise();
-
     const kibanaConfig = await this.coreContext.configService
       .atPath<KibanaConfigType>('kibana')
       .pipe(first())
@@ -218,6 +216,8 @@ export class SavedObjectsService
       .pipe(first())
       .toPromise();
 
+    const adminClient = setupDeps.elasticsearch.adminClient;
+
     const migrator = (this.migrator = new KibanaMigrator({
       savedObjectSchemas,
       savedObjectMappings,
diff --git a/src/core/server/saved_objects/service/lib/scoped_client_provider.ts b/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
index 0b67727455333b..42f75e25171264 100644
--- a/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
+++ b/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
@@ -66,12 +66,6 @@ export type ISavedObjectsClientProvider<T = unknown> = Pick<
  * Provider for the Scoped Saved Objects Client.
  *
  * @internal
- *
- * @internalRemarks Because `getClient` is synchronous the Client Provider does
- * not support creating factories that react to new ES clients emitted from
- * elasticsearch.adminClient$. The Client Provider therefore doesn't support
- * configuration changes to the Elasticsearch client. TODO: revisit once we've
- * closed https://github.com/elastic/kibana/pull/45796
  */
 export class SavedObjectsClientProvider<Request = unknown> {
   private readonly _wrapperFactories = new PriorityCollection<{
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 35359c5d6c4179..e41f045622a42c 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -498,7 +498,7 @@ export type CapabilitiesSwitcher = (request: KibanaRequest, uiCapabilities: Capa
 // @public
 export class ClusterClient implements IClusterClient {
     constructor(config: ElasticsearchClientConfig, log: Logger, getAuthHeaders?: GetAuthHeaders);
-    asScoped(request?: KibanaRequest | LegacyRequest | FakeRequest): IScopedClusterClient;
+    asScoped(request?: ScopeableRequest): IScopedClusterClient;
     callAsInternalUser: APICaller;
     close(): void;
     }
@@ -669,9 +669,9 @@ export class ElasticsearchErrorHelpers {
 
 // @public (undocumented)
 export interface ElasticsearchServiceSetup {
-    readonly adminClient$: Observable<IClusterClient>;
-    readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => IClusterClient;
-    readonly dataClient$: Observable<IClusterClient>;
+    readonly adminClient: IClusterClient;
+    readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
+    readonly dataClient: IClusterClient;
 }
 
 // @public (undocumented)
@@ -752,7 +752,7 @@ export interface HttpServiceStart {
 export type IBasePath = Pick<BasePath, keyof BasePath>;
 
 // @public
-export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
 
 // @public
 export interface IContextContainer<THandler extends HandlerFunction<any>> {
@@ -771,6 +771,9 @@ export interface ICspConfig {
     readonly warnLegacyBrowsers: boolean;
 }
 
+// @public
+export type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+
 // @public
 export interface IKibanaResponse<T extends HttpResponsePayload | ResponseError = any> {
     // (undocumented)
@@ -1878,6 +1881,9 @@ export interface SavedObjectsUpdateResponse<T extends SavedObjectAttributes = an
     references: SavedObjectReference[] | undefined;
 }
 
+// @public
+export type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
+
 // @public
 export class ScopedClusterClient implements IScopedClusterClient {
     constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Headers | undefined);
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 4239e7e6c42540..eced24b84908c2 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -216,6 +216,7 @@ export class Server {
       coreId,
       'core',
       async (context, req, res): Promise<RequestHandlerContext['core']> => {
+        // it consumes elasticsearch observables to provide the same client throughout the context lifetime.
         const adminClient = await coreSetup.elasticsearch.adminClient$.pipe(take(1)).toPromise();
         const dataClient = await coreSetup.elasticsearch.dataClient$.pipe(take(1)).toPromise();
         const savedObjectsClient = coreSetup.savedObjects.getScopedClient(req);
@@ -226,8 +227,6 @@ export class Server {
             render: rendering.render.bind(rendering, req, uiSettingsClient),
           },
           savedObjects: {
-            // Note: the client provider doesn't support new ES clients
-            // emitted from adminClient$
             client: savedObjectsClient,
           },
           elasticsearch: {
diff --git a/src/legacy/core_plugins/elasticsearch/index.js b/src/legacy/core_plugins/elasticsearch/index.js
index 7fc00e27e5b5f2..da7b557e7ea190 100644
--- a/src/legacy/core_plugins/elasticsearch/index.js
+++ b/src/legacy/core_plugins/elasticsearch/index.js
@@ -16,9 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { combineLatest } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { first } from 'rxjs/operators';
 import healthCheck from './lib/health_check';
 import { Cluster } from './lib/cluster';
 import { createProxy } from './lib/create_proxy';
@@ -36,19 +34,12 @@ export default function(kibana) {
       // All methods that ES plugin exposes are synchronous so we should get the first
       // value from all observables here to be able to synchronously return and create
       // cluster clients afterwards.
-      const [esConfig, adminCluster, dataCluster] = await combineLatest(
-        server.newPlatform.__internals.elasticsearch.legacy.config$,
-        server.newPlatform.setup.core.elasticsearch.adminClient$,
-        server.newPlatform.setup.core.elasticsearch.dataClient$
-      )
-        .pipe(
-          first(),
-          map(([config, adminClusterClient, dataClusterClient]) => [
-            config,
-            new Cluster(adminClusterClient),
-            new Cluster(dataClusterClient),
-          ])
-        )
+      const { adminClient, dataClient } = server.newPlatform.setup.core.elasticsearch;
+      const adminCluster = new Cluster(adminClient);
+      const dataCluster = new Cluster(dataClient);
+
+      const esConfig = await server.newPlatform.__internals.elasticsearch.legacy.config$
+        .pipe(first())
         .toPromise();
 
       defaultVars = {
diff --git a/src/legacy/server/saved_objects/saved_objects_mixin.test.js b/src/legacy/server/saved_objects/saved_objects_mixin.test.js
index 0e96189db4650e..691878cf66d27a 100644
--- a/src/legacy/server/saved_objects/saved_objects_mixin.test.js
+++ b/src/legacy/server/saved_objects/saved_objects_mixin.test.js
@@ -106,12 +106,7 @@ describe('Saved Objects Mixin', () => {
       newPlatform: {
         __internals: {
           elasticsearch: {
-            adminClient$: {
-              pipe: jest.fn().mockImplementation(() => ({
-                toPromise: () =>
-                  Promise.resolve({ adminClient: { callAsInternalUser: mockCallCluster } }),
-              })),
-            },
+            adminClient: { callAsInternalUser: mockCallCluster },
           },
         },
       },
diff --git a/src/plugins/testbed/server/index.ts b/src/plugins/testbed/server/index.ts
index 586254603567bb..4873fe0926472b 100644
--- a/src/plugins/testbed/server/index.ts
+++ b/src/plugins/testbed/server/index.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { map, mergeMap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import {
@@ -108,9 +108,7 @@ class Plugin {
           return `Some exposed data derived from config: ${configValue.secret}`;
         })
       ),
-      pingElasticsearch$: core.elasticsearch.adminClient$.pipe(
-        mergeMap(client => client.callAsInternalUser('ping'))
-      ),
+      pingElasticsearch: () => core.elasticsearch.adminClient.callAsInternalUser('ping'),
     };
   }
 
diff --git a/x-pack/legacy/plugins/actions/server/plugin.ts b/x-pack/legacy/plugins/actions/server/plugin.ts
index e8bc5d60a697b9..48f99ba5135b78 100644
--- a/x-pack/legacy/plugins/actions/server/plugin.ts
+++ b/x-pack/legacy/plugins/actions/server/plugin.ts
@@ -69,7 +69,7 @@ export class Plugin {
     plugins: ActionsPluginsSetup
   ): Promise<PluginSetupContract> {
     const config = await this.config$.pipe(first()).toPromise();
-    this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
+    this.adminClient = core.elasticsearch.adminClient;
     this.defaultKibanaIndex = (await this.kibana$.pipe(first()).toPromise()).index;
 
     this.licenseState = new LicenseState(plugins.licensing.license$);
diff --git a/x-pack/legacy/plugins/alerting/server/plugin.ts b/x-pack/legacy/plugins/alerting/server/plugin.ts
index ede95f76bf8113..fb16f579d4c701 100644
--- a/x-pack/legacy/plugins/alerting/server/plugin.ts
+++ b/x-pack/legacy/plugins/alerting/server/plugin.ts
@@ -5,7 +5,7 @@
  */
 
 import Hapi from 'hapi';
-import { first } from 'rxjs/operators';
+
 import { Services } from './types';
 import { AlertsClient } from './alerts_client';
 import { AlertTypeRegistry } from './alert_type_registry';
@@ -62,7 +62,7 @@ export class Plugin {
     core: AlertingCoreSetup,
     plugins: AlertingPluginsSetup
   ): Promise<PluginSetupContract> {
-    this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
+    this.adminClient = core.elasticsearch.adminClient;
 
     this.licenseState = new LicenseState(plugins.licensing.license$);
 
diff --git a/x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts b/x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts
index 2e8c81efa19c01..a311c31082183c 100644
--- a/x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts
+++ b/x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts
@@ -3,7 +3,6 @@
  * 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 'rxjs/operators';
 import { Plugin, CoreSetup } from 'src/core/server';
 import { i18n } from '@kbn/i18n';
 import { PLUGIN } from '../../common/constants';
@@ -23,7 +22,7 @@ export class WatcherServerPlugin implements Plugin<void, void, any, any> {
     { http, elasticsearch: elasticsearchService }: CoreSetup,
     { __LEGACY: serverShim }: { __LEGACY: ServerShim }
   ) {
-    const elasticsearch = await elasticsearchService.adminClient$.pipe(first()).toPromise();
+    const elasticsearch = await elasticsearchService.adminClient;
     const router = http.createRouter();
     const routeDependencies: RouteDependencies = {
       elasticsearch,
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index a1cf2ae4e8ead8..11d91efdf6b01d 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -58,16 +58,14 @@ export class APMPlugin implements Plugin<APMPluginContract> {
     });
 
     await new Promise(resolve => {
-      combineLatest(mergedConfig$, core.elasticsearch.dataClient$).subscribe(
-        async ([config, dataClient]) => {
-          this.currentConfig = config;
-          await createApmAgentConfigurationIndex({
-            esClient: dataClient,
-            config,
-          });
-          resolve();
-        }
-      );
+      mergedConfig$.subscribe(async config => {
+        this.currentConfig = config;
+        await createApmAgentConfigurationIndex({
+          esClient: core.elasticsearch.dataClient,
+          config,
+        });
+        resolve();
+      });
     });
 
     return {
diff --git a/x-pack/plugins/licensing/server/plugin.test.ts b/x-pack/plugins/licensing/server/plugin.test.ts
index 0b5a3533bd3b69..9547a2dc529665 100644
--- a/x-pack/plugins/licensing/server/plugin.test.ts
+++ b/x-pack/plugins/licensing/server/plugin.test.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { BehaviorSubject } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
 import moment from 'moment';
 import { LicenseType } from '../common/types';
@@ -53,7 +52,7 @@ describe('licensing plugin', () => {
           features: {},
         });
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const license = await license$.pipe(take(1)).toPromise();
@@ -71,7 +70,7 @@ describe('licensing plugin', () => {
           })
         );
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
@@ -85,7 +84,7 @@ describe('licensing plugin', () => {
         const dataClient = elasticsearchServiceMock.createClusterClient();
         dataClient.callAsInternalUser.mockRejectedValue(new Error('test'));
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const license = await license$.pipe(take(1)).toPromise();
@@ -99,7 +98,7 @@ describe('licensing plugin', () => {
         error.status = 400;
         dataClient.callAsInternalUser.mockRejectedValue(error);
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const license = await license$.pipe(take(1)).toPromise();
@@ -119,7 +118,7 @@ describe('licensing plugin', () => {
           .mockResolvedValue({ license: buildRawLicense(), features: {} });
 
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
@@ -137,7 +136,7 @@ describe('licensing plugin', () => {
         });
 
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         await plugin.setup(coreSetup);
         await flushPromises();
@@ -152,7 +151,7 @@ describe('licensing plugin', () => {
         });
 
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         await plugin.setup(coreSetup);
         await flushPromises();
@@ -180,7 +179,7 @@ describe('licensing plugin', () => {
         );
 
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
@@ -209,7 +208,7 @@ describe('licensing plugin', () => {
           features: {},
         });
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
         const { refresh } = await plugin.setup(coreSetup);
 
         expect(dataClient.callAsInternalUser).toHaveBeenCalledTimes(0);
@@ -242,7 +241,7 @@ describe('licensing plugin', () => {
           features: {},
         });
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { createLicensePoller, license$ } = await plugin.setup(coreSetup);
         const customClient = elasticsearchServiceMock.createClusterClient();
diff --git a/x-pack/plugins/licensing/server/plugin.ts b/x-pack/plugins/licensing/server/plugin.ts
index 2eabd534a997c5..383245e6f4ee8a 100644
--- a/x-pack/plugins/licensing/server/plugin.ts
+++ b/x-pack/plugins/licensing/server/plugin.ts
@@ -92,7 +92,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup> {
     this.logger.debug('Setting up Licensing plugin');
     const config = await this.config$.pipe(take(1)).toPromise();
     const pollingFrequency = config.api_polling_frequency;
-    const dataClient = await core.elasticsearch.dataClient$.pipe(take(1)).toPromise();
+    const dataClient = await core.elasticsearch.dataClient;
 
     const { refresh, license$ } = this.createLicensePoller(
       dataClient,
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index 05d67b112bad89..5e32a0e90198a6 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -6,7 +6,7 @@
 
 import { of } from 'rxjs';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { IClusterClient, CoreSetup } from '../../../../src/core/server';
+import { ICustomClusterClient, CoreSetup } from '../../../../src/core/server';
 import { elasticsearchClientPlugin } from './elasticsearch_client_plugin';
 import { Plugin, PluginSetupDependencies } from './plugin';
 
@@ -15,7 +15,7 @@ import { coreMock, elasticsearchServiceMock } from '../../../../src/core/server/
 describe('Security Plugin', () => {
   let plugin: Plugin;
   let mockCoreSetup: MockedKeys<CoreSetup>;
-  let mockClusterClient: jest.Mocked<IClusterClient>;
+  let mockClusterClient: jest.Mocked<ICustomClusterClient>;
   let mockDependencies: PluginSetupDependencies;
   beforeEach(() => {
     plugin = new Plugin(
@@ -35,9 +35,9 @@ describe('Security Plugin', () => {
     mockCoreSetup = coreMock.createSetup();
     mockCoreSetup.http.isTlsEnabled = true;
 
-    mockClusterClient = elasticsearchServiceMock.createClusterClient();
+    mockClusterClient = elasticsearchServiceMock.createCustomClusterClient();
     mockCoreSetup.elasticsearch.createClient.mockReturnValue(
-      (mockClusterClient as unknown) as jest.Mocked<IClusterClient>
+      (mockClusterClient as unknown) as jest.Mocked<ICustomClusterClient>
     );
 
     mockDependencies = { licensing: { license$: of({}) } } as PluginSetupDependencies;
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index 9c4b01f94ef4df..ce682d8b30eb76 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -7,7 +7,7 @@
 import { combineLatest } from 'rxjs';
 import { first } from 'rxjs/operators';
 import {
-  IClusterClient,
+  ICustomClusterClient,
   CoreSetup,
   KibanaRequest,
   Logger,
@@ -85,7 +85,7 @@ export interface PluginSetupDependencies {
  */
 export class Plugin {
   private readonly logger: Logger;
-  private clusterClient?: IClusterClient;
+  private clusterClient?: ICustomClusterClient;
   private spacesService?: SpacesService | symbol = Symbol('not accessed');
   private securityLicenseService?: SecurityLicenseService;
 
diff --git a/x-pack/plugins/spaces/server/lib/create_default_space.ts b/x-pack/plugins/spaces/server/lib/create_default_space.ts
index 2301fa26dab288..0d1a4ddab91bb5 100644
--- a/x-pack/plugins/spaces/server/lib/create_default_space.ts
+++ b/x-pack/plugins/spaces/server/lib/create_default_space.ts
@@ -9,7 +9,7 @@ import { SavedObjectsLegacyService, IClusterClient } from 'src/core/server';
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 
 interface Deps {
-  esClient: Pick<IClusterClient, 'callAsInternalUser'>;
+  esClient: IClusterClient;
   savedObjects: SavedObjectsLegacyService;
 }
 
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
index 2b0cfd3687a24a..c1f557f164ad65 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
@@ -168,7 +168,7 @@ describe('onPostAuthInterceptor', () => {
 
     const spacesService = await service.setup({
       http: (http as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
index 9e1bb5cf9f7d6d..a3396e98c35122 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
@@ -50,7 +50,7 @@ describe('createSpacesTutorialContextFactory', () => {
   it('should create context with the current space id for the default space', async () => {
     const spacesService = await service.setup({
       http: coreMock.createSetup().http,
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/plugin.ts b/x-pack/plugins/spaces/server/plugin.ts
index dc4bc839c0e29a..6b7699100032d1 100644
--- a/x-pack/plugins/spaces/server/plugin.ts
+++ b/x-pack/plugins/spaces/server/plugin.ts
@@ -5,7 +5,6 @@
  */
 
 import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { HomeServerPluginSetup } from 'src/plugins/home/server';
 import {
@@ -168,9 +167,8 @@ export class Plugin {
           );
         },
         createDefaultSpace: async () => {
-          const esClient = await core.elasticsearch.adminClient$.pipe(take(1)).toPromise();
-          return createDefaultSpace({
-            esClient,
+          return await createDefaultSpace({
+            esClient: core.elasticsearch.adminClient,
             savedObjects: this.getLegacyAPI().savedObjects,
           });
         },
diff --git a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
index 4d8d08a487e9a9..74197e6ca7556d 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
@@ -43,7 +43,7 @@ describe('copy to space', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
index 28d5708a3873ca..35f18cf66a57e0 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
@@ -44,7 +44,7 @@ describe('Spaces Public API', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
index f9bd4494791f1f..3300e308252834 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
@@ -42,7 +42,7 @@ describe('GET space', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
index 02219db88a04c2..ca89731f35946f 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
@@ -42,7 +42,7 @@ describe('GET /spaces/space', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
index d82ccaa8ff3806..26ecbf2247e0f2 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
@@ -43,7 +43,7 @@ describe('Spaces Public API', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
index 15837110f4d927..e6182e027b854d 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
@@ -44,7 +44,7 @@ describe('PUT /api/spaces/space', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
index 8f97df2aa0a501..461f816ff5019a 100644
--- a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
@@ -22,7 +22,7 @@ describe('GET /internal/spaces/_active_space', () => {
     const service = new SpacesService(null as any, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: null,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
index 30ad3f399916b6..68d096e046ed4f 100644
--- a/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
+++ b/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
@@ -74,7 +74,7 @@ const createService = async (serverBasePath: string = '') => {
 
   const spacesServiceSetup = await spacesService.setup({
     http: httpSetup,
-    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createSetup(),
     config$: Rx.of(spacesConfig),
     authorization: securityMock.createSetup().authz,
     getSpacesAuditLogger: () => new SpacesAuditLogger({}),
diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
index b8d0f910a42ea3..f8ed58fa575518 100644
--- a/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
+++ b/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
@@ -5,7 +5,7 @@
  */
 
 import { map, take } from 'rxjs/operators';
-import { Observable, Subscription, combineLatest } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { Legacy } from 'kibana';
 import { Logger, KibanaRequest, CoreSetup } from '../../../../../src/core/server';
 import { PluginSetupContract as SecurityPluginSetup } from '../../../security/server';
@@ -69,15 +69,15 @@ export class SpacesService {
     };
 
     const getScopedClient = async (request: KibanaRequest) => {
-      return combineLatest(elasticsearch.adminClient$, config$)
+      return config$
         .pipe(
-          map(([clusterClient, config]) => {
+          map(config => {
             const internalRepository = this.getLegacyAPI().savedObjects.getSavedObjectsRepository(
-              clusterClient.callAsInternalUser,
+              elasticsearch.adminClient.callAsInternalUser,
               ['space']
             );
 
-            const callCluster = clusterClient.asScoped(request).callAsCurrentUser;
+            const callCluster = elasticsearch.adminClient.asScoped(request).callAsCurrentUser;
 
             const callWithRequestRepository = this.getLegacyAPI().savedObjects.getSavedObjectsRepository(
               callCluster,

From 007ea5fc46d940d63891bc20ecff36db96ae1450 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 8 Jan 2020 12:18:55 +0300
Subject: [PATCH 43/96] set AppArch team as an owner of the search endpoints
 (#54131)

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

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1137fb99f81a73..18d60bce4b95e7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -30,6 +30,7 @@
 /src/plugins/visualizations/ @elastic/kibana-app-arch
 /x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
 /src/legacy/core_plugins/data/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/elasticsearch/lib/create_proxy.js @elastic/kibana-app-arch
 /src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
 /src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
 /src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch

From 71ff2de7e163d5b9a1c20174a208d47136b422a2 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Wed, 8 Jan 2020 13:15:54 +0300
Subject: [PATCH 44/96] [ui/public/utils] Copy rarely used items to where they
 are consumed (#53819)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [ui/public/utils] Copy rarely used items to where they are consumed

Closes: #52841

* sort_prefix_first 👉x-pack/legacy/plugins/kuery_autocomplete

* numeric 👉src/legacy/core_plugins/kibana/public/management

* diff_object + tests 👉ui/state_management

* function + tests 👉ui/state_management (function.js was removed!)

* key_map 👉ui/directives

* leastCommonMultiple 👉ui/vis

* string_utils 👉ui/saved_objects

* collection

* parse_interval

* it -> test

* fix CI

* fix PR comments

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../management/sections/objects/_view.js      |   2 +-
 .../objects/lib/case_conversion.test.ts}      |  25 ++-
 .../sections/objects/lib/case_conversion.ts}  |   6 +-
 .../sections/objects/lib/find_objects.js      |   3 +-
 .../sections/objects/lib}/numeric.ts          |   4 +-
 .../settings/lib/get_category_name.js         |   5 +-
 .../tile_map/public/css_filters.js}           |  33 ++-
 .../tile_map/public/tile_map_type.js          |   4 +-
 .../public/directives/saved_object_finder.js  |   2 +-
 .../public/lib/validate_interval.js           |   2 +-
 .../server/status/lib/case_conversion.test.ts |  36 ++++
 .../status/lib}/case_conversion.ts            |  12 +-
 src/legacy/server/status/lib/metrics.js       |   2 +-
 .../public/{utils => directives}/key_map.ts   |   0
 .../directives/watch_multi/watch_multi.js     |   5 +-
 .../indexed_array/helpers/organize_by.test.ts |  63 ++++++
 .../indexed_array/helpers/organize_by.ts      |  61 ++++++
 .../ui/public/indexed_array/indexed_array.js  |   2 +-
 .../helpers/string_utils.test.ts}             |  22 +-
 .../helpers}/string_utils.ts                  |   2 +-
 .../saved_objects/saved_object_loader.ts      |   2 +-
 .../ui/public/state_management/app_state.js   |   4 +-
 .../ui/public/state_management/state.js       |  11 +-
 .../utils/diff_object.test.ts}                |  70 +++---
 .../state_management/utils/diff_object.ts     |  75 +++++++
 .../ui/public/time_buckets/time_buckets.js    |   3 +-
 .../ui/public/utils/__tests__/collection.js   | 200 ------------------
 .../public/utils/__tests__/parse_interval.js  |  93 --------
 .../utils/__tests__/sort_prefix_first.js      |  87 --------
 src/legacy/ui/public/utils/collection.test.ts | 141 ++++++++++++
 src/legacy/ui/public/utils/collection.ts      |  73 +------
 src/legacy/ui/public/utils/diff_object.js     |  67 ------
 src/legacy/ui/public/utils/math.test.ts       |  66 ------
 .../editors/config/editor_config_providers.ts |   2 +-
 .../public/vis/lib/least_common_interval.ts   |   2 +-
 .../lib/least_common_multiple.test.ts}        |  34 +--
 .../lib/least_common_multiple.ts}             |   6 +-
 src/legacy/utils/case_conversion.test.ts      |  56 -----
 src/plugins/data/common/utils/index.ts        |   1 +
 .../data/common/utils/parse_interval.test.ts  | 119 +++++++++++
 .../data/common/utils/parse_interval.ts}      |  15 +-
 src/plugins/data/public/index.ts              |   2 +
 src/plugins/data/server/index.ts              |   2 +
 src/test_utils/public/simulate_keys.js        |   2 +-
 .../public/autocomplete_providers/field.js    |   2 +-
 .../sort_prefix_first.test.ts                 |  79 +++++++
 .../sort_prefix_first.ts                      |  20 ++
 47 files changed, 756 insertions(+), 769 deletions(-)
 rename src/legacy/{ui/public/utils/sort_prefix_first.ts => core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.ts} (62%)
 rename src/legacy/{ui/public/utils/parse_interval.d.ts => core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts} (82%)
 rename src/legacy/{ui/public/utils => core_plugins/kibana/public/management/sections/objects/lib}/numeric.ts (86%)
 rename src/legacy/{ui/public/utils/supports.js => core_plugins/tile_map/public/css_filters.js} (64%)
 create mode 100644 src/legacy/server/status/lib/case_conversion.test.ts
 rename src/legacy/{utils => server/status/lib}/case_conversion.ts (77%)
 rename src/legacy/ui/public/{utils => directives}/key_map.ts (100%)
 create mode 100644 src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts
 create mode 100644 src/legacy/ui/public/indexed_array/helpers/organize_by.ts
 rename src/legacy/ui/public/{utils/function.js => saved_objects/helpers/string_utils.test.ts} (62%)
 rename src/legacy/ui/public/{utils => saved_objects/helpers}/string_utils.ts (94%)
 rename src/legacy/ui/public/{utils/__tests__/diff_object.js => state_management/utils/diff_object.test.ts} (57%)
 create mode 100644 src/legacy/ui/public/state_management/utils/diff_object.ts
 delete mode 100644 src/legacy/ui/public/utils/__tests__/collection.js
 delete mode 100644 src/legacy/ui/public/utils/__tests__/parse_interval.js
 delete mode 100644 src/legacy/ui/public/utils/__tests__/sort_prefix_first.js
 create mode 100644 src/legacy/ui/public/utils/collection.test.ts
 delete mode 100644 src/legacy/ui/public/utils/diff_object.js
 delete mode 100644 src/legacy/ui/public/utils/math.test.ts
 rename src/legacy/ui/public/{utils/case_conversion.ts => vis/lib/least_common_multiple.test.ts} (60%)
 rename src/legacy/ui/public/{utils/math.ts => vis/lib/least_common_multiple.ts} (95%)
 delete mode 100644 src/legacy/utils/case_conversion.test.ts
 create mode 100644 src/plugins/data/common/utils/parse_interval.test.ts
 rename src/{legacy/ui/public/utils/parse_interval.js => plugins/data/common/utils/parse_interval.ts} (86%)
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.test.ts
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.ts

diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
index 0909b6947895cf..f7e654fd3c76dd 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
@@ -29,7 +29,7 @@ import { uiModules } from 'ui/modules';
 import { fatalError, toastNotifications } from 'ui/notify';
 import 'ui/accessibility/kbn_ui_ace_keyboard_mode';
 import { SavedObjectsClientProvider } from 'ui/saved_objects';
-import { isNumeric } from 'ui/utils/numeric';
+import { isNumeric } from './lib/numeric';
 import { canViewInApp } from './lib/in_app_url';
 
 import { castEsToKbnFieldTypeName } from '../../../../../../../plugins/data/public';
diff --git a/src/legacy/ui/public/utils/sort_prefix_first.ts b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.ts
similarity index 62%
rename from src/legacy/ui/public/utils/sort_prefix_first.ts
rename to src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.ts
index 4d1a8d7f398668..bb749de8dcb715 100644
--- a/src/legacy/ui/public/utils/sort_prefix_first.ts
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.ts
@@ -17,17 +17,20 @@
  * under the License.
  */
 
-import { partition } from 'lodash';
+import { keysToCamelCaseShallow } from './case_conversion';
 
-export function sortPrefixFirst(array: any[], prefix?: string | number, property?: string): any[] {
-  if (!prefix) {
-    return array;
-  }
-  const lowerCasePrefix = ('' + prefix).toLowerCase();
+describe('keysToCamelCaseShallow', () => {
+  test("should convert all of an object's keys to camel case", () => {
+    const data = {
+      camelCase: 'camelCase',
+      'kebab-case': 'kebabCase',
+      snake_case: 'snakeCase',
+    };
 
-  const partitions = partition(array, entry => {
-    const value = ('' + (property ? entry[property] : entry)).toLowerCase();
-    return value.startsWith(lowerCasePrefix);
+    const result = keysToCamelCaseShallow(data);
+
+    expect(result.camelCase).toBe('camelCase');
+    expect(result.kebabCase).toBe('kebabCase');
+    expect(result.snakeCase).toBe('snakeCase');
   });
-  return [...partitions[0], ...partitions[1]];
-}
+});
diff --git a/src/legacy/ui/public/utils/parse_interval.d.ts b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts
similarity index 82%
rename from src/legacy/ui/public/utils/parse_interval.d.ts
rename to src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts
index 9d78b4ef6cddfe..718530eb3b6022 100644
--- a/src/legacy/ui/public/utils/parse_interval.d.ts
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
-import moment from 'moment';
+import { mapKeys, camelCase } from 'lodash';
 
-export function parseInterval(interval: string): moment.Duration | null;
+export function keysToCamelCaseShallow(object: Record<string, any>) {
+  return mapKeys(object, (value, key) => camelCase(key));
+}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.js
index f982966d1e3145..caf2b5f5034405 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.js
@@ -18,7 +18,7 @@
  */
 
 import { kfetch } from 'ui/kfetch';
-import { keysToCamelCaseShallow } from 'ui/utils/case_conversion';
+import { keysToCamelCaseShallow } from './case_conversion';
 
 export async function findObjects(findOptions) {
   const response = await kfetch({
@@ -26,5 +26,6 @@ export async function findObjects(findOptions) {
     pathname: '/api/kibana/management/saved_objects/_find',
     query: findOptions,
   });
+
   return keysToCamelCaseShallow(response);
 }
diff --git a/src/legacy/ui/public/utils/numeric.ts b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/numeric.ts
similarity index 86%
rename from src/legacy/ui/public/utils/numeric.ts
rename to src/legacy/core_plugins/kibana/public/management/sections/objects/lib/numeric.ts
index 1342498cf5dc3a..c7bc6c26a378ff 100644
--- a/src/legacy/ui/public/utils/numeric.ts
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/numeric.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import { isNaN } from 'lodash';
 
 export function isNumeric(v: any): boolean {
-  return !_.isNaN(v) && (typeof v === 'number' || (!Array.isArray(v) && !_.isNaN(parseFloat(v))));
+  return !isNaN(v) && (typeof v === 'number' || (!Array.isArray(v) && !isNaN(parseFloat(v))));
 }
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js
index 0155b10f60218e..c64b332e8ebee3 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { StringUtils } from 'ui/utils/string_utils';
 import { i18n } from '@kbn/i18n';
 
+const upperFirst = (str = '') => str.replace(/^./, str => str.toUpperCase());
+
 const names = {
   general: i18n.translate('kbn.management.settings.categoryNames.generalLabel', {
     defaultMessage: 'General',
@@ -51,5 +52,5 @@ const names = {
 };
 
 export function getCategoryName(category) {
-  return category ? names[category] || StringUtils.upperFirst(category) : '';
+  return category ? names[category] || upperFirst(category) : '';
 }
diff --git a/src/legacy/ui/public/utils/supports.js b/src/legacy/core_plugins/tile_map/public/css_filters.js
similarity index 64%
rename from src/legacy/ui/public/utils/supports.js
rename to src/legacy/core_plugins/tile_map/public/css_filters.js
index 19c5f34d97f36f..63d6a358059b3a 100644
--- a/src/legacy/ui/public/utils/supports.js
+++ b/src/legacy/core_plugins/tile_map/public/css_filters.js
@@ -22,22 +22,21 @@ import _ from 'lodash';
 /**
  * just a place to put feature detection checks
  */
-export const supports = {
-  cssFilters: (function() {
-    const e = document.createElement('img');
-    const rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter'];
-    const test = 'grayscale(1)';
-    rules.forEach(function(rule) {
-      e.style[rule] = test;
-    });
+export const supportsCssFilters = (function() {
+  const e = document.createElement('img');
+  const rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter'];
+  const test = 'grayscale(1)';
 
-    document.body.appendChild(e);
-    const styles = window.getComputedStyle(e);
-    const can = _(styles)
-      .pick(rules)
-      .includes(test);
-    document.body.removeChild(e);
+  rules.forEach(function(rule) {
+    e.style[rule] = test;
+  });
 
-    return can;
-  })(),
-};
+  document.body.appendChild(e);
+  const styles = window.getComputedStyle(e);
+  const can = _(styles)
+    .pick(rules)
+    .includes(test);
+  document.body.removeChild(e);
+
+  return can;
+})();
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_type.js b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
index f2354614ac41ac..f2e6469e768e7e 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_type.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
@@ -20,7 +20,6 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { supports } from 'ui/utils/supports';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { colorSchemas } from 'ui/vislib/components/color/truncated_colormaps';
 import { convertToGeoJson } from 'ui/vis/map/convert_to_geojson';
@@ -29,6 +28,7 @@ import { createTileMapVisualization } from './tile_map_visualization';
 import { Status } from '../../visualizations/public';
 import { TileMapOptions } from './components/tile_map_options';
 import { MapTypes } from './map_types';
+import { supportsCssFilters } from './css_filters';
 
 export function createTileMapTypeDefinition(dependencies) {
   const CoordinateMapsVisualization = createTileMapVisualization(dependencies);
@@ -44,7 +44,7 @@ export function createTileMapTypeDefinition(dependencies) {
       defaultMessage: 'Plot latitude and longitude coordinates on a map',
     }),
     visConfig: {
-      canDesaturate: !!supports.cssFilters,
+      canDesaturate: Boolean(supportsCssFilters),
       defaults: {
         colorSchema: 'Yellow to Red',
         mapType: 'Scaled Circle Markers',
diff --git a/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
index c0092ca49c4f34..111db0a83ffc41 100644
--- a/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
+++ b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
@@ -19,12 +19,12 @@
 
 import _ from 'lodash';
 import rison from 'rison-node';
-import { keyMap } from 'ui/utils/key_map';
 import { uiModules } from 'ui/modules';
 import 'ui/directives/input_focus';
 import 'ui/directives/paginate';
 import savedObjectFinderTemplate from './saved_object_finder.html';
 import { savedSheetLoader } from '../services/saved_sheets';
+import { keyMap } from 'ui/directives/key_map';
 
 const module = uiModules.get('kibana');
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
index 46dab92f3b2459..2dbcdc4749a660 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { parseInterval } from 'ui/utils/parse_interval';
 import { GTE_INTERVAL_RE } from '../../common/interval_regexp';
 import { i18n } from '@kbn/i18n';
+import { parseInterval } from '../../../../../plugins/data/public';
 
 export function validateInterval(bounds, panel, maxBuckets) {
   const { interval } = panel;
diff --git a/src/legacy/server/status/lib/case_conversion.test.ts b/src/legacy/server/status/lib/case_conversion.test.ts
new file mode 100644
index 00000000000000..a231ee0ba4b0fd
--- /dev/null
+++ b/src/legacy/server/status/lib/case_conversion.test.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 { keysToSnakeCaseShallow } from './case_conversion';
+
+describe('keysToSnakeCaseShallow', () => {
+  test("should convert all of an object's keys to snake case", () => {
+    const data = {
+      camelCase: 'camel_case',
+      'kebab-case': 'kebab_case',
+      snake_case: 'snake_case',
+    };
+
+    const result = keysToSnakeCaseShallow(data);
+
+    expect(result.camel_case).toBe('camel_case');
+    expect(result.kebab_case).toBe('kebab_case');
+    expect(result.snake_case).toBe('snake_case');
+  });
+});
diff --git a/src/legacy/utils/case_conversion.ts b/src/legacy/server/status/lib/case_conversion.ts
similarity index 77%
rename from src/legacy/utils/case_conversion.ts
rename to src/legacy/server/status/lib/case_conversion.ts
index e1c1317b26b142..a3ae15028daeb2 100644
--- a/src/legacy/utils/case_conversion.ts
+++ b/src/legacy/server/status/lib/case_conversion.ts
@@ -17,16 +17,8 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import { mapKeys, snakeCase } from 'lodash';
 
 export function keysToSnakeCaseShallow(object: Record<string, any>) {
-  return _.mapKeys(object, (value, key) => {
-    return _.snakeCase(key);
-  });
-}
-
-export function keysToCamelCaseShallow(object: Record<string, any>) {
-  return _.mapKeys(object, (value, key) => {
-    return _.camelCase(key);
-  });
+  return mapKeys(object, (value, key) => snakeCase(key));
 }
diff --git a/src/legacy/server/status/lib/metrics.js b/src/legacy/server/status/lib/metrics.js
index 322d8d8bd9ab44..2631b245e72ab4 100644
--- a/src/legacy/server/status/lib/metrics.js
+++ b/src/legacy/server/status/lib/metrics.js
@@ -20,7 +20,7 @@
 import os from 'os';
 import v8 from 'v8';
 import { get, isObject, merge } from 'lodash';
-import { keysToSnakeCaseShallow } from '../../../utils/case_conversion';
+import { keysToSnakeCaseShallow } from './case_conversion';
 import { getAllStats as cGroupStats } from './cgroup';
 import { getOSInfo } from './get_os_info';
 
diff --git a/src/legacy/ui/public/utils/key_map.ts b/src/legacy/ui/public/directives/key_map.ts
similarity index 100%
rename from src/legacy/ui/public/utils/key_map.ts
rename to src/legacy/ui/public/directives/key_map.ts
diff --git a/src/legacy/ui/public/directives/watch_multi/watch_multi.js b/src/legacy/ui/public/directives/watch_multi/watch_multi.js
index 2a2ffe24cba9c2..54b5cf08a93978 100644
--- a/src/legacy/ui/public/directives/watch_multi/watch_multi.js
+++ b/src/legacy/ui/public/directives/watch_multi/watch_multi.js
@@ -19,7 +19,6 @@
 
 import _ from 'lodash';
 import { uiModules } from '../../modules';
-import { callEach } from '../../utils/function';
 
 export function watchMultiDecorator($provide) {
   $provide.decorator('$rootScope', function($delegate) {
@@ -112,7 +111,9 @@ export function watchMultiDecorator($provide) {
         )
       );
 
-      return _.partial(callEach, unwatchers);
+      return function() {
+        unwatchers.forEach(listener => listener());
+      };
     };
 
     function normalizeExpression($scope, expr) {
diff --git a/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts b/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts
new file mode 100644
index 00000000000000..fc4ca8469382ad
--- /dev/null
+++ b/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { groupBy } from 'lodash';
+import { organizeBy } from './organize_by';
+
+describe('organizeBy', () => {
+  test('it works', () => {
+    const col = [
+      {
+        name: 'one',
+        roles: ['user', 'admin', 'owner'],
+      },
+      {
+        name: 'two',
+        roles: ['user'],
+      },
+      {
+        name: 'three',
+        roles: ['user'],
+      },
+      {
+        name: 'four',
+        roles: ['user', 'admin'],
+      },
+    ];
+
+    const resp = organizeBy(col, 'roles');
+    expect(resp).toHaveProperty('user');
+    expect(resp.user.length).toBe(4);
+
+    expect(resp).toHaveProperty('admin');
+    expect(resp.admin.length).toBe(2);
+
+    expect(resp).toHaveProperty('owner');
+    expect(resp.owner.length).toBe(1);
+  });
+
+  test('behaves just like groupBy in normal scenarios', () => {
+    const col = [{ name: 'one' }, { name: 'two' }, { name: 'three' }, { name: 'four' }];
+
+    const orgs = organizeBy(col, 'name');
+    const groups = groupBy(col, 'name');
+
+    expect(orgs).toEqual(groups);
+  });
+});
diff --git a/src/legacy/ui/public/indexed_array/helpers/organize_by.ts b/src/legacy/ui/public/indexed_array/helpers/organize_by.ts
new file mode 100644
index 00000000000000..e923767c892cd5
--- /dev/null
+++ b/src/legacy/ui/public/indexed_array/helpers/organize_by.ts
@@ -0,0 +1,61 @@
+/*
+ * 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 { each, isFunction } from 'lodash';
+
+/**
+ * Like _.groupBy, but allows specifying multiple groups for a
+ * single object.
+ *
+ * organizeBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
+ * // Object {1: Array[2], 2: Array[1], 3: Array[1], 4: Array[1]}
+ *
+ * _.groupBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
+ * // Object {'1,2,3': Array[1], '1,4': Array[1]}
+ *
+ * @param  {array} collection - the list of values to organize
+ * @param  {Function} callback - either a property name, or a callback.
+ * @return {object}
+ */
+export function organizeBy(collection: object[], callback: ((obj: object) => string) | string) {
+  const buckets: { [key: string]: object[] } = {};
+
+  function add(key: string, obj: object) {
+    if (!buckets[key]) {
+      buckets[key] = [];
+    }
+    buckets[key].push(obj);
+  }
+
+  each(collection, (obj: Record<string, any>) => {
+    const keys = isFunction(callback) ? callback(obj) : obj[callback];
+
+    if (!Array.isArray(keys)) {
+      add(keys, obj);
+      return;
+    }
+
+    let length = keys.length;
+    while (length-- > 0) {
+      add(keys[length], obj);
+    }
+  });
+
+  return buckets;
+}
diff --git a/src/legacy/ui/public/indexed_array/indexed_array.js b/src/legacy/ui/public/indexed_array/indexed_array.js
index 96b37a1423be09..39c79b2f021a39 100644
--- a/src/legacy/ui/public/indexed_array/indexed_array.js
+++ b/src/legacy/ui/public/indexed_array/indexed_array.js
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import { inflector } from './inflector';
-import { organizeBy } from '../utils/collection';
+import { organizeBy } from './helpers/organize_by';
 
 const pathGetter = _(_.get)
   .rearg(1, 0)
diff --git a/src/legacy/ui/public/utils/function.js b/src/legacy/ui/public/saved_objects/helpers/string_utils.test.ts
similarity index 62%
rename from src/legacy/ui/public/utils/function.js
rename to src/legacy/ui/public/saved_objects/helpers/string_utils.test.ts
index f9e7777d08bfe9..5b108a4cc0180f 100644
--- a/src/legacy/ui/public/utils/function.js
+++ b/src/legacy/ui/public/saved_objects/helpers/string_utils.test.ts
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { StringUtils } from './string_utils';
 
-import _ from 'lodash';
+describe('StringUtils class', () => {
+  describe('static upperFirst', () => {
+    test('should converts the first character of string to upper case', () => {
+      expect(StringUtils.upperFirst()).toBe('');
+      expect(StringUtils.upperFirst('')).toBe('');
 
-/**
- * Call all of the function in an array
- *
- * @param  {array[functions]} arr
- * @return {undefined}
- */
-export function callEach(arr) {
-  return _.map(arr, function(fn) {
-    return _.isFunction(fn) ? fn() : undefined;
+      expect(StringUtils.upperFirst('Fred')).toBe('Fred');
+      expect(StringUtils.upperFirst('fred')).toBe('Fred');
+      expect(StringUtils.upperFirst('FRED')).toBe('FRED');
+    });
   });
-}
+});
diff --git a/src/legacy/ui/public/utils/string_utils.ts b/src/legacy/ui/public/saved_objects/helpers/string_utils.ts
similarity index 94%
rename from src/legacy/ui/public/utils/string_utils.ts
rename to src/legacy/ui/public/saved_objects/helpers/string_utils.ts
index 22a57aeb07933a..fb10b792b7e69a 100644
--- a/src/legacy/ui/public/utils/string_utils.ts
+++ b/src/legacy/ui/public/saved_objects/helpers/string_utils.ts
@@ -23,7 +23,7 @@ export class StringUtils {
    * @param str {string}
    * @returns {string}
    */
-  public static upperFirst(str: string): string {
+  public static upperFirst(str: string = ''): string {
     return str ? str.charAt(0).toUpperCase() + str.slice(1) : '';
   }
 }
diff --git a/src/legacy/ui/public/saved_objects/saved_object_loader.ts b/src/legacy/ui/public/saved_objects/saved_object_loader.ts
index eb880ce5380c0c..7784edc9ad5288 100644
--- a/src/legacy/ui/public/saved_objects/saved_object_loader.ts
+++ b/src/legacy/ui/public/saved_objects/saved_object_loader.ts
@@ -18,7 +18,7 @@
  */
 import { SavedObject } from 'ui/saved_objects/types';
 import { ChromeStart, SavedObjectsClientContract, SavedObjectsFindOptions } from 'kibana/public';
-import { StringUtils } from '../utils/string_utils';
+import { StringUtils } from './helpers/string_utils';
 
 /**
  * The SavedObjectLoader class provides some convenience functions
diff --git a/src/legacy/ui/public/state_management/app_state.js b/src/legacy/ui/public/state_management/app_state.js
index 4bf386febf8361..e253d49c04131a 100644
--- a/src/legacy/ui/public/state_management/app_state.js
+++ b/src/legacy/ui/public/state_management/app_state.js
@@ -31,7 +31,6 @@ import { uiModules } from '../modules';
 import { StateProvider } from './state';
 import '../persisted_state';
 import { createLegacyClass } from '../utils/legacy_class';
-import { callEach } from '../utils/function';
 
 const urlParam = '_a';
 
@@ -62,7 +61,8 @@ export function AppStateProvider(Private, $location, $injector) {
   AppState.prototype.destroy = function() {
     AppState.Super.prototype.destroy.call(this);
     AppState.getAppState._set(null);
-    callEach(eventUnsubscribers);
+
+    eventUnsubscribers.forEach(listener => listener());
   };
 
   /**
diff --git a/src/legacy/ui/public/state_management/state.js b/src/legacy/ui/public/state_management/state.js
index a9898303fa5be5..289d4b8006cba9 100644
--- a/src/legacy/ui/public/state_management/state.js
+++ b/src/legacy/ui/public/state_management/state.js
@@ -29,12 +29,11 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import angular from 'angular';
 import rison from 'rison-node';
-import { applyDiff } from '../utils/diff_object';
+import { applyDiff } from './utils/diff_object';
 import { EventsProvider } from '../events';
 import { fatalError, toastNotifications } from '../notify';
 import './config_provider';
 import { createLegacyClass } from '../utils/legacy_class';
-import { callEach } from '../utils/function';
 import {
   hashedItemStore,
   isStateHash,
@@ -66,7 +65,7 @@ export function StateProvider(
     this._hashedItemStore = _hashedItemStore;
 
     // When the URL updates we need to fetch the values from the URL
-    this._cleanUpListeners = _.partial(callEach, [
+    this._cleanUpListeners = [
       // partial route update, no app reload
       $rootScope.$on('$routeUpdate', () => {
         this.fetch();
@@ -85,7 +84,7 @@ export function StateProvider(
           this.fetch();
         }
       }),
-    ]);
+    ];
 
     // Initialize the State with fetch
     this.fetch();
@@ -242,7 +241,9 @@ export function StateProvider(
    */
   State.prototype.destroy = function() {
     this.off(); // removes all listeners
-    this._cleanUpListeners(); // Removes the $routeUpdate listener
+
+    // Removes the $routeUpdate listener
+    this._cleanUpListeners.forEach(listener => listener(this));
   };
 
   State.prototype.setDefaults = function(defaults) {
diff --git a/src/legacy/ui/public/utils/__tests__/diff_object.js b/src/legacy/ui/public/state_management/utils/diff_object.test.ts
similarity index 57%
rename from src/legacy/ui/public/utils/__tests__/diff_object.js
rename to src/legacy/ui/public/state_management/utils/diff_object.test.ts
index 8459aa60436b16..d93fa0fe5a1697 100644
--- a/src/legacy/ui/public/utils/__tests__/diff_object.js
+++ b/src/legacy/ui/public/state_management/utils/diff_object.test.ts
@@ -17,76 +17,88 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
-import _ from 'lodash';
-import { applyDiff } from '../diff_object';
+import { cloneDeep } from 'lodash';
+import { applyDiff } from './diff_object';
 
-describe('ui/utils/diff_object', function() {
-  it('should list the removed keys', function() {
+describe('diff_object', () => {
+  test('should list the removed keys', () => {
     const target = { test: 'foo' };
     const source = { foo: 'test' };
     const results = applyDiff(target, source);
-    expect(results).to.have.property('removed');
-    expect(results.removed).to.eql(['test']);
+
+    expect(results).toHaveProperty('removed');
+    expect(results.removed).toEqual(['test']);
   });
 
-  it('should list the changed keys', function() {
+  test('should list the changed keys', () => {
     const target = { foo: 'bar' };
     const source = { foo: 'test' };
     const results = applyDiff(target, source);
-    expect(results).to.have.property('changed');
-    expect(results.changed).to.eql(['foo']);
+
+    expect(results).toHaveProperty('changed');
+    expect(results.changed).toEqual(['foo']);
   });
 
-  it('should list the added keys', function() {
+  test('should list the added keys', () => {
     const target = {};
     const source = { foo: 'test' };
     const results = applyDiff(target, source);
-    expect(results).to.have.property('added');
-    expect(results.added).to.eql(['foo']);
+
+    expect(results).toHaveProperty('added');
+    expect(results.added).toEqual(['foo']);
   });
 
-  it('should list all the keys that are change or removed', function() {
+  test('should list all the keys that are change or removed', () => {
     const target = { foo: 'bar', test: 'foo' };
     const source = { foo: 'test' };
     const results = applyDiff(target, source);
-    expect(results).to.have.property('keys');
-    expect(results.keys).to.eql(['foo', 'test']);
+
+    expect(results).toHaveProperty('keys');
+    expect(results.keys).toEqual(['foo', 'test']);
   });
 
-  it('should ignore functions', function() {
+  test('should ignore functions', () => {
     const target = { foo: 'bar', test: 'foo' };
-    const source = { foo: 'test', fn: _.noop };
+    const source = { foo: 'test', fn: () => {} };
+
     applyDiff(target, source);
-    expect(target).to.not.have.property('fn');
+
+    expect(target).not.toHaveProperty('fn');
   });
 
-  it('should ignore underscores', function() {
+  test('should ignore underscores', () => {
     const target = { foo: 'bar', test: 'foo' };
     const source = { foo: 'test', _private: 'foo' };
+
     applyDiff(target, source);
-    expect(target).to.not.have.property('_private');
+
+    expect(target).not.toHaveProperty('_private');
   });
 
-  it('should ignore dollar signs', function() {
+  test('should ignore dollar signs', () => {
     const target = { foo: 'bar', test: 'foo' };
     const source = { foo: 'test', $private: 'foo' };
+
     applyDiff(target, source);
-    expect(target).to.not.have.property('$private');
+
+    expect(target).not.toHaveProperty('$private');
   });
 
-  it('should not list any changes for similar objects', function() {
+  test('should not list any changes for similar objects', () => {
     const target = { foo: 'bar', test: 'foo' };
     const source = { foo: 'bar', test: 'foo', $private: 'foo' };
     const results = applyDiff(target, source);
-    expect(results.changed).to.be.empty();
+
+    expect(results.changed).toEqual([]);
   });
 
-  it('should only change keys that actually changed', function() {
+  test('should only change keys that actually changed', () => {
     const obj = { message: 'foo' };
-    const target = { obj: obj, message: 'foo' };
-    const source = { obj: _.cloneDeep(obj), message: 'test' };
+    const target = { obj, message: 'foo' };
+    const source = { obj: cloneDeep(obj), message: 'test' };
+
     applyDiff(target, source);
-    expect(target.obj).to.be(obj);
+
+    expect(target.obj).toBe(obj);
   });
 });
diff --git a/src/legacy/ui/public/state_management/utils/diff_object.ts b/src/legacy/ui/public/state_management/utils/diff_object.ts
new file mode 100644
index 00000000000000..2590e2271f7718
--- /dev/null
+++ b/src/legacy/ui/public/state_management/utils/diff_object.ts
@@ -0,0 +1,75 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { keys, isFunction, difference, filter, union, pick, each, assign, isEqual } from 'lodash';
+
+export interface IDiffObject {
+  removed: string[];
+  added: string[];
+  changed: string[];
+  keys: string[];
+}
+
+/**
+ * Filter the private vars
+ * @param {string} key The keys
+ * @returns {boolean}
+ */
+const filterPrivateAndMethods = function(obj: Record<string, any>) {
+  return function(key: string) {
+    if (isFunction(obj[key])) return false;
+    if (key.charAt(0) === '$') return false;
+    return key.charAt(0) !== '_';
+  };
+};
+
+export function applyDiff(target: Record<string, any>, source: Record<string, any>) {
+  const diff: IDiffObject = {
+    removed: [],
+    added: [],
+    changed: [],
+    keys: [],
+  };
+
+  const targetKeys = keys(target).filter(filterPrivateAndMethods(target));
+  const sourceKeys = keys(source).filter(filterPrivateAndMethods(source));
+
+  // Find the keys to be removed
+  diff.removed = difference(targetKeys, sourceKeys);
+
+  // Find the keys to be added
+  diff.added = difference(sourceKeys, targetKeys);
+
+  // Find the keys that will be changed
+  diff.changed = filter(sourceKeys, key => !isEqual(target[key], source[key]));
+
+  // Make a list of all the keys that are changing
+  diff.keys = union(diff.changed, diff.removed, diff.added);
+
+  // Remove all the keys
+  each(diff.removed, key => {
+    delete target[key];
+  });
+
+  // Assign the changed to the source to the target
+  assign(target, pick(source, diff.changed));
+  // Assign the added to the source to the target
+  assign(target, pick(source, diff.added));
+
+  return diff;
+}
diff --git a/src/legacy/ui/public/time_buckets/time_buckets.js b/src/legacy/ui/public/time_buckets/time_buckets.js
index 92de88b47e3c30..96ba4bfb2ac2c8 100644
--- a/src/legacy/ui/public/time_buckets/time_buckets.js
+++ b/src/legacy/ui/public/time_buckets/time_buckets.js
@@ -20,13 +20,12 @@
 import _ from 'lodash';
 import moment from 'moment';
 import { npStart } from 'ui/new_platform';
-import { parseInterval } from '../utils/parse_interval';
 import { calcAutoIntervalLessThan, calcAutoIntervalNear } from './calc_auto_interval';
 import {
   convertDurationToNormalizedEsInterval,
   convertIntervalToEsInterval,
 } from './calc_es_interval';
-import { FIELD_FORMAT_IDS } from '../../../../plugins/data/public';
+import { FIELD_FORMAT_IDS, parseInterval } from '../../../../plugins/data/public';
 
 const getConfig = (...args) => npStart.core.uiSettings.get(...args);
 
diff --git a/src/legacy/ui/public/utils/__tests__/collection.js b/src/legacy/ui/public/utils/__tests__/collection.js
deleted file mode 100644
index 402f0387e53cea..00000000000000
--- a/src/legacy/ui/public/utils/__tests__/collection.js
+++ /dev/null
@@ -1,200 +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 expect from '@kbn/expect';
-import { groupBy } from 'lodash';
-import { move, pushAll, organizeBy } from '../collection';
-
-describe('collection', () => {
-  describe('move', function() {
-    it('accepts previous from->to syntax', function() {
-      const list = [1, 1, 1, 1, 1, 1, 1, 1, 8, 1, 1];
-
-      expect(list[3]).to.be(1);
-      expect(list[8]).to.be(8);
-
-      move(list, 8, 3);
-
-      expect(list[8]).to.be(1);
-      expect(list[3]).to.be(8);
-    });
-
-    it('moves an object up based on a function callback', function() {
-      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(1);
-      expect(list[6]).to.be(0);
-
-      move(list, 5, false, function(v) {
-        return v === 0;
-      });
-
-      expect(list[4]).to.be(1);
-      expect(list[5]).to.be(0);
-      expect(list[6]).to.be(0);
-    });
-
-    it('moves an object down based on a function callback', function() {
-      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(1);
-      expect(list[6]).to.be(0);
-
-      move(list, 5, true, function(v) {
-        return v === 0;
-      });
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(0);
-      expect(list[6]).to.be(1);
-    });
-
-    it('moves an object up based on a where callback', function() {
-      const list = [
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-      ];
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 1);
-      expect(list[6]).to.have.property('v', 0);
-
-      move(list, 5, false, { v: 0 });
-
-      expect(list[4]).to.have.property('v', 1);
-      expect(list[5]).to.have.property('v', 0);
-      expect(list[6]).to.have.property('v', 0);
-    });
-
-    it('moves an object down based on a where callback', function() {
-      const list = [
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-      ];
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 1);
-      expect(list[6]).to.have.property('v', 0);
-
-      move(list, 5, true, { v: 0 });
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 0);
-      expect(list[6]).to.have.property('v', 1);
-    });
-
-    it('moves an object down based on a pluck callback', function() {
-      const list = [
-        { id: 0, normal: true },
-        { id: 1, normal: true },
-        { id: 2, normal: true },
-        { id: 3, normal: true },
-        { id: 4, normal: true },
-        { id: 5, normal: false },
-        { id: 6, normal: true },
-        { id: 7, normal: true },
-        { id: 8, normal: true },
-        { id: 9, normal: true },
-      ];
-
-      expect(list[4]).to.have.property('id', 4);
-      expect(list[5]).to.have.property('id', 5);
-      expect(list[6]).to.have.property('id', 6);
-
-      move(list, 5, true, 'normal');
-
-      expect(list[4]).to.have.property('id', 4);
-      expect(list[5]).to.have.property('id', 6);
-      expect(list[6]).to.have.property('id', 5);
-    });
-  });
-
-  describe('pushAll', function() {
-    it('pushes an entire array into another', function() {
-      const a = [1, 2, 3, 4];
-      const b = [5, 6, 7, 8];
-
-      const output = pushAll(b, a);
-      expect(output).to.be(a);
-      expect(a).to.eql([1, 2, 3, 4, 5, 6, 7, 8]);
-      expect(b).to.eql([5, 6, 7, 8]);
-    });
-  });
-
-  describe('organizeBy', function() {
-    it('it works', function() {
-      const col = [
-        {
-          name: 'one',
-          roles: ['user', 'admin', 'owner'],
-        },
-        {
-          name: 'two',
-          roles: ['user'],
-        },
-        {
-          name: 'three',
-          roles: ['user'],
-        },
-        {
-          name: 'four',
-          roles: ['user', 'admin'],
-        },
-      ];
-
-      const resp = organizeBy(col, 'roles');
-      expect(resp).to.have.property('user');
-      expect(resp.user).to.have.length(4);
-
-      expect(resp).to.have.property('admin');
-      expect(resp.admin).to.have.length(2);
-
-      expect(resp).to.have.property('owner');
-      expect(resp.owner).to.have.length(1);
-    });
-
-    it('behaves just like groupBy in normal scenarios', function() {
-      const col = [{ name: 'one' }, { name: 'two' }, { name: 'three' }, { name: 'four' }];
-
-      const orgs = organizeBy(col, 'name');
-      const groups = groupBy(col, 'name');
-      expect(orgs).to.eql(groups);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/utils/__tests__/parse_interval.js b/src/legacy/ui/public/utils/__tests__/parse_interval.js
deleted file mode 100644
index a33b0ab958072c..00000000000000
--- a/src/legacy/ui/public/utils/__tests__/parse_interval.js
+++ /dev/null
@@ -1,93 +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 { parseInterval } from '../parse_interval';
-import expect from '@kbn/expect';
-
-describe('parseInterval', function() {
-  it('should correctly parse an interval containing unit and value', function() {
-    let duration = parseInterval('1d');
-    expect(duration.as('d')).to.be(1);
-
-    duration = parseInterval('2y');
-    expect(duration.as('y')).to.be(2);
-
-    duration = parseInterval('5M');
-    expect(duration.as('M')).to.be(5);
-
-    duration = parseInterval('5m');
-    expect(duration.as('m')).to.be(5);
-
-    duration = parseInterval('250ms');
-    expect(duration.as('ms')).to.be(250);
-
-    duration = parseInterval('100s');
-    expect(duration.as('s')).to.be(100);
-
-    duration = parseInterval('23d');
-    expect(duration.as('d')).to.be(23);
-
-    duration = parseInterval('52w');
-    expect(duration.as('w')).to.be(52);
-  });
-
-  it('should correctly parse fractional intervals containing unit and value', function() {
-    let duration = parseInterval('1.5w');
-    expect(duration.as('w')).to.be(1.5);
-
-    duration = parseInterval('2.35y');
-    expect(duration.as('y')).to.be(2.35);
-  });
-
-  it('should correctly bubble up intervals which are less than 1', function() {
-    let duration = parseInterval('0.5y');
-    expect(duration.as('d')).to.be(183);
-
-    duration = parseInterval('0.5d');
-    expect(duration.as('h')).to.be(12);
-  });
-
-  it('should correctly parse a unit in an interval only', function() {
-    let duration = parseInterval('ms');
-    expect(duration.as('ms')).to.be(1);
-
-    duration = parseInterval('d');
-    expect(duration.as('d')).to.be(1);
-
-    duration = parseInterval('m');
-    expect(duration.as('m')).to.be(1);
-
-    duration = parseInterval('y');
-    expect(duration.as('y')).to.be(1);
-
-    duration = parseInterval('M');
-    expect(duration.as('M')).to.be(1);
-  });
-
-  it('should return null for an invalid interval', function() {
-    let duration = parseInterval('');
-    expect(duration).to.not.be.ok();
-
-    duration = parseInterval(null);
-    expect(duration).to.not.be.ok();
-
-    duration = parseInterval('234asdf');
-    expect(duration).to.not.be.ok();
-  });
-});
diff --git a/src/legacy/ui/public/utils/__tests__/sort_prefix_first.js b/src/legacy/ui/public/utils/__tests__/sort_prefix_first.js
deleted file mode 100644
index 721de95cbd27db..00000000000000
--- a/src/legacy/ui/public/utils/__tests__/sort_prefix_first.js
+++ /dev/null
@@ -1,87 +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 expect from '@kbn/expect';
-import { sortPrefixFirst } from '../sort_prefix_first';
-
-describe('sortPrefixFirst', function() {
-  it('should return the original unmodified array if no prefix is provided', function() {
-    const array = ['foo', 'bar', 'baz'];
-    const result = sortPrefixFirst(array);
-    expect(result).to.be(array);
-    expect(result).to.eql(['foo', 'bar', 'baz']);
-  });
-
-  it('should sort items that match the prefix first without modifying the original array', function() {
-    const array = ['foo', 'bar', 'baz'];
-    const result = sortPrefixFirst(array, 'b');
-    expect(result).to.not.be(array);
-    expect(result).to.eql(['bar', 'baz', 'foo']);
-    expect(array).to.eql(['foo', 'bar', 'baz']);
-  });
-
-  it('should not modify the order of the array other than matching prefix without modifying the original array', function() {
-    const array = ['foo', 'bar', 'baz', 'qux', 'quux'];
-    const result = sortPrefixFirst(array, 'b');
-    expect(result).to.not.be(array);
-    expect(result).to.eql(['bar', 'baz', 'foo', 'qux', 'quux']);
-    expect(array).to.eql(['foo', 'bar', 'baz', 'qux', 'quux']);
-  });
-
-  it('should sort objects by property if provided', function() {
-    const array = [
-      { name: 'foo' },
-      { name: 'bar' },
-      { name: 'baz' },
-      { name: 'qux' },
-      { name: 'quux' },
-    ];
-    const result = sortPrefixFirst(array, 'b', 'name');
-    expect(result).to.not.be(array);
-    expect(result).to.eql([
-      { name: 'bar' },
-      { name: 'baz' },
-      { name: 'foo' },
-      { name: 'qux' },
-      { name: 'quux' },
-    ]);
-    expect(array).to.eql([
-      { name: 'foo' },
-      { name: 'bar' },
-      { name: 'baz' },
-      { name: 'qux' },
-      { name: 'quux' },
-    ]);
-  });
-
-  it('should handle numbers', function() {
-    const array = [1, 50, 5];
-    const result = sortPrefixFirst(array, 5);
-    expect(result).to.not.be(array);
-    expect(result).to.eql([50, 5, 1]);
-  });
-
-  it('should handle mixed case', function() {
-    const array = ['Date Histogram', 'Histogram'];
-    const prefix = 'histo';
-    const result = sortPrefixFirst(array, prefix);
-    expect(result).to.not.be(array);
-    expect(result).to.eql(['Histogram', 'Date Histogram']);
-  });
-});
diff --git a/src/legacy/ui/public/utils/collection.test.ts b/src/legacy/ui/public/utils/collection.test.ts
new file mode 100644
index 00000000000000..0841e3554c0d09
--- /dev/null
+++ b/src/legacy/ui/public/utils/collection.test.ts
@@ -0,0 +1,141 @@
+/*
+ * 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 { move } from './collection';
+
+describe('collection', () => {
+  describe('move', () => {
+    test('accepts previous from->to syntax', () => {
+      const list = [1, 1, 1, 1, 1, 1, 1, 1, 8, 1, 1];
+
+      expect(list[3]).toBe(1);
+      expect(list[8]).toBe(8);
+
+      move(list, 8, 3);
+
+      expect(list[8]).toBe(1);
+      expect(list[3]).toBe(8);
+    });
+
+    test('moves an object up based on a function callback', () => {
+      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
+
+      expect(list[4]).toBe(0);
+      expect(list[5]).toBe(1);
+      expect(list[6]).toBe(0);
+
+      move(list, 5, false, (v: any) => v === 0);
+
+      expect(list[4]).toBe(1);
+      expect(list[5]).toBe(0);
+      expect(list[6]).toBe(0);
+    });
+
+    test('moves an object down based on a function callback', () => {
+      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
+
+      expect(list[4]).toBe(0);
+      expect(list[5]).toBe(1);
+      expect(list[6]).toBe(0);
+
+      move(list, 5, true, (v: any) => v === 0);
+
+      expect(list[4]).toBe(0);
+      expect(list[5]).toBe(0);
+      expect(list[6]).toBe(1);
+    });
+
+    test('moves an object up based on a where callback', () => {
+      const list = [
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 0 },
+        { v: 1 },
+        { v: 0 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+      ];
+
+      expect(list[4]).toHaveProperty('v', 0);
+      expect(list[5]).toHaveProperty('v', 1);
+      expect(list[6]).toHaveProperty('v', 0);
+
+      move(list, 5, false, { v: 0 });
+
+      expect(list[4]).toHaveProperty('v', 1);
+      expect(list[5]).toHaveProperty('v', 0);
+      expect(list[6]).toHaveProperty('v', 0);
+    });
+
+    test('moves an object down based on a where callback', () => {
+      const list = [
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 0 },
+        { v: 1 },
+        { v: 0 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+      ];
+
+      expect(list[4]).toHaveProperty('v', 0);
+      expect(list[5]).toHaveProperty('v', 1);
+      expect(list[6]).toHaveProperty('v', 0);
+
+      move(list, 5, true, { v: 0 });
+
+      expect(list[4]).toHaveProperty('v', 0);
+      expect(list[5]).toHaveProperty('v', 0);
+      expect(list[6]).toHaveProperty('v', 1);
+    });
+
+    test('moves an object down based on a pluck callback', () => {
+      const list = [
+        { id: 0, normal: true },
+        { id: 1, normal: true },
+        { id: 2, normal: true },
+        { id: 3, normal: true },
+        { id: 4, normal: true },
+        { id: 5, normal: false },
+        { id: 6, normal: true },
+        { id: 7, normal: true },
+        { id: 8, normal: true },
+        { id: 9, normal: true },
+      ];
+
+      expect(list[4]).toHaveProperty('id', 4);
+      expect(list[5]).toHaveProperty('id', 5);
+      expect(list[6]).toHaveProperty('id', 6);
+
+      move(list, 5, true, 'normal');
+
+      expect(list[4]).toHaveProperty('id', 4);
+      expect(list[5]).toHaveProperty('id', 6);
+      expect(list[6]).toHaveProperty('id', 5);
+    });
+  });
+});
diff --git a/src/legacy/ui/public/utils/collection.ts b/src/legacy/ui/public/utils/collection.ts
index 61a7388575c936..45e5a0704c37bb 100644
--- a/src/legacy/ui/public/utils/collection.ts
+++ b/src/legacy/ui/public/utils/collection.ts
@@ -33,10 +33,10 @@ import _ from 'lodash';
  * @return {array} - the objs argument
  */
 export function move(
-  objs: object[],
+  objs: any[],
   obj: object | number,
   below: number | boolean,
-  qualifier: (object: object, index: number) => any
+  qualifier?: ((object: object, index: number) => any) | Record<string, any> | string
 ): object[] {
   const origI = _.isNumber(obj) ? obj : objs.indexOf(obj);
   if (origI === -1) {
@@ -50,7 +50,7 @@ export function move(
   }
 
   below = !!below;
-  qualifier = _.callback(qualifier);
+  qualifier = qualifier && _.callback(qualifier);
 
   const above = !below;
   const finder = below ? _.findIndex : _.findLastIndex;
@@ -63,7 +63,7 @@ export function move(
     if (above && otherI >= origI) {
       return;
     }
-    return !!qualifier(otherAgg, otherI);
+    return Boolean(_.isFunction(qualifier) && qualifier(otherAgg, otherI));
   });
 
   if (targetI === -1) {
@@ -74,68 +74,3 @@ export function move(
   objs.splice(targetI, 0, objs.splice(origI, 1)[0]);
   return objs;
 }
-
-/**
- * Like _.groupBy, but allows specifying multiple groups for a
- * single object.
- *
- * organizeBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
- * // Object {1: Array[2], 2: Array[1], 3: Array[1], 4: Array[1]}
- *
- * _.groupBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
- * // Object {'1,2,3': Array[1], '1,4': Array[1]}
- *
- * @param  {array} collection - the list of values to organize
- * @param  {Function} callback - either a property name, or a callback.
- * @return {object}
- */
-export function organizeBy(collection: object[], callback: (obj: object) => string | string) {
-  const buckets: { [key: string]: object[] } = {};
-  const prop = typeof callback === 'function' ? false : callback;
-
-  function add(key: string, obj: object) {
-    if (!buckets[key]) {
-      buckets[key] = [];
-    }
-    buckets[key].push(obj);
-  }
-
-  _.each(collection, (obj: object) => {
-    const keys = prop === false ? callback(obj) : obj[prop];
-
-    if (!Array.isArray(keys)) {
-      add(keys, obj);
-      return;
-    }
-
-    let length = keys.length;
-    while (length-- > 0) {
-      add(keys[length], obj);
-    }
-  });
-
-  return buckets;
-}
-
-/**
- * Efficient and safe version of [].push(dest, source);
- *
- * @param  {Array} source - the array to pull values from
- * @param  {Array} dest   - the array to push values into
- * @return {Array} dest
- */
-export function pushAll(source: any[], dest: any[]): any[] {
-  const start = dest.length;
-  const adding = source.length;
-
-  // allocate - http://goo.gl/e2i0S0
-  dest.length = start + adding;
-
-  // fill sparse positions
-  let i = -1;
-  while (++i < adding) {
-    dest[start + i] = source[i];
-  }
-
-  return dest;
-}
diff --git a/src/legacy/ui/public/utils/diff_object.js b/src/legacy/ui/public/utils/diff_object.js
deleted file mode 100644
index ddad5e0ae42a01..00000000000000
--- a/src/legacy/ui/public/utils/diff_object.js
+++ /dev/null
@@ -1,67 +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 _ from 'lodash';
-import angular from 'angular';
-
-export function applyDiff(target, source) {
-  const diff = {};
-
-  /**
-   * Filter the private vars
-   * @param {string} key The keys
-   * @returns {boolean}
-   */
-  const filterPrivateAndMethods = function(obj) {
-    return function(key) {
-      if (_.isFunction(obj[key])) return false;
-      if (key.charAt(0) === '$') return false;
-      return key.charAt(0) !== '_';
-    };
-  };
-
-  const targetKeys = _.keys(target).filter(filterPrivateAndMethods(target));
-  const sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source));
-
-  // Find the keys to be removed
-  diff.removed = _.difference(targetKeys, sourceKeys);
-
-  // Find the keys to be added
-  diff.added = _.difference(sourceKeys, targetKeys);
-
-  // Find the keys that will be changed
-  diff.changed = _.filter(sourceKeys, function(key) {
-    return !angular.equals(target[key], source[key]);
-  });
-
-  // Make a list of all the keys that are changing
-  diff.keys = _.union(diff.changed, diff.removed, diff.added);
-
-  // Remove all the keys
-  _.each(diff.removed, function(key) {
-    delete target[key];
-  });
-
-  // Assign the changed to the source to the target
-  _.assign(target, _.pick(source, diff.changed));
-  // Assign the added to the source to the target
-  _.assign(target, _.pick(source, diff.added));
-
-  return diff;
-}
diff --git a/src/legacy/ui/public/utils/math.test.ts b/src/legacy/ui/public/utils/math.test.ts
deleted file mode 100644
index 13f090e77647b0..00000000000000
--- a/src/legacy/ui/public/utils/math.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { greatestCommonDivisor, leastCommonMultiple } from './math';
-
-describe('math utils', () => {
-  describe('greatestCommonDivisor', () => {
-    const tests: Array<[number, number, number]> = [
-      [3, 5, 1],
-      [30, 36, 6],
-      [5, 1, 1],
-      [9, 9, 9],
-      [40, 20, 20],
-      [3, 0, 3],
-      [0, 5, 5],
-      [0, 0, 0],
-      [-9, -3, 3],
-      [-24, 8, 8],
-      [22, -7, 1],
-    ];
-
-    tests.map(([a, b, expected]) => {
-      it(`should return ${expected} for greatestCommonDivisor(${a}, ${b})`, () => {
-        expect(greatestCommonDivisor(a, b)).toBe(expected);
-      });
-    });
-  });
-
-  describe('leastCommonMultiple', () => {
-    const tests: Array<[number, number, number]> = [
-      [3, 5, 15],
-      [1, 1, 1],
-      [5, 6, 30],
-      [3, 9, 9],
-      [8, 20, 40],
-      [5, 5, 5],
-      [0, 5, 0],
-      [-4, -5, 20],
-      [-2, -3, 6],
-      [-8, 2, 8],
-      [-8, 5, 40],
-    ];
-
-    tests.map(([a, b, expected]) => {
-      it(`should return ${expected} for leastCommonMultiple(${a}, ${b})`, () => {
-        expect(leastCommonMultiple(a, b)).toBe(expected);
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/vis/editors/config/editor_config_providers.ts b/src/legacy/ui/public/vis/editors/config/editor_config_providers.ts
index 31fc0d90be1016..c7fb937b974245 100644
--- a/src/legacy/ui/public/vis/editors/config/editor_config_providers.ts
+++ b/src/legacy/ui/public/vis/editors/config/editor_config_providers.ts
@@ -21,7 +21,7 @@ import { TimeIntervalParam } from 'ui/vis/editors/config/types';
 import { AggConfig } from '../..';
 import { AggType } from '../../../agg_types';
 import { IndexPattern } from '../../../../../../plugins/data/public';
-import { leastCommonMultiple } from '../../../utils/math';
+import { leastCommonMultiple } from '../../lib/least_common_multiple';
 import { parseEsInterval } from '../../../../../core_plugins/data/public';
 import { leastCommonInterval } from '../../lib/least_common_interval';
 import { EditorConfig, EditorParamConfig, FixedParam, NumericIntervalParam } from './types';
diff --git a/src/legacy/ui/public/vis/lib/least_common_interval.ts b/src/legacy/ui/public/vis/lib/least_common_interval.ts
index dfdb099249228f..244bc1d0111e3b 100644
--- a/src/legacy/ui/public/vis/lib/least_common_interval.ts
+++ b/src/legacy/ui/public/vis/lib/least_common_interval.ts
@@ -18,7 +18,7 @@
  */
 
 import dateMath from '@elastic/datemath';
-import { leastCommonMultiple } from '../../utils/math';
+import { leastCommonMultiple } from './least_common_multiple';
 import { parseEsInterval } from '../../../../core_plugins/data/public';
 
 /**
diff --git a/src/legacy/ui/public/utils/case_conversion.ts b/src/legacy/ui/public/vis/lib/least_common_multiple.test.ts
similarity index 60%
rename from src/legacy/ui/public/utils/case_conversion.ts
rename to src/legacy/ui/public/vis/lib/least_common_multiple.test.ts
index e0c4cad6b4e940..d07ac96b5f4d5b 100644
--- a/src/legacy/ui/public/utils/case_conversion.ts
+++ b/src/legacy/ui/public/vis/lib/least_common_multiple.test.ts
@@ -17,20 +17,26 @@
  * under the License.
  */
 
-// TODO: This file is copied from src/legacy/utils/case_conversion.ts
-// because TS-imports from utils in ui are currently not possible.
-// When the build process is updated, this file can be removed
+import { leastCommonMultiple } from './least_common_multiple';
 
-import _ from 'lodash';
+describe('leastCommonMultiple', () => {
+  const tests: Array<[number, number, number]> = [
+    [3, 5, 15],
+    [1, 1, 1],
+    [5, 6, 30],
+    [3, 9, 9],
+    [8, 20, 40],
+    [5, 5, 5],
+    [0, 5, 0],
+    [-4, -5, 20],
+    [-2, -3, 6],
+    [-8, 2, 8],
+    [-8, 5, 40],
+  ];
 
-export function keysToSnakeCaseShallow(object: Record<string, any>) {
-  return _.mapKeys(object, (value, key) => {
-    return _.snakeCase(key);
+  tests.map(([a, b, expected]) => {
+    test(`should return ${expected} for leastCommonMultiple(${a}, ${b})`, () => {
+      expect(leastCommonMultiple(a, b)).toBe(expected);
+    });
   });
-}
-
-export function keysToCamelCaseShallow(object: Record<string, any>) {
-  return _.mapKeys(object, (value, key) => {
-    return _.camelCase(key);
-  });
-}
+});
diff --git a/src/legacy/ui/public/utils/math.ts b/src/legacy/ui/public/vis/lib/least_common_multiple.ts
similarity index 95%
rename from src/legacy/ui/public/utils/math.ts
rename to src/legacy/ui/public/vis/lib/least_common_multiple.ts
index e0cab4236e2b8d..dedddbf22ab44b 100644
--- a/src/legacy/ui/public/utils/math.ts
+++ b/src/legacy/ui/public/vis/lib/least_common_multiple.ts
@@ -24,8 +24,10 @@
  * This method does not properly work for fractional (non integer) numbers. If you
  * pass in fractional numbers there usually will be an output, but that's not necessarily
  * the greatest common divisor of those two numbers.
+ *
+ * @private
  */
-export function greatestCommonDivisor(a: number, b: number): number {
+function greatestCommonDivisor(a: number, b: number): number {
   return a === 0 ? Math.abs(b) : greatestCommonDivisor(b % a, a);
 }
 
@@ -36,6 +38,8 @@ export function greatestCommonDivisor(a: number, b: number): number {
  * Since this calculation suffers from rounding issues in decimal values, this method
  * won't work for passing in fractional (non integer) numbers. It will return a value,
  * but that value won't necessarily be the mathematical correct least common multiple.
+ *
+ * @internal
  */
 export function leastCommonMultiple(a: number, b: number): number {
   return Math.abs((a * b) / greatestCommonDivisor(a, b));
diff --git a/src/legacy/utils/case_conversion.test.ts b/src/legacy/utils/case_conversion.test.ts
deleted file mode 100644
index 27498f38789800..00000000000000
--- a/src/legacy/utils/case_conversion.test.ts
+++ /dev/null
@@ -1,56 +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 { keysToCamelCaseShallow, keysToSnakeCaseShallow } from './case_conversion';
-
-describe('keysToSnakeCaseShallow', () => {
-  it("should convert all of an object's keys to snake case", () => {
-    const result = keysToSnakeCaseShallow({
-      camelCase: 'camel_case',
-      'kebab-case': 'kebab_case',
-      snake_case: 'snake_case',
-    });
-
-    expect(result).toMatchInlineSnapshot(`
-Object {
-  "camel_case": "camel_case",
-  "kebab_case": "kebab_case",
-  "snake_case": "snake_case",
-}
-`);
-  });
-});
-
-describe('keysToCamelCaseShallow', () => {
-  it("should convert all of an object's keys to camel case", () => {
-    const result = keysToCamelCaseShallow({
-      camelCase: 'camelCase',
-      'kebab-case': 'kebabCase',
-      snake_case: 'snakeCase',
-    });
-
-    expect(result).toMatchInlineSnapshot(`
-Object {
-  "camelCase": "camelCase",
-  "kebabCase": "kebabCase",
-  "snakeCase": "snakeCase",
-}
-`);
-  });
-});
diff --git a/src/plugins/data/common/utils/index.ts b/src/plugins/data/common/utils/index.ts
index 7196c96989e97d..c5f1276feb81dd 100644
--- a/src/plugins/data/common/utils/index.ts
+++ b/src/plugins/data/common/utils/index.ts
@@ -18,3 +18,4 @@
  */
 
 export { shortenDottedString } from './shorten_dotted_string';
+export { parseInterval } from './parse_interval';
diff --git a/src/plugins/data/common/utils/parse_interval.test.ts b/src/plugins/data/common/utils/parse_interval.test.ts
new file mode 100644
index 00000000000000..0c02b02a25af0d
--- /dev/null
+++ b/src/plugins/data/common/utils/parse_interval.test.ts
@@ -0,0 +1,119 @@
+/*
+ * 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 { Duration, unitOfTime } from 'moment';
+import { parseInterval } from './parse_interval';
+
+const validateDuration = (duration: Duration | null, unit: unitOfTime.Base, value: number) => {
+  expect(duration).toBeDefined();
+
+  if (duration) {
+    expect(duration.as(unit)).toBe(value);
+  }
+};
+
+describe('parseInterval', () => {
+  describe('integer', () => {
+    test('should correctly parse 1d interval', () => {
+      validateDuration(parseInterval('1d'), 'd', 1);
+    });
+
+    test('should correctly parse 2y interval', () => {
+      validateDuration(parseInterval('2y'), 'y', 2);
+    });
+
+    test('should correctly parse 5M interval', () => {
+      validateDuration(parseInterval('5M'), 'M', 5);
+    });
+
+    test('should correctly parse 5m interval', () => {
+      validateDuration(parseInterval('5m'), 'm', 5);
+    });
+
+    test('should correctly parse 250ms interval', () => {
+      validateDuration(parseInterval('250ms'), 'ms', 250);
+    });
+
+    test('should correctly parse 100s interval', () => {
+      validateDuration(parseInterval('100s'), 's', 100);
+    });
+
+    test('should correctly parse 23d interval', () => {
+      validateDuration(parseInterval('23d'), 'd', 23);
+    });
+
+    test('should correctly parse 52w interval', () => {
+      validateDuration(parseInterval('52w'), 'w', 52);
+    });
+  });
+
+  describe('fractional interval', () => {
+    test('should correctly parse fractional 2.35y interval', () => {
+      validateDuration(parseInterval('2.35y'), 'y', 2.35);
+    });
+
+    test('should correctly parse fractional 1.5w interval', () => {
+      validateDuration(parseInterval('1.5w'), 'w', 1.5);
+    });
+  });
+
+  describe('less than 1', () => {
+    test('should correctly bubble up 0.5h interval which are less than 1', () => {
+      validateDuration(parseInterval('0.5h'), 'm', 30);
+    });
+
+    test('should correctly bubble up 0.5d interval which are less than 1', () => {
+      validateDuration(parseInterval('0.5d'), 'h', 12);
+    });
+  });
+
+  describe('unit in an interval only', () => {
+    test('should correctly parse ms interval', () => {
+      validateDuration(parseInterval('ms'), 'ms', 1);
+    });
+
+    test('should correctly parse d interval', () => {
+      validateDuration(parseInterval('d'), 'd', 1);
+    });
+
+    test('should correctly parse m interval', () => {
+      validateDuration(parseInterval('m'), 'm', 1);
+    });
+
+    test('should correctly parse y interval', () => {
+      validateDuration(parseInterval('y'), 'y', 1);
+    });
+
+    test('should correctly parse M interval', () => {
+      validateDuration(parseInterval('M'), 'M', 1);
+    });
+  });
+
+  test('should return null for an invalid interval', () => {
+    let duration = parseInterval('');
+    expect(duration).toBeNull();
+
+    // @ts-ignore
+    duration = parseInterval(null);
+    expect(duration).toBeNull();
+
+    duration = parseInterval('234asdf');
+    expect(duration).toBeNull();
+  });
+});
diff --git a/src/legacy/ui/public/utils/parse_interval.js b/src/plugins/data/common/utils/parse_interval.ts
similarity index 86%
rename from src/legacy/ui/public/utils/parse_interval.js
rename to src/plugins/data/common/utils/parse_interval.ts
index fe484985ef101a..ef1d89e400b729 100644
--- a/src/legacy/ui/public/utils/parse_interval.js
+++ b/src/plugins/data/common/utils/parse_interval.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import _ from 'lodash';
-import moment from 'moment';
+import { find } from 'lodash';
+import moment, { unitOfTime } from 'moment';
 import dateMath from '@elastic/datemath';
 
 // Assume interval is in the form (value)(unit), such as "1h"
 const INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
 
-export function parseInterval(interval) {
+export function parseInterval(interval: string): moment.Duration | null {
   const matches = String(interval)
     .trim()
     .match(INTERVAL_STRING_RE);
@@ -33,7 +33,7 @@ export function parseInterval(interval) {
 
   try {
     const value = parseFloat(matches[1]) || 1;
-    const unit = matches[2];
+    const unit = matches[2] as unitOfTime.Base;
 
     const duration = moment.duration(value, unit);
 
@@ -44,9 +44,10 @@ export function parseInterval(interval) {
     // adding 0.5 days until we hit the end date. However, since there is a bug in moment, when you add 0.5 days to
     // the start date, you get the same exact date (instead of being ahead by 12 hours). So instead of returning
     // a duration corresponding to 0.5 hours, we return a duration corresponding to 12 hours.
-    const selectedUnit = _.find(dateMath.units, function(unit) {
-      return Math.abs(duration.as(unit)) >= 1;
-    });
+    const selectedUnit = find(
+      dateMath.units,
+      u => Math.abs(duration.as(u)) >= 1
+    ) as unitOfTime.Base;
 
     return moment.duration(duration.as(selectedUnit), selectedUnit);
   } catch (e) {
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 967887764237d2..4b330600417e7d 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -90,6 +90,8 @@ export {
   castEsToKbnFieldTypeName,
   getKbnFieldType,
   getKbnTypeNames,
+  // utils
+  parseInterval,
 } from '../common';
 
 // Export plugin after all other imports
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index fe96c494bd9ff4..8194e9a6c847e4 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -47,6 +47,8 @@ export {
   // timefilter
   RefreshInterval,
   TimeRange,
+  // utils
+  parseInterval,
 } from '../common';
 
 /**
diff --git a/src/test_utils/public/simulate_keys.js b/src/test_utils/public/simulate_keys.js
index 8ee4a79e6bc7c4..a876d67325c053 100644
--- a/src/test_utils/public/simulate_keys.js
+++ b/src/test_utils/public/simulate_keys.js
@@ -20,7 +20,7 @@
 import $ from 'jquery';
 import _ from 'lodash';
 import Bluebird from 'bluebird';
-import { keyMap } from 'ui/utils/key_map';
+import { keyMap } from 'ui/directives/key_map';
 const reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
 
 /**
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js
index 82e8c602a7a3eb..3e5c92dfc007f9 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js
@@ -6,7 +6,7 @@
 import React from 'react';
 import { flatten } from 'lodash';
 import { escapeKuery } from './escape_kuery';
-import { sortPrefixFirst } from 'ui/utils/sort_prefix_first';
+import { sortPrefixFirst } from './sort_prefix_first';
 import { isFilterable } from '../../../../../../src/plugins/data/public';
 import { FormattedMessage } from '@kbn/i18n/react';
 
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.test.ts
new file mode 100644
index 00000000000000..7db05a60377da8
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.test.ts
@@ -0,0 +1,79 @@
+/*
+ * 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 { sortPrefixFirst } from './sort_prefix_first';
+
+describe('sortPrefixFirst', () => {
+  test('should return the original unmodified array if no prefix is provided', () => {
+    const array = ['foo', 'bar', 'baz'];
+    const result = sortPrefixFirst(array);
+
+    expect(result).toBe(array);
+    expect(result).toEqual(['foo', 'bar', 'baz']);
+  });
+
+  test('should sort items that match the prefix first without modifying the original array', () => {
+    const array = ['foo', 'bar', 'baz'];
+    const result = sortPrefixFirst(array, 'b');
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual(['bar', 'baz', 'foo']);
+    expect(array).toEqual(['foo', 'bar', 'baz']);
+  });
+
+  test('should not modify the order of the array other than matching prefix without modifying the original array', () => {
+    const array = ['foo', 'bar', 'baz', 'qux', 'quux'];
+    const result = sortPrefixFirst(array, 'b');
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual(['bar', 'baz', 'foo', 'qux', 'quux']);
+    expect(array).toEqual(['foo', 'bar', 'baz', 'qux', 'quux']);
+  });
+
+  test('should sort objects by property if provided', () => {
+    const array = [
+      { name: 'foo' },
+      { name: 'bar' },
+      { name: 'baz' },
+      { name: 'qux' },
+      { name: 'quux' },
+    ];
+    const result = sortPrefixFirst(array, 'b', 'name');
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual([
+      { name: 'bar' },
+      { name: 'baz' },
+      { name: 'foo' },
+      { name: 'qux' },
+      { name: 'quux' },
+    ]);
+    expect(array).toEqual([
+      { name: 'foo' },
+      { name: 'bar' },
+      { name: 'baz' },
+      { name: 'qux' },
+      { name: 'quux' },
+    ]);
+  });
+
+  test('should handle numbers', () => {
+    const array = [1, 50, 5];
+    const result = sortPrefixFirst(array, 5);
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual([50, 5, 1]);
+  });
+
+  test('should handle mixed case', () => {
+    const array = ['Date Histogram', 'Histogram'];
+    const prefix = 'histo';
+    const result = sortPrefixFirst(array, prefix);
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual(['Histogram', 'Date Histogram']);
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.ts
new file mode 100644
index 00000000000000..123e440b752312
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.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 { partition } from 'lodash';
+
+export function sortPrefixFirst(array: any[], prefix?: string | number, property?: string): any[] {
+  if (!prefix) {
+    return array;
+  }
+  const lowerCasePrefix = ('' + prefix).toLowerCase();
+
+  const partitions = partition(array, entry => {
+    const value = ('' + (property ? entry[property] : entry)).toLowerCase();
+    return value.startsWith(lowerCasePrefix);
+  });
+  return [...partitions[0], ...partitions[1]];
+}

From 392e62a4de9f4a8cc92e9f6e2a0a0b3bf8da6930 Mon Sep 17 00:00:00 2001
From: Ahmad Bamieh <ahmadbamieh@gmail.com>
Date: Wed, 8 Jan 2020 13:31:07 +0200
Subject: [PATCH 45/96] =?UTF-8?q?[Telemetry]=20Fix=20license=20page=20cras?=
 =?UTF-8?q?hing=20on=20telemetry.enabled:=20fa=E2=80=A6=20(#54174)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legacy/plugins/license_management/public/register_route.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/license_management/public/register_route.ts b/x-pack/legacy/plugins/license_management/public/register_route.ts
index 994a888ac020a6..0fe29b543be5bb 100644
--- a/x-pack/legacy/plugins/license_management/public/register_route.ts
+++ b/x-pack/legacy/plugins/license_management/public/register_route.ts
@@ -52,7 +52,7 @@ if (licenseManagementUiEnabled) {
   };
 
   const initializeTelemetry = ($injector: any) => {
-    const telemetryEnabled = $injector.get('telemetryEnabled');
+    const telemetryEnabled = npStart.core.injectedMetadata.getInjectedVar('telemetryEnabled');
     const Private = $injector.get('Private');
     const telemetryOptInProvider = Private(TelemetryOptInProvider);
     setTelemetryOptInService(telemetryOptInProvider);

From 3b5a90b51cc69f056f742a49cde69bf53927ea8b Mon Sep 17 00:00:00 2001
From: Tim Schnell <timductive@gmail.com>
Date: Wed, 8 Jan 2020 07:41:52 -0600
Subject: [PATCH 46/96] fix ecommerce percentages in sample data (#54200)

---
 .../server/sample_data/ecommerce_saved_objects.json  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-pack/legacy/plugins/canvas/server/sample_data/ecommerce_saved_objects.json b/x-pack/legacy/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
index 39970c6d66b7af..113fba55553760 100644
--- a/x-pack/legacy/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
+++ b/x-pack/legacy/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
@@ -194,7 +194,7 @@
                 "height": 56,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"FEMALE\"}} \n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#eb6c66\" weight=\"normal\" underline=false italic=false}"
+              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"femaleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0} | math \"round(100 * sum(femaleCount) / count(femaleCount))\" | markdown {context} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#eb6c66\" weight=\"normal\" underline=false italic=false}"
             },
             {
               "id": "element-9e0b6230-2bc9-4995-8207-043e3063faeb",
@@ -205,7 +205,7 @@
                 "height": 56,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"MALE\"}} \n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#f8bd4a\" weight=\"normal\" underline=false italic=false}"
+              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"round(100 * sum(maleCount) / count(maleCount))\" | markdown {context} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#f8bd4a\" weight=\"normal\" underline=false italic=false}"
             },
             {
               "id": "element-2185edff-ac50-4162-b583-3bfd6469e925",
@@ -959,23 +959,23 @@
               "id": "element-b8f13a87-b781-42d5-a663-5dbd4f645d6d",
               "position": {
                 "left": 837,
-                "top": 472,
+                "top": 468,
                 "width": 91,
                 "height": 63,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"FEMALE\"}} \n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}"
+              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"femaleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0} | math \"round(100 * sum(femaleCount) / count(femaleCount))\" | markdown {context} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}"
             },
             {
               "id": "element-86b06b67-893e-4555-ad38-7fba9ea3153b",
               "position": {
                 "left": 837,
-                "top": 219,
+                "top": 215,
                 "width": 90,
                 "height": 72,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"MALE\"}} \n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}"
+              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"round(100 * sum(maleCount) / count(maleCount))\" | markdown {context} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}"
             },
             {
               "id": "element-507337d9-6e0e-4752-8770-6ebe88e9b3da",

From fdea7b048d4b9de69ee6da722cccec239c386890 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Wed, 8 Jan 2020 14:53:58 +0100
Subject: [PATCH 47/96] Add explanation of path.data to contribution guide
 (#54235)

* Add explanation of path.data to contribution guide

* Change title slightly
---
 CONTRIBUTING.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06e08c85dafec0..6ae3db559b61ba 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -190,6 +190,19 @@ These snapshots are built on a nightly basis which expire after a couple weeks.
 yarn es snapshot
 ```
 
+##### Keeping data between snapshots
+
+If you want to keep the data inside your Elasticsearch between usages of this command,
+you should use the following command, to keep your data folder outside the downloaded snapshot 
+folder:
+
+```bash
+yarn es snapshot -E path.data=../data
+```
+
+The same parameter can be used with the source and archive command shown in the following
+paragraphs.
+
 #### Source
 
 By default, it will reference an [elasticsearch](https://github.com/elastic/elasticsearch) checkout which is a sibling to the Kibana directory named `elasticsearch`. If you wish to use a checkout in another location you can provide that by supplying `--source-path`

From 6abfbd138255e8c358e06397997ca302b9f13aa6 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Wed, 8 Jan 2020 08:58:44 -0500
Subject: [PATCH 48/96] filters are back (#54218)

---
 .../siem/public/pages/hosts/hosts.test.tsx    | 60 +++++++++++++++++-
 .../plugins/siem/public/pages/hosts/hosts.tsx |  5 +-
 .../public/pages/network/network.test.tsx     | 61 ++++++++++++++++++-
 .../siem/public/pages/network/network.tsx     |  3 +-
 4 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
index f7e0863465f9a7..065d91b3fc2faa 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
@@ -11,14 +11,18 @@ import { Router } from 'react-router-dom';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ActionCreator } from 'typescript-fsa';
 
+import { esFilters } from '../../../../../../../src/plugins/data/common/es_query';
 import '../../mock/match_media';
 import { mocksSource } from '../../containers/source/mock';
 import { wait } from '../../lib/helpers';
-import { TestProviders } from '../../mock';
+import { apolloClientObservable, TestProviders, mockGlobalState } from '../../mock';
 import { InputsModelId } from '../../store/inputs/constants';
 import { SiemNavigation } from '../../components/navigation';
+import { inputsActions } from '../../store/inputs';
+import { State, createStore } from '../../store';
 import { HostsComponentProps } from './types';
 import { Hosts } from './hosts';
+import { HostsTabs } from './hosts_tabs';
 
 // Test will fail because we will to need to mock some core services to make the test work
 // For now let's forget about SiemSearchBar and QueryBar
@@ -136,4 +140,58 @@ describe('Hosts - rendering', () => {
     wrapper.update();
     expect(wrapper.find(SiemNavigation).exists()).toBe(true);
   });
+
+  test('it should add the new filters after init', async () => {
+    const newFilters: esFilters.Filter[] = [
+      {
+        query: {
+          bool: {
+            filter: [
+              {
+                bool: {
+                  should: [
+                    {
+                      match_phrase: {
+                        'host.name': 'ItRocks',
+                      },
+                    },
+                  ],
+                  minimum_should_match: 1,
+                },
+              },
+            ],
+          },
+        },
+        meta: {
+          alias: '',
+          disabled: false,
+          key: 'bool',
+          negate: false,
+          type: 'custom',
+          value:
+            '{"query": {"bool": {"filter": [{"bool": {"should": [{"match_phrase": {"host.name": "ItRocks"}}],"minimum_should_match": 1}}]}}}',
+        },
+      },
+    ];
+    localSource[0].result.data.source.status.indicesExist = true;
+    const myState: State = mockGlobalState;
+    const myStore = createStore(myState, apolloClientObservable);
+    const wrapper = mount(
+      <TestProviders store={myStore}>
+        <MockedProvider mocks={localSource} addTypename={false}>
+          <Router history={mockHistory}>
+            <Hosts {...hostProps} />
+          </Router>
+        </MockedProvider>
+      </TestProviders>
+    );
+    await wait();
+    wrapper.update();
+
+    myStore.dispatch(inputsActions.setSearchBarFilter({ id: 'global', filters: newFilters }));
+    wrapper.update();
+    expect(wrapper.find(HostsTabs).props().filterQuery).toEqual(
+      '{"bool":{"must":[],"filter":[{"match_all":{}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"host.name":"ItRocks"}}],"minimum_should_match":1}}]}}],"should":[],"must_not":[]}}'
+    );
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
index 6b69f06b97b833..2c475e4ba6ac58 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
@@ -41,7 +41,7 @@ import { HostsTableType } from '../../store/hosts/model';
 
 const KpiHostsComponentManage = manageQuery(KpiHostsComponent);
 
-const HostsComponent = React.memo<HostsComponentProps>(
+export const HostsComponent = React.memo<HostsComponentProps>(
   ({
     deleteQuery,
     isInitializing,
@@ -56,13 +56,12 @@ const HostsComponent = React.memo<HostsComponentProps>(
     const capabilities = React.useContext(MlCapabilitiesContext);
     const kibana = useKibana();
     const { tabName } = useParams();
-
     const hostsFilters = React.useMemo(() => {
       if (tabName === HostsTableType.alerts) {
         return filters.length > 0 ? [...filters, ...filterAlertsHosts] : filterAlertsHosts;
       }
       return filters;
-    }, [tabName]);
+    }, [tabName, filters]);
     const narrowDateRange = useCallback(
       (min: number, max: number) => {
         setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx b/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
index 26b2bd9dace48e..3a22e800d893fc 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
@@ -11,10 +11,13 @@ import { Router } from 'react-router-dom';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import '../../mock/match_media';
-
+import { esFilters } from '../../../../../../../src/plugins/data/common/es_query';
 import { mocksSource } from '../../containers/source/mock';
-import { TestProviders } from '../../mock';
+import { TestProviders, mockGlobalState, apolloClientObservable } from '../../mock';
+import { State, createStore } from '../../store';
+import { inputsActions } from '../../store/inputs';
 import { Network } from './network';
+import { NetworkRoutes } from './navigation';
 
 // Test will fail because we will to need to mock some core services to make the test work
 // For now let's forget about SiemSearchBar and QueryBar
@@ -111,4 +114,58 @@ describe('rendering - rendering', () => {
     wrapper.update();
     expect(wrapper.find('[data-test-subj="empty-page"]').exists()).toBe(false);
   });
+
+  test('it should add the new filters after init', async () => {
+    const newFilters: esFilters.Filter[] = [
+      {
+        query: {
+          bool: {
+            filter: [
+              {
+                bool: {
+                  should: [
+                    {
+                      match_phrase: {
+                        'host.name': 'ItRocks',
+                      },
+                    },
+                  ],
+                  minimum_should_match: 1,
+                },
+              },
+            ],
+          },
+        },
+        meta: {
+          alias: '',
+          disabled: false,
+          key: 'bool',
+          negate: false,
+          type: 'custom',
+          value:
+            '{"query": {"bool": {"filter": [{"bool": {"should": [{"match_phrase": {"host.name": "ItRocks"}}],"minimum_should_match": 1}}]}}}',
+        },
+      },
+    ];
+    localSource[0].result.data.source.status.indicesExist = true;
+    const myState: State = mockGlobalState;
+    const myStore = createStore(myState, apolloClientObservable);
+    const wrapper = mount(
+      <TestProviders store={myStore}>
+        <MockedProvider mocks={localSource} addTypename={false}>
+          <Router history={mockHistory}>
+            <Network {...getMockProps()} />
+          </Router>
+        </MockedProvider>
+      </TestProviders>
+    );
+    await new Promise(resolve => setTimeout(resolve));
+    wrapper.update();
+
+    myStore.dispatch(inputsActions.setSearchBarFilter({ id: 'global', filters: newFilters }));
+    wrapper.update();
+    expect(wrapper.find(NetworkRoutes).props().filterQuery).toEqual(
+      '{"bool":{"must":[],"filter":[{"match_all":{}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"host.name":"ItRocks"}}],"minimum_should_match":1}}]}}],"should":[],"must_not":[]}}'
+    );
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/network.tsx b/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
index c39935742a2e01..ad3513a6f529e0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
@@ -59,7 +59,8 @@ const NetworkComponent = React.memo<NetworkComponentProps>(
         return filters.length > 0 ? [...filters, ...filterAlertsNetwork] : filterAlertsNetwork;
       }
       return filters;
-    }, [tabName]);
+    }, [tabName, filters]);
+
     const narrowDateRange = useCallback(
       (min: number, max: number) => {
         setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });

From 683c138798de8fdc65d915af7616ee21ab45df5b Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Wed, 8 Jan 2020 07:26:54 -0700
Subject: [PATCH 49/96] Add file upload to telemetry integration tests (#53539)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/test/api_integration/apis/telemetry/telemetry_local.js | 3 +++
 1 file changed, 3 insertions(+)

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 ef7124e2864f8c..db705b301a71ec 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
@@ -86,6 +86,9 @@ export default function({ getService }) {
       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);
+      expect(stats.stack_stats.kibana.plugins.fileUploadTelemetry.filesUploadedTotalCount).to.be.a(
+        'number'
+      );
 
       expect(stats.stack_stats.kibana.os.platforms[0].platform).to.be.a('string');
       expect(stats.stack_stats.kibana.os.platforms[0].count).to.be(1);

From 16b217a11bf901b2c40fbd36c416a4543150cdd2 Mon Sep 17 00:00:00 2001
From: Court Ewing <court@epixa.com>
Date: Wed, 8 Jan 2020 09:32:58 -0500
Subject: [PATCH 50/96] [DOCS] consolidate telemetry settings to core (#52634)

* docs: consolidate telemetry settings to core

Telemetry is no longer part of monitoring.

* docs: revise telemetry settings text

* docs: tweak telemetry setting text
---
 docs/settings/monitoring-settings.asciidoc | 7 -------
 docs/setup/settings.asciidoc               | 5 +++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/settings/monitoring-settings.asciidoc b/docs/settings/monitoring-settings.asciidoc
index 2fc74d2ffee32b..38a46a3cde5a0b 100644
--- a/docs/settings/monitoring-settings.asciidoc
+++ b/docs/settings/monitoring-settings.asciidoc
@@ -66,13 +66,6 @@ both the {es} monitoring cluster and the {es} production cluster.
 
 If not set, {kib} uses the value of the `elasticsearch.password` setting.
 
-`telemetry.enabled`::
-Set to `true` (default) to send cluster statistics to Elastic. Reporting your
-cluster statistics helps us improve your user experience. Your data is never
-shared with anyone. Set to `false` to disable statistics reporting from any
-browser connected to the {kib} instance. You can also opt out through the
-*Advanced Settings* in {kib}.
-
 `xpack.monitoring.elasticsearch.pingTimeout`::
 Specifies the time in milliseconds to wait for {es} to respond to internal
 health checks. By default, it matches the `elasticsearch.pingTimeout` setting,
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index 01e6bd51ea50b7..c98df6ca78356b 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -380,6 +380,11 @@ cannot be `false` at the same time.
  To enable telemetry and prevent users from disabling it,
  set `telemetry.allowChangingOptInStatus` to `false` and `telemetry.optIn` to `true`.
 
+`telemetry.enabled`:: *Default: true* Reporting your cluster statistics helps
+us improve your user experience. Your data is never shared with anyone. Set to
+`false` to disable telemetry capabilities entirely. You can alternatively opt
+out through the *Advanced Settings* in {kib}.
+
 `vega.enableExternalUrls:`:: *Default: false* Set this value to true to allow Vega to use any URL to access external data sources and images. If false, Vega can only get data from Elasticsearch.
 
 `xpack.license_management.enabled`:: *Default: true* Set this value to false to

From a93c23cd567192784d249a211ec14d39e92c0a63 Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Wed, 8 Jan 2020 09:53:50 -0500
Subject: [PATCH 51/96] Reorganize structure of component render to avoid
 errors. (#54251)

---
 .../functional/charts/duration_chart.tsx      | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
index b5dcfce032724b..775e8c0c06aa50 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
@@ -66,32 +66,32 @@ export const DurationChart = ({
           </h4>
         </EuiTitle>
         <ChartWrapper height="400px" loading={loading}>
-          <Chart>
-            <Settings xDomain={{ min, max }} showLegend={true} legendPosition={Position.Bottom} />
-            <Axis
-              id="bottom"
-              position={Position.Bottom}
-              showOverlappingTicks={true}
-              tickFormat={timeFormatter(getChartDateLabel(min, max))}
-              title={i18n.translate('xpack.uptime.monitorCharts.durationChart.bottomAxis.title', {
-                defaultMessage: 'Timestamp',
-              })}
-            />
-            <Axis
-              domain={{ min: 0 }}
-              id="left"
-              position={Position.Left}
-              tickFormat={d => getTickFormat(d)}
-              title={i18n.translate('xpack.uptime.monitorCharts.durationChart.leftAxis.title', {
-                defaultMessage: 'Duration ms',
-              })}
-            />
-            {hasLines ? (
+          {hasLines ? (
+            <Chart>
+              <Settings xDomain={{ min, max }} showLegend={true} legendPosition={Position.Bottom} />
+              <Axis
+                id="bottom"
+                position={Position.Bottom}
+                showOverlappingTicks={true}
+                tickFormat={timeFormatter(getChartDateLabel(min, max))}
+                title={i18n.translate('xpack.uptime.monitorCharts.durationChart.bottomAxis.title', {
+                  defaultMessage: 'Timestamp',
+                })}
+              />
+              <Axis
+                domain={{ min: 0 }}
+                id="left"
+                position={Position.Left}
+                tickFormat={d => getTickFormat(d)}
+                title={i18n.translate('xpack.uptime.monitorCharts.durationChart.leftAxis.title', {
+                  defaultMessage: 'Duration ms',
+                })}
+              />
               <DurationLineSeriesList lines={locationDurationLines} meanColor={meanColor} />
-            ) : (
-              <DurationChartEmptyState />
-            )}
-          </Chart>
+            </Chart>
+          ) : (
+            <DurationChartEmptyState />
+          )}
         </ChartWrapper>
       </EuiPanel>
     </>

From 63ac99b3aaf0b2e6ad51cdf642bfee13ae0b5d7c Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Wed, 8 Jan 2020 15:59:06 +0100
Subject: [PATCH 52/96] Re-enable OIDC API integration test. (#54111)

---
 .../test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts b/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
index 630ec2792b9bf4..1f5a64835416aa 100644
--- a/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
+++ b/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
@@ -100,7 +100,7 @@ export default function({ getService }: FtrProviderContext) {
       });
 
       // FLAKY: https://github.com/elastic/kibana/issues/43938
-      it.skip('should succeed if both the OpenID Connect response and the cookie are provided', async () => {
+      it('should succeed if both the OpenID Connect response and the cookie are provided', async () => {
         const { idToken, accessToken } = createTokens('1', stateAndNonce.nonce);
         const authenticationResponse = `https://kibana.com/api/security/oidc/implicit#id_token=${idToken}&state=${stateAndNonce.state}&token_type=bearer&access_token=${accessToken}`;
 

From 8e0e4948d562be5373e89c53861449517e4c2729 Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Wed, 8 Jan 2020 16:33:51 +0100
Subject: [PATCH 53/96] [SIEM] Fix columns in timeline do not resize (#51816)

---
 x-pack/legacy/plugins/siem/package.json       |   2 +-
 .../components/fields_browser/index.tsx       |   4 +-
 .../components/flyout/pane/index.test.tsx     |   2 +-
 .../public/components/flyout/pane/index.tsx   | 160 ++++++++-------
 .../pane/timeline_resize_handle.tsx}          |   7 +-
 .../__snapshots__/index.test.tsx.snap         |  14 --
 .../components/resize_handle/index.test.tsx   | 184 -----------------
 .../public/components/resize_handle/index.tsx | 145 -------------
 .../components/resize_handle/is_resizing.tsx  |  16 --
 .../__snapshots__/index.test.tsx.snap         |  22 +-
 .../body/column_headers/column_header.tsx     |  99 +++++++++
 .../common/dragging_container.tsx             |  24 +++
 .../header/__snapshots__/index.test.tsx.snap  |  56 ++++-
 .../column_headers/header/header_content.tsx  |  76 +++++++
 .../body/column_headers/header/index.test.tsx |  43 ----
 .../body/column_headers/header/index.tsx      | 123 ++---------
 .../body/column_headers/index.test.tsx        |  40 ----
 .../timeline/body/column_headers/index.tsx    | 194 +++++++-----------
 .../__snapshots__/index.test.tsx.snap         |  60 +++---
 .../public/components/timeline/styles.tsx     |  81 ++++----
 x-pack/package.json                           |   1 +
 yarn.lock                                     |  20 +-
 22 files changed, 509 insertions(+), 864 deletions(-)
 rename x-pack/legacy/plugins/siem/public/components/{resize_handle/styled_handles.tsx => flyout/pane/timeline_resize_handle.tsx} (70%)
 delete mode 100644 x-pack/legacy/plugins/siem/public/components/resize_handle/__snapshots__/index.test.tsx.snap
 delete mode 100644 x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
 delete mode 100644 x-pack/legacy/plugins/siem/public/components/resize_handle/index.tsx
 delete mode 100644 x-pack/legacy/plugins/siem/public/components/resize_handle/is_resizing.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/common/dragging_container.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx

diff --git a/x-pack/legacy/plugins/siem/package.json b/x-pack/legacy/plugins/siem/package.json
index bf5d6d3a3089cb..558ac013e5963b 100644
--- a/x-pack/legacy/plugins/siem/package.json
+++ b/x-pack/legacy/plugins/siem/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@types/lodash": "^4.14.110",
     "@types/js-yaml": "^3.12.1",
-    "@types/react-beautiful-dnd": "^11.0.3"
+    "@types/react-beautiful-dnd": "^11.0.4"
   },
   "dependencies": {
     "lodash": "^4.17.15",
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/index.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/index.tsx
index 3958cd463d56ef..c8cde5fa02a519 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/index.tsx
@@ -212,9 +212,7 @@ export const StatefulFieldsBrowserComponent = React.memo<FieldBrowserProps & Dis
   }
 );
 
-StatefulFieldsBrowserComponent.displayName = 'StatefulFieldsBrowserComponent';
-
 export const StatefulFieldsBrowser = connect(null, {
   removeColumn: timelineActions.removeColumn,
   upsertColumn: timelineActions.upsertColumn,
-})(StatefulFieldsBrowserComponent);
+})(React.memo(StatefulFieldsBrowserComponent));
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
index c1c890c5865761..365f99c6667b8f 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
@@ -50,7 +50,7 @@ describe('Pane', () => {
       </TestProviders>
     );
 
-    expect(wrapper.find('[data-test-subj="eui-flyout"]').get(0).props.maxWidth).toEqual('95%');
+    expect(wrapper.find('Resizable').get(0).props.maxWidth).toEqual('95vw');
   });
 
   test('it applies timeline styles to the EuiFlyout', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.tsx
index f2f0cf4f980f33..00ac15092a6ec1 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.tsx
@@ -5,13 +5,14 @@
  */
 
 import { EuiButtonIcon, EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiToolTip } from '@elastic/eui';
-import React, { useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 import { connect } from 'react-redux';
 import styled from 'styled-components';
 import { ActionCreator } from 'typescript-fsa';
+import { Resizable, ResizeCallback } from 're-resizable';
+import { throttle } from 'lodash/fp';
 
-import { OnResize, Resizeable } from '../../resize_handle';
-import { TimelineResizeHandle } from '../../resize_handle/styled_handles';
+import { TimelineResizeHandle } from './timeline_resize_handle';
 import { FlyoutHeader } from '../header';
 
 import * as i18n from './translations';
@@ -41,10 +42,10 @@ interface DispatchProps {
 
 type Props = OwnProps & DispatchProps;
 
-const EuiFlyoutContainer = styled.div<{ headerHeight: number; width: number }>`
+const EuiFlyoutContainer = styled.div<{ headerHeight: number }>`
   .timeline-flyout {
     min-width: 150px;
-    width: ${({ width }) => `${width}px`};
+    width: auto;
   }
   .timeline-flyout-header {
     align-items: center;
@@ -65,8 +66,6 @@ const EuiFlyoutContainer = styled.div<{ headerHeight: number; width: number }>`
   }
 `;
 
-EuiFlyoutContainer.displayName = 'EuiFlyoutContainer';
-
 const FlyoutHeaderContainer = styled.div`
   align-items: center;
   display: flex;
@@ -75,88 +74,95 @@ const FlyoutHeaderContainer = styled.div`
   width: 100%;
 `;
 
-FlyoutHeaderContainer.displayName = 'FlyoutHeaderContainer';
-
 // manually wrap the close button because EuiButtonIcon can't be a wrapped `styled`
 const WrappedCloseButton = styled.div`
   margin-right: 5px;
 `;
 
-WrappedCloseButton.displayName = 'WrappedCloseButton';
-
-const FlyoutHeaderWithCloseButton = React.memo<{
+const FlyoutHeaderWithCloseButtonComponent: React.FC<{
   onClose: () => void;
   timelineId: string;
   usersViewing: string[];
-}>(
-  ({ onClose, timelineId, usersViewing }) => (
-    <FlyoutHeaderContainer>
-      <WrappedCloseButton>
-        <EuiToolTip content={i18n.CLOSE_TIMELINE}>
-          <EuiButtonIcon
-            aria-label={i18n.CLOSE_TIMELINE}
-            data-test-subj="close-timeline"
-            iconType="cross"
-            onClick={onClose}
-          />
-        </EuiToolTip>
-      </WrappedCloseButton>
-      <FlyoutHeader timelineId={timelineId} usersViewing={usersViewing} />
-    </FlyoutHeaderContainer>
-  ),
+}> = ({ onClose, timelineId, usersViewing }) => (
+  <FlyoutHeaderContainer>
+    <WrappedCloseButton>
+      <EuiToolTip content={i18n.CLOSE_TIMELINE}>
+        <EuiButtonIcon
+          aria-label={i18n.CLOSE_TIMELINE}
+          data-test-subj="close-timeline"
+          iconType="cross"
+          onClick={onClose}
+        />
+      </EuiToolTip>
+    </WrappedCloseButton>
+    <FlyoutHeader timelineId={timelineId} usersViewing={usersViewing} />
+  </FlyoutHeaderContainer>
+);
+
+const FlyoutHeaderWithCloseButton = React.memo(
+  FlyoutHeaderWithCloseButtonComponent,
   (prevProps, nextProps) =>
     prevProps.timelineId === nextProps.timelineId &&
     prevProps.usersViewing === nextProps.usersViewing
 );
 
-FlyoutHeaderWithCloseButton.displayName = 'FlyoutHeaderWithCloseButton';
-
-const FlyoutPaneComponent = React.memo<Props>(
-  ({
-    applyDeltaToWidth,
-    children,
-    flyoutHeight,
-    headerHeight,
-    onClose,
-    timelineId,
-    usersViewing,
-    width,
-  }) => {
-    const renderFlyout = useCallback(() => <></>, []);
-
-    const onResize: OnResize = useCallback(
-      ({ delta, id }) => {
-        const bodyClientWidthPixels = document.body.clientWidth;
-
+const FlyoutPaneComponent: React.FC<Props> = ({
+  applyDeltaToWidth,
+  children,
+  flyoutHeight,
+  headerHeight,
+  onClose,
+  timelineId,
+  usersViewing,
+  width,
+}) => {
+  const [lastDelta, setLastDelta] = useState(0);
+  const onResizeStop: ResizeCallback = useCallback(
+    (e, direction, ref, delta) => {
+      const bodyClientWidthPixels = document.body.clientWidth;
+
+      if (delta.width) {
         applyDeltaToWidth({
           bodyClientWidthPixels,
-          delta,
-          id,
+          delta: -(delta.width - lastDelta),
+          id: timelineId,
           maxWidthPercent,
           minWidthPixels,
         });
-      },
-      [applyDeltaToWidth, maxWidthPercent, minWidthPixels]
-    );
-    return (
-      <EuiFlyoutContainer headerHeight={headerHeight} data-test-subj="flyout-pane" width={width}>
-        <EuiFlyout
-          aria-label={i18n.TIMELINE_DESCRIPTION}
-          className="timeline-flyout"
-          data-test-subj="eui-flyout"
-          hideCloseButton={true}
-          maxWidth={`${maxWidthPercent}%`}
-          onClose={onClose}
-          size="l"
-        >
-          <Resizeable
-            handle={
+        setLastDelta(delta.width);
+      }
+    },
+    [applyDeltaToWidth, maxWidthPercent, minWidthPixels, lastDelta]
+  );
+  const resetLastDelta = useCallback(() => setLastDelta(0), [setLastDelta]);
+  const throttledResize = throttle(100, onResizeStop);
+
+  return (
+    <EuiFlyoutContainer headerHeight={headerHeight} data-test-subj="flyout-pane">
+      <EuiFlyout
+        aria-label={i18n.TIMELINE_DESCRIPTION}
+        className="timeline-flyout"
+        data-test-subj="eui-flyout"
+        hideCloseButton={true}
+        onClose={onClose}
+        size="l"
+      >
+        <Resizable
+          enable={{ left: true }}
+          defaultSize={{
+            width,
+            height: 'auto',
+          }}
+          minWidth={minWidthPixels}
+          maxWidth={`${maxWidthPercent}vw`}
+          handleComponent={{
+            left: (
               <TimelineResizeHandle data-test-subj="flyout-resize-handle" height={flyoutHeight} />
-            }
-            id={timelineId}
-            onResize={onResize}
-            render={renderFlyout}
-          />
+            ),
+          }}
+          onResizeStart={resetLastDelta}
+          onResize={throttledResize}
+        >
           <EuiFlyoutHeader
             className="timeline-flyout-header"
             data-test-subj="eui-flyout-header"
@@ -171,16 +177,14 @@ const FlyoutPaneComponent = React.memo<Props>(
           <EuiFlyoutBody data-test-subj="eui-flyout-body" className="timeline-flyout-body">
             {children}
           </EuiFlyoutBody>
-        </EuiFlyout>
-      </EuiFlyoutContainer>
-    );
-  }
-);
-
-FlyoutPaneComponent.displayName = 'FlyoutPaneComponent';
+        </Resizable>
+      </EuiFlyout>
+    </EuiFlyoutContainer>
+  );
+};
 
 export const Pane = connect(null, {
   applyDeltaToWidth: timelineActions.applyDeltaToWidth,
-})(FlyoutPaneComponent);
+})(React.memo(FlyoutPaneComponent));
 
 Pane.displayName = 'Pane';
diff --git a/x-pack/legacy/plugins/siem/public/components/resize_handle/styled_handles.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/pane/timeline_resize_handle.tsx
similarity index 70%
rename from x-pack/legacy/plugins/siem/public/components/resize_handle/styled_handles.tsx
rename to x-pack/legacy/plugins/siem/public/components/flyout/pane/timeline_resize_handle.tsx
index 4f641c5d2042ef..3ee29c2eaaa169 100644
--- a/x-pack/legacy/plugins/siem/public/components/resize_handle/styled_handles.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/pane/timeline_resize_handle.tsx
@@ -8,18 +8,13 @@ import styled from 'styled-components';
 
 export const TIMELINE_RESIZE_HANDLE_WIDTH = 2; // px
 
-export const CommonResizeHandle = styled.div`
+export const TimelineResizeHandle = styled.div<{ height: number }>`
   cursor: col-resize;
   height: 100%;
   min-height: 20px;
   width: 0;
-`;
-CommonResizeHandle.displayName = 'CommonResizeHandle';
-
-export const TimelineResizeHandle = styled(CommonResizeHandle)<{ height: number }>`
   border: ${TIMELINE_RESIZE_HANDLE_WIDTH}px solid ${props => props.theme.eui.euiColorLightShade};
   z-index: 2;
   height: ${({ height }) => `${height}px`};
   position: absolute;
 `;
-TimelineResizeHandle.displayName = 'TimelineResizeHandle';
diff --git a/x-pack/legacy/plugins/siem/public/components/resize_handle/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/resize_handle/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 38027f80e6684f..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/resize_handle/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,14 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Resizeable it renders 1`] = `
-<Fragment>
-  <ResizeHandleContainer
-    data-test-subj="resize-handle-container"
-    height="100%"
-  >
-    <CommonResizeHandle
-      data-test-subj="test-resize-handle"
-    />
-  </ResizeHandleContainer>
-</Fragment>
-`;
diff --git a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
deleted file mode 100644
index 1237a6538a4c19..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
+++ /dev/null
@@ -1,184 +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 { mount, shallow } from 'enzyme';
-import React from 'react';
-
-import { TestProviders } from '../../mock/test_providers';
-
-import {
-  addGlobalResizeCursorStyleToBody,
-  globalResizeCursorClassName,
-  removeGlobalResizeCursorStyleFromBody,
-  Resizeable,
-  calculateDeltaX,
-} from '.';
-import { CommonResizeHandle } from './styled_handles';
-
-describe('Resizeable', () => {
-  afterEach(() => {
-    document.body.classList.remove(globalResizeCursorClassName);
-  });
-
-  test('it applies the provided height to the ResizeHandleContainer when a height is specified', () => {
-    const wrapper = mount(
-      <TestProviders>
-        <Resizeable
-          handle={<CommonResizeHandle data-test-subj="test-resize-handle" />}
-          height="100%"
-          id="test"
-          onResize={jest.fn()}
-          render={() => <></>}
-        />
-      </TestProviders>
-    );
-
-    expect(wrapper.find('[data-test-subj="resize-handle-container"]').first()).toHaveStyleRule(
-      'height',
-      '100%'
-    );
-  });
-
-  test('it applies positioning styles to the ResizeHandleContainer when positionAbsolute is true and bottom/left/right/top is specified', () => {
-    const wrapper = mount(
-      <TestProviders>
-        <Resizeable
-          bottom={0}
-          handle={<CommonResizeHandle data-test-subj="test-resize-handle" />}
-          id="test"
-          left={0}
-          onResize={jest.fn()}
-          positionAbsolute
-          render={() => <></>}
-          right={0}
-          top={0}
-        />
-      </TestProviders>
-    );
-    const resizeHandleContainer = wrapper
-      .find('[data-test-subj="resize-handle-container"]')
-      .first();
-
-    expect(resizeHandleContainer).toHaveStyleRule('bottom', '0');
-    expect(resizeHandleContainer).toHaveStyleRule('left', '0');
-    expect(resizeHandleContainer).toHaveStyleRule('position', 'absolute');
-    expect(resizeHandleContainer).toHaveStyleRule('right', '0');
-    expect(resizeHandleContainer).toHaveStyleRule('top', '0');
-  });
-
-  test('it DOES NOT apply positioning styles to the ResizeHandleContainer when positionAbsolute is false, regardless if bottom/left/right/top is specified', () => {
-    const wrapper = mount(
-      <TestProviders>
-        <Resizeable
-          bottom={0}
-          handle={<CommonResizeHandle data-test-subj="test-resize-handle" />}
-          id="test"
-          left={0}
-          onResize={jest.fn()}
-          render={() => <></>}
-          right={0}
-          top={0}
-        />
-      </TestProviders>
-    );
-    const resizeHandleContainer = wrapper
-      .find('[data-test-subj="resize-handle-container"]')
-      .first();
-
-    expect(resizeHandleContainer).not.toHaveStyleRule('bottom', '0');
-    expect(resizeHandleContainer).not.toHaveStyleRule('left', '0');
-    expect(resizeHandleContainer).not.toHaveStyleRule('position', 'absolute');
-    expect(resizeHandleContainer).not.toHaveStyleRule('right', '0');
-    expect(resizeHandleContainer).not.toHaveStyleRule('top', '0');
-  });
-
-  test('it renders', () => {
-    const wrapper = shallow(
-      <Resizeable
-        handle={<CommonResizeHandle data-test-subj="test-resize-handle" />}
-        height="100%"
-        id="test"
-        onResize={jest.fn()}
-        render={() => <></>}
-      />
-    );
-
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  describe('resize cursor styling', () => {
-    test('it does NOT apply the global-resize-cursor style to the body by default', () => {
-      mount(
-        <TestProviders>
-          <Resizeable
-            handle={<CommonResizeHandle data-test-subj="test-resize-handle" />}
-            height="100%"
-            id="test"
-            onResize={jest.fn()}
-            render={() => <></>}
-          />
-        </TestProviders>
-      );
-
-      expect(document.body.className).not.toContain(globalResizeCursorClassName);
-    });
-
-    describe('#addGlobalResizeCursorStyleToBody', () => {
-      test('it adds the global-resize-cursor style to the body', () => {
-        mount(
-          <TestProviders>
-            <Resizeable
-              handle={<CommonResizeHandle data-test-subj="test-resize-handle" />}
-              height="100%"
-              id="test"
-              onResize={jest.fn()}
-              render={() => <></>}
-            />
-          </TestProviders>
-        );
-
-        addGlobalResizeCursorStyleToBody();
-
-        expect(document.body.className).toContain(globalResizeCursorClassName);
-      });
-    });
-
-    describe('#removeGlobalResizeCursorStyleFromBody', () => {
-      test('it removes the global-resize-cursor style from body', () => {
-        mount(
-          <TestProviders>
-            <Resizeable
-              handle={<CommonResizeHandle data-test-subj="test-resize-handle" />}
-              height="100%"
-              id="test"
-              onResize={jest.fn()}
-              render={() => <></>}
-            />
-          </TestProviders>
-        );
-
-        addGlobalResizeCursorStyleToBody();
-        removeGlobalResizeCursorStyleFromBody();
-
-        expect(document.body.className).not.toContain(globalResizeCursorClassName);
-      });
-    });
-
-    describe('#calculateDeltaX', () => {
-      test('it returns 0 when prevX isEqual 0', () => {
-        expect(calculateDeltaX({ prevX: 0, screenX: 189 })).toEqual(0);
-      });
-
-      test('it returns positive difference when screenX > prevX', () => {
-        expect(calculateDeltaX({ prevX: 10, screenX: 189 })).toEqual(179);
-      });
-
-      test('it returns negative difference when prevX > screenX ', () => {
-        expect(calculateDeltaX({ prevX: 199, screenX: 189 })).toEqual(-10);
-      });
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.tsx b/x-pack/legacy/plugins/siem/public/components/resize_handle/index.tsx
deleted file mode 100644
index eb3326c2f2cd0c..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.tsx
+++ /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, { useEffect, useRef } from 'react';
-import { fromEvent, Observable, Subscription } from 'rxjs';
-import { concatMap, takeUntil } from 'rxjs/operators';
-import styled from 'styled-components';
-
-export type OnResize = ({ delta, id }: { delta: number; id: string }) => void;
-
-export const resizeCursorStyle = 'col-resize';
-export const globalResizeCursorClassName = 'global-resize-cursor';
-
-/** This polyfill is for Safari and IE-11 only. `movementX` is more accurate and "feels" better, so only use this function on Safari and IE-11 */
-export const calculateDeltaX = ({ prevX, screenX }: { prevX: number; screenX: number }) =>
-  prevX !== 0 ? screenX - prevX : 0;
-
-const isSafari = /^((?!chrome|android|crios|fxios|Firefox).)*safari/i.test(navigator.userAgent);
-
-interface ResizeHandleContainerProps {
-  bottom?: string | number;
-  /** optionally provide a height style ResizeHandleContainer */
-  height?: string;
-  left?: string | number;
-  positionAbsolute?: boolean;
-  right?: string | number;
-  top?: string | number;
-}
-
-interface Props extends ResizeHandleContainerProps {
-  /** a (styled) resize handle */
-  handle: React.ReactNode;
-  /** the `onResize` callback will be invoked with this id */
-  id: string;
-  /** invoked when the handle is resized */
-  onResize: OnResize;
-  /** The resizeable content to render */
-  render: (isResizing: boolean) => React.ReactNode;
-}
-
-const ResizeHandleContainer = styled.div<ResizeHandleContainerProps>`
-  bottom: ${({ positionAbsolute, bottom }) => positionAbsolute && bottom};
-  cursor: ${resizeCursorStyle};
-  height: ${({ height }) => height};
-  left: ${({ positionAbsolute, left }) => positionAbsolute && left};
-  position: ${({ positionAbsolute }) => positionAbsolute && 'absolute'};
-  right: ${({ positionAbsolute, right }) => positionAbsolute && right};
-  top: ${({ positionAbsolute, top }) => positionAbsolute && top};
-  z-index: ${({ positionAbsolute, theme }) => positionAbsolute && theme.eui.euiZLevel1};
-`;
-ResizeHandleContainer.displayName = 'ResizeHandleContainer';
-
-export const addGlobalResizeCursorStyleToBody = () => {
-  document.body.classList.add(globalResizeCursorClassName);
-};
-
-export const removeGlobalResizeCursorStyleFromBody = () => {
-  document.body.classList.remove(globalResizeCursorClassName);
-};
-
-export const Resizeable = React.memo<Props>(
-  ({ bottom, handle, height, id, left, onResize, positionAbsolute, render, right, top }) => {
-    const drag$ = useRef<Observable<MouseEvent> | null>(null);
-    const dragEventTargets = useRef<Array<{ htmlElement: HTMLElement; prevCursor: string }>>([]);
-    const dragSubscription = useRef<Subscription | null>(null);
-    const prevX = useRef(0);
-    const ref = useRef(null);
-    const upSubscription = useRef<Subscription | null>(null);
-    const isResizingRef = useRef(false);
-
-    const calculateDelta = (e: MouseEvent) => {
-      const deltaX = calculateDeltaX({ prevX: prevX.current, screenX: e.screenX });
-      prevX.current = e.screenX;
-      return deltaX;
-    };
-    useEffect(() => {
-      const move$ = fromEvent<MouseEvent>(document, 'mousemove');
-      const down$ = fromEvent<MouseEvent>(ref.current!, 'mousedown');
-      const up$ = fromEvent<MouseEvent>(document, 'mouseup');
-
-      drag$.current = down$.pipe(concatMap(() => move$.pipe(takeUntil(up$))));
-      dragSubscription.current =
-        drag$.current &&
-        drag$.current.subscribe(event => {
-          // We do a feature detection of event.movementX here and if it is missing
-          // we calculate the delta manually. Browsers IE-11 and Safari will call calculateDelta
-          const delta =
-            event.movementX == null || isSafari ? calculateDelta(event) : event.movementX;
-          if (!isResizingRef.current) {
-            isResizingRef.current = true;
-          }
-          onResize({ id, delta });
-          if (event.target != null && event.target instanceof HTMLElement) {
-            const htmlElement: HTMLElement = event.target;
-            dragEventTargets.current = [
-              ...dragEventTargets.current,
-              { htmlElement, prevCursor: htmlElement.style.cursor },
-            ];
-            htmlElement.style.cursor = resizeCursorStyle;
-          }
-        });
-
-      upSubscription.current = up$.subscribe(() => {
-        if (isResizingRef.current) {
-          dragEventTargets.current.reverse().forEach(eventTarget => {
-            eventTarget.htmlElement.style.cursor = eventTarget.prevCursor;
-          });
-          dragEventTargets.current = [];
-          isResizingRef.current = false;
-        }
-      });
-      return () => {
-        if (dragSubscription.current != null) {
-          dragSubscription.current.unsubscribe();
-        }
-        if (upSubscription.current != null) {
-          upSubscription.current.unsubscribe();
-        }
-      };
-    }, []);
-
-    return (
-      <>
-        {render(isResizingRef.current)}
-        <ResizeHandleContainer
-          bottom={bottom}
-          data-test-subj="resize-handle-container"
-          height={height}
-          ref={ref}
-          left={left}
-          positionAbsolute={positionAbsolute}
-          right={right}
-          top={top}
-        >
-          {handle}
-        </ResizeHandleContainer>
-      </>
-    );
-  }
-);
-
-Resizeable.displayName = 'Resizeable';
diff --git a/x-pack/legacy/plugins/siem/public/components/resize_handle/is_resizing.tsx b/x-pack/legacy/plugins/siem/public/components/resize_handle/is_resizing.tsx
deleted file mode 100644
index 5eb2d397b4c989..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/resize_handle/is_resizing.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useState } from 'react';
-
-export const useIsContainerResizing = () => {
-  const [isResizing, setIsResizing] = useState(false);
-
-  return {
-    isResizing,
-    setIsResizing,
-  };
-};
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
index 1b66a130c3550c..dfea99ffd70910 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
@@ -1,20 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
-<EventsThead
+<styled.div
   data-test-subj="column-headers"
 >
-  <EventsTrHeader>
-    <EventsThGroupActions
+  <styled.div>
+    <styled.div
       actionsColumnWidth={115}
       data-test-subj="actions-container"
       justifyContent="space-between"
     >
-      <EventsTh>
-        <EventsThContent
+      <styled.div>
+        <styled.div
           textAlign="center"
         >
-          <Connect(StatefulFieldsBrowserComponent)
+          <Connect(Component)
             browserFields={
               Object {
                 "agent": Object {
@@ -478,9 +478,9 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
             toggleColumn={[MockFunction]}
             width={900}
           />
-        </EventsThContent>
-      </EventsTh>
-    </EventsThGroupActions>
+        </styled.div>
+      </styled.div>
+    </styled.div>
     <Connect(Droppable)
       direction="horizontal"
       droppableId="droppableId.timelineColumns.test"
@@ -494,6 +494,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
     >
       <Component />
     </Connect(Droppable)>
-  </EventsTrHeader>
-</EventsThead>
+  </styled.div>
+</styled.div>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/column_header.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/column_header.tsx
index 15911f522032a3..ccaeeff972a812 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/column_header.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/column_header.tsx
@@ -4,6 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import React from 'react';
+import { Draggable } from 'react-beautiful-dnd';
+import { Resizable, ResizeCallback } from 're-resizable';
+import { DragEffects } from '../../../drag_and_drop/draggable_wrapper';
+import { getDraggableFieldId, DRAG_TYPE_FIELD } from '../../../drag_and_drop/helpers';
+import { DraggableFieldBadge } from '../../../draggables/field_badge';
+import { OnColumnRemoved, OnColumnSorted, OnFilterChange, OnColumnResized } from '../../events';
+import { EventsTh, EventsThContent, EventsHeadingHandle } from '../../styles';
+import { Sort } from '../sort';
+import { DraggingContainer } from './common/dragging_container';
+
+import { Header } from './header';
 import { ColumnId } from '../column_id';
 
 export type ColumnHeaderType = 'not-filtered' | 'text-filter';
@@ -22,3 +34,90 @@ export interface ColumnHeader {
   type?: string;
   width: number;
 }
+
+interface ColumneHeaderProps {
+  draggableIndex: number;
+  header: ColumnHeader;
+  onColumnRemoved: OnColumnRemoved;
+  onColumnSorted: OnColumnSorted;
+  onColumnResized: OnColumnResized;
+  onFilterChange?: OnFilterChange;
+  sort: Sort;
+  timelineId: string;
+}
+
+const ColumnHeaderComponent: React.FC<ColumneHeaderProps> = ({
+  draggableIndex,
+  header,
+  timelineId,
+  onColumnRemoved,
+  onColumnResized,
+  onColumnSorted,
+  onFilterChange,
+  sort,
+}) => {
+  const [isDragging, setIsDragging] = React.useState(false);
+  const handleResizeStop: ResizeCallback = (e, direction, ref, delta) => {
+    onColumnResized({ columnId: header.id, delta: delta.width });
+  };
+
+  return (
+    <Resizable
+      enable={{ right: true }}
+      size={{
+        width: header.width,
+        height: 'auto',
+      }}
+      style={{
+        position: isDragging ? 'absolute' : 'relative',
+      }}
+      handleComponent={{
+        right: <EventsHeadingHandle />,
+      }}
+      onResizeStop={handleResizeStop}
+    >
+      <Draggable
+        data-test-subj="draggable"
+        // Required for drag events while hovering the sort button to work: https://github.com/atlassian/react-beautiful-dnd/blob/master/docs/api/draggable.md#interactive-child-elements-within-a-draggable-
+        disableInteractiveElementBlocking
+        draggableId={getDraggableFieldId({
+          contextId: `timeline-column-headers-${timelineId}`,
+          fieldId: header.id,
+        })}
+        index={draggableIndex}
+        key={header.id}
+        type={DRAG_TYPE_FIELD}
+      >
+        {(dragProvided, dragSnapshot) => (
+          <EventsTh
+            data-test-subj="draggable-header"
+            {...dragProvided.draggableProps}
+            {...dragProvided.dragHandleProps}
+            ref={dragProvided.innerRef}
+          >
+            {!dragSnapshot.isDragging ? (
+              <EventsThContent>
+                <Header
+                  timelineId={timelineId}
+                  header={header}
+                  onColumnRemoved={onColumnRemoved}
+                  onColumnSorted={onColumnSorted}
+                  onFilterChange={onFilterChange}
+                  sort={sort}
+                />
+              </EventsThContent>
+            ) : (
+              <DraggingContainer onDragging={setIsDragging}>
+                <DragEffects>
+                  <DraggableFieldBadge fieldId={header.id} fieldWidth={`${header.width}px`} />
+                </DragEffects>
+              </DraggingContainer>
+            )}
+          </EventsTh>
+        )}
+      </Draggable>
+    </Resizable>
+  );
+};
+
+export const ColumnHeader = React.memo(ColumnHeaderComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/common/dragging_container.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/common/dragging_container.tsx
new file mode 100644
index 00000000000000..21aa17aa1c52c5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/common/dragging_container.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FC, memo, useEffect } from 'react';
+
+interface DraggingContainerProps {
+  children: JSX.Element;
+  onDragging: Function;
+}
+
+const DraggingContainerComponent: FC<DraggingContainerProps> = ({ children, onDragging }) => {
+  useEffect(() => {
+    onDragging(true);
+
+    return () => onDragging(false);
+  });
+
+  return children;
+};
+
+export const DraggingContainer = memo(DraggingContainerComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap
index 64c2b6ed106929..d30054ae1a3fe4 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap
@@ -1,14 +1,50 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Header renders correctly against snapshot 1`] = `
-<Resizeable
-  bottom={0}
-  handle={<ForwardRef(styled.div) />}
-  id="@timestamp"
-  onResize={[Function]}
-  positionAbsolute={true}
-  render={[Function]}
-  right="-1px"
-  top={0}
-/>
+<Fragment>
+  <Memo(HeaderContentComponent)
+    header={
+      Object {
+        "columnHeaderType": "not-filtered",
+        "id": "@timestamp",
+        "width": 190,
+      }
+    }
+    isResizing={false}
+    onClick={[Function]}
+    sort={
+      Object {
+        "columnId": "@timestamp",
+        "sortDirection": "desc",
+      }
+    }
+  >
+    <Actions
+      header={
+        Object {
+          "columnHeaderType": "not-filtered",
+          "id": "@timestamp",
+          "width": 190,
+        }
+      }
+      onColumnRemoved={[MockFunction]}
+      sort={
+        Object {
+          "columnId": "@timestamp",
+          "sortDirection": "desc",
+        }
+      }
+    />
+  </Memo(HeaderContentComponent)>
+  <Filter
+    header={
+      Object {
+        "columnHeaderType": "not-filtered",
+        "id": "@timestamp",
+        "width": 190,
+      }
+    }
+    onFilterChange={[Function]}
+  />
+</Fragment>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx
new file mode 100644
index 00000000000000..c38ae26050c937
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiToolTip } from '@elastic/eui';
+import { noop } from 'lodash/fp';
+import React from 'react';
+
+import { TruncatableText } from '../../../../truncatable_text';
+import { EventsHeading, EventsHeadingTitleButton, EventsHeadingTitleSpan } from '../../../styles';
+import { useTimelineContext } from '../../../timeline_context';
+import { Sort } from '../../sort';
+import { SortIndicator } from '../../sort/sort_indicator';
+import { ColumnHeader } from '../column_header';
+import { HeaderToolTipContent } from '../header_tooltip_content';
+import { getSortDirection } from './helpers';
+
+interface HeaderContentProps {
+  children: React.ReactNode;
+  header: ColumnHeader;
+  isResizing: boolean;
+  onClick: () => void;
+  sort: Sort;
+}
+
+const HeaderContentComponent: React.FC<HeaderContentProps> = ({
+  children,
+  header,
+  isResizing,
+  onClick,
+  sort,
+}) => {
+  const isLoading = useTimelineContext();
+
+  return (
+    <EventsHeading data-test-subj="header" isLoading={isLoading}>
+      {header.aggregatable ? (
+        <EventsHeadingTitleButton
+          data-test-subj="header-sort-button"
+          onClick={!isResizing && !isLoading ? onClick : noop}
+        >
+          <TruncatableText data-test-subj={`header-text-${header.id}`}>
+            <EuiToolTip
+              data-test-subj="header-tooltip"
+              content={<HeaderToolTipContent header={header} />}
+            >
+              <>{header.label ?? header.id}</>
+            </EuiToolTip>
+          </TruncatableText>
+
+          <SortIndicator
+            data-test-subj="header-sort-indicator"
+            sortDirection={getSortDirection({ header, sort })}
+          />
+        </EventsHeadingTitleButton>
+      ) : (
+        <EventsHeadingTitleSpan>
+          <TruncatableText data-test-subj={`header-text-${header.id}`}>
+            <EuiToolTip
+              data-test-subj="header-tooltip"
+              content={<HeaderToolTipContent header={header} />}
+            >
+              <>{header.label ?? header.id}</>
+            </EuiToolTip>
+          </TruncatableText>
+        </EventsHeadingTitleSpan>
+      )}
+
+      {children}
+    </EventsHeading>
+  );
+};
+
+export const HeaderContent = React.memo(HeaderContentComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
index 64f32674cd0422..fab2e7ee872bf1 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
@@ -32,9 +32,7 @@ describe('Header', () => {
       <HeaderComponent
         header={columnHeader}
         onColumnRemoved={jest.fn()}
-        onColumnResized={jest.fn()}
         onColumnSorted={jest.fn()}
-        setIsResizing={jest.fn()}
         sort={sort}
         timelineId={timelineId}
       />
@@ -49,9 +47,7 @@ describe('Header', () => {
           <HeaderComponent
             header={columnHeader}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -74,9 +70,7 @@ describe('Header', () => {
           <HeaderComponent
             header={headerWithLabel}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -98,9 +92,7 @@ describe('Header', () => {
           <HeaderComponent
             header={headerSortable}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -126,9 +118,7 @@ describe('Header', () => {
           <HeaderComponent
             header={columnWithFilter}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -153,9 +143,7 @@ describe('Header', () => {
           <HeaderComponent
             header={headerSortable}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={mockOnColumnSorted}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -181,9 +169,7 @@ describe('Header', () => {
           <HeaderComponent
             header={headerSortable}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={mockOnColumnSorted}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -201,9 +187,7 @@ describe('Header', () => {
           <HeaderComponent
             header={headerSortable}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={mockOnColumnSorted}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -221,9 +205,7 @@ describe('Header', () => {
           <HeaderComponent
             header={headerSortable}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={mockOnColumnSorted}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -334,9 +316,7 @@ describe('Header', () => {
           <HeaderComponent
             header={columnHeader}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -357,9 +337,7 @@ describe('Header', () => {
           <HeaderComponent
             header={columnHeader}
             onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
-            setIsResizing={jest.fn()}
             sort={sort}
             timelineId={timelineId}
           />
@@ -369,25 +347,4 @@ describe('Header', () => {
       expect(wrapper.find('[data-test-subj="header-tooltip"]').exists()).toEqual(true);
     });
   });
-
-  describe('setIsResizing', () => {
-    test('setIsResizing have been call when it renders actions', () => {
-      const mockSetIsResizing = jest.fn();
-      mount(
-        <TestProviders>
-          <HeaderComponent
-            header={columnHeader}
-            onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
-            onColumnSorted={jest.fn()}
-            setIsResizing={mockSetIsResizing}
-            sort={sort}
-            timelineId={timelineId}
-          />
-        </TestProviders>
-      );
-
-      expect(mockSetIsResizing).toHaveBeenCalled();
-    });
-  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.tsx
index 311b4bfda60fe6..c45b9ce425debe 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.tsx
@@ -4,103 +4,34 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiToolTip } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback } from 'react';
 
-import { OnResize, Resizeable } from '../../../../resize_handle';
-import { TruncatableText } from '../../../../truncatable_text';
-import { OnColumnRemoved, OnColumnResized, OnColumnSorted, OnFilterChange } from '../../../events';
-import {
-  EventsHeading,
-  EventsHeadingHandle,
-  EventsHeadingTitleButton,
-  EventsHeadingTitleSpan,
-} from '../../../styles';
-import { useTimelineContext } from '../../../timeline_context';
+import { OnColumnRemoved, OnColumnSorted, OnFilterChange } from '../../../events';
 import { Sort } from '../../sort';
-import { SortIndicator } from '../../sort/sort_indicator';
 import { Actions } from '../actions';
 import { ColumnHeader } from '../column_header';
 import { Filter } from '../filter';
-import { HeaderToolTipContent } from '../header_tooltip_content';
-import { getNewSortDirectionOnClick, getSortDirection } from './helpers';
-
-interface HeaderCompProps {
-  children: React.ReactNode;
-  header: ColumnHeader;
-  isResizing: boolean;
-  onClick: () => void;
-  sort: Sort;
-}
-
-const HeaderComp = React.memo<HeaderCompProps>(
-  ({ children, header, isResizing, onClick, sort }) => {
-    const isLoading = useTimelineContext();
-
-    return (
-      <EventsHeading data-test-subj="header" isLoading={isLoading}>
-        {header.aggregatable ? (
-          <EventsHeadingTitleButton
-            data-test-subj="header-sort-button"
-            onClick={!isResizing && !isLoading ? onClick : noop}
-          >
-            <TruncatableText data-test-subj={`header-text-${header.id}`}>
-              <EuiToolTip
-                data-test-subj="header-tooltip"
-                content={<HeaderToolTipContent header={header} />}
-              >
-                <>{header.label ?? header.id}</>
-              </EuiToolTip>
-            </TruncatableText>
-
-            <SortIndicator
-              data-test-subj="header-sort-indicator"
-              sortDirection={getSortDirection({ header, sort })}
-            />
-          </EventsHeadingTitleButton>
-        ) : (
-          <EventsHeadingTitleSpan>
-            <TruncatableText data-test-subj={`header-text-${header.id}`}>
-              <EuiToolTip
-                data-test-subj="header-tooltip"
-                content={<HeaderToolTipContent header={header} />}
-              >
-                <>{header.label ?? header.id}</>
-              </EuiToolTip>
-            </TruncatableText>
-          </EventsHeadingTitleSpan>
-        )}
-
-        {children}
-      </EventsHeading>
-    );
-  }
-);
-HeaderComp.displayName = 'HeaderComp';
+import { getNewSortDirectionOnClick } from './helpers';
+import { HeaderContent } from './header_content';
 
 interface Props {
   header: ColumnHeader;
   onColumnRemoved: OnColumnRemoved;
-  onColumnResized: OnColumnResized;
   onColumnSorted: OnColumnSorted;
   onFilterChange?: OnFilterChange;
-  setIsResizing: (isResizing: boolean) => void;
   sort: Sort;
   timelineId: string;
 }
 
-/** Renders a header */
-export const HeaderComponent = ({
+export const HeaderComponent: React.FC<Props> = ({
   header,
   onColumnRemoved,
-  onColumnResized,
   onColumnSorted,
   onFilterChange = noop,
-  setIsResizing,
   sort,
-}: Props) => {
-  const onClick = () => {
+}) => {
+  const onClick = useCallback(() => {
     onColumnSorted!({
       columnId: header.id,
       sortDirection: getNewSortDirectionOnClick({
@@ -108,41 +39,17 @@ export const HeaderComponent = ({
         currentSort: sort,
       }),
     });
-  };
-
-  const onResize: OnResize = ({ delta, id }) => {
-    onColumnResized({ columnId: id, delta });
-  };
-
-  const renderActions = (isResizing: boolean) => {
-    setIsResizing(isResizing);
-    return (
-      <>
-        <HeaderComp header={header} isResizing={isResizing} onClick={onClick} sort={sort}>
-          <Actions header={header} onColumnRemoved={onColumnRemoved} sort={sort} />
-        </HeaderComp>
-
-        <Filter header={header} onFilterChange={onFilterChange} />
-      </>
-    );
-  };
+  }, [onColumnSorted, header, sort]);
 
   return (
-    <Resizeable
-      bottom={0}
-      handle={<EventsHeadingHandle />}
-      id={header.id}
-      onResize={onResize}
-      positionAbsolute
-      render={renderActions}
-      right="-1px"
-      top={0}
-    />
+    <>
+      <HeaderContent header={header} isResizing={false} onClick={onClick} sort={sort}>
+        <Actions header={header} onColumnRemoved={onColumnRemoved} sort={sort} />
+      </HeaderContent>
+
+      <Filter header={header} onFilterChange={onFilterChange} />
+    </>
   );
 };
 
-HeaderComponent.displayName = 'HeaderComponent';
-
 export const Header = React.memo(HeaderComponent);
-
-Header.displayName = 'Header';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
index 0fdd7d78ae2530..4b97dd7573a455 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
@@ -17,14 +17,6 @@ import { useMountAppended } from '../../../../utils/use_mount_appended';
 
 import { ColumnHeadersComponent } from '.';
 
-jest.mock('../../../resize_handle/is_resizing', () => ({
-  ...jest.requireActual('../../../resize_handle/is_resizing'),
-  useIsContainerResizing: () => ({
-    isResizing: true,
-    setIsResizing: jest.fn(),
-  }),
-}));
-
 describe('ColumnHeaders', () => {
   const mount = useMountAppended();
 
@@ -117,37 +109,5 @@ describe('ColumnHeaders', () => {
         ).toContain(h.id);
       });
     });
-
-    test('it disables dragging during a column resize', () => {
-      const wrapper = mount(
-        <TestProviders>
-          <ColumnHeadersComponent
-            actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-            browserFields={mockBrowserFields}
-            columnHeaders={defaultHeaders}
-            isSelectAllChecked={false}
-            onColumnSorted={jest.fn()}
-            onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
-            onSelectAll={jest.fn}
-            onUpdateColumns={jest.fn()}
-            showEventsSelect={false}
-            showSelectAllCheckbox={false}
-            sort={sort}
-            timelineId={'test'}
-            toggleColumn={jest.fn()}
-          />
-        </TestProviders>
-      );
-
-      defaultHeaders.forEach(h => {
-        expect(
-          wrapper
-            .find('[data-test-subj="draggable"]')
-            .first()
-            .prop('isDragDisabled')
-        ).toBe(true);
-      });
-    });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
index 52495c2e3c816d..953ffb4d4932b9 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
@@ -7,19 +7,12 @@
 import { EuiCheckbox } from '@elastic/eui';
 import { noop } from 'lodash/fp';
 import React from 'react';
-import { Draggable, Droppable } from 'react-beautiful-dnd';
+import { Droppable } from 'react-beautiful-dnd';
 
 import { BrowserFields } from '../../../../containers/source';
-import { DragEffects } from '../../../drag_and_drop/draggable_wrapper';
-import {
-  DRAG_TYPE_FIELD,
-  droppableTimelineColumnsPrefix,
-  getDraggableFieldId,
-} from '../../../drag_and_drop/helpers';
-import { DraggableFieldBadge } from '../../../draggables/field_badge';
+import { DRAG_TYPE_FIELD, droppableTimelineColumnsPrefix } from '../../../drag_and_drop/helpers';
 import { StatefulFieldsBrowser } from '../../../fields_browser';
 import { FIELD_BROWSER_HEIGHT, FIELD_BROWSER_WIDTH } from '../../../fields_browser/helpers';
-import { useIsContainerResizing } from '../../../resize_handle/is_resizing';
 import {
   OnColumnRemoved,
   OnColumnResized,
@@ -39,7 +32,6 @@ import {
 import { Sort } from '../sort';
 import { ColumnHeader } from './column_header';
 import { EventsSelect } from './events_select';
-import { Header } from './header';
 
 interface Props {
   actionsColumnWidth: number;
@@ -78,132 +70,86 @@ export const ColumnHeadersComponent = ({
   sort,
   timelineId,
   toggleColumn,
-}: Props) => {
-  const { isResizing, setIsResizing } = useIsContainerResizing();
-
-  return (
-    <EventsThead data-test-subj="column-headers">
-      <EventsTrHeader>
-        <EventsThGroupActions
-          actionsColumnWidth={actionsColumnWidth}
-          justifyContent={showSelectAllCheckbox ? 'flexStart' : 'space-between'}
-          data-test-subj="actions-container"
-        >
-          {showEventsSelect && (
-            <EventsTh>
-              <EventsThContent textAlign="center">
-                <EventsSelect checkState="unchecked" timelineId={timelineId} />
-              </EventsThContent>
-            </EventsTh>
-          )}
-
-          {showSelectAllCheckbox && (
-            <EventsTh>
-              <EventsThContent textAlign="center">
-                <EuiCheckbox
-                  data-test-subj="select-all-events"
-                  id={'select-all-events'}
-                  checked={isSelectAllChecked}
-                  onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                    onSelectAll({ isSelected: event.currentTarget.checked });
-                  }}
-                />
-              </EventsThContent>
-            </EventsTh>
-          )}
-
+}: Props) => (
+  <EventsThead data-test-subj="column-headers">
+    <EventsTrHeader>
+      <EventsThGroupActions
+        actionsColumnWidth={actionsColumnWidth}
+        justifyContent={showSelectAllCheckbox ? 'flexStart' : 'space-between'}
+        data-test-subj="actions-container"
+      >
+        {showEventsSelect && (
           <EventsTh>
-            <EventsThContent textAlign={showSelectAllCheckbox ? 'left' : 'center'}>
-              <StatefulFieldsBrowser
-                browserFields={browserFields}
-                columnHeaders={columnHeaders}
-                data-test-subj="field-browser"
-                height={FIELD_BROWSER_HEIGHT}
-                isEventViewer={isEventViewer}
-                onUpdateColumns={onUpdateColumns}
-                timelineId={timelineId}
-                toggleColumn={toggleColumn}
-                width={FIELD_BROWSER_WIDTH}
+            <EventsThContent textAlign="center">
+              <EventsSelect checkState="unchecked" timelineId={timelineId} />
+            </EventsThContent>
+          </EventsTh>
+        )}
+        {showSelectAllCheckbox && (
+          <EventsTh>
+            <EventsThContent textAlign="center">
+              <EuiCheckbox
+                data-test-subj="select-all-events"
+                id={'select-all-events'}
+                checked={isSelectAllChecked}
+                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                  onSelectAll({ isSelected: event.currentTarget.checked });
+                }}
               />
             </EventsThContent>
           </EventsTh>
-        </EventsThGroupActions>
+        )}
+        <EventsTh>
+          <EventsThContent textAlign={showSelectAllCheckbox ? 'left' : 'center'}>
+            <StatefulFieldsBrowser
+              browserFields={browserFields}
+              columnHeaders={columnHeaders}
+              data-test-subj="field-browser"
+              height={FIELD_BROWSER_HEIGHT}
+              isEventViewer={isEventViewer}
+              onUpdateColumns={onUpdateColumns}
+              timelineId={timelineId}
+              toggleColumn={toggleColumn}
+              width={FIELD_BROWSER_WIDTH}
+            />
+          </EventsThContent>
+        </EventsTh>
+      </EventsThGroupActions>
 
-        <Droppable
-          direction={'horizontal'}
-          droppableId={`${droppableTimelineColumnsPrefix}${timelineId}`}
-          isDropDisabled={false}
-          type={DRAG_TYPE_FIELD}
-        >
-          {dropProvided => (
+      <Droppable
+        direction={'horizontal'}
+        droppableId={`${droppableTimelineColumnsPrefix}${timelineId}`}
+        isDropDisabled={false}
+        type={DRAG_TYPE_FIELD}
+      >
+        {(dropProvided, snapshot) => (
+          <>
             <EventsThGroupData
               data-test-subj="headers-group"
               ref={dropProvided.innerRef}
+              isDragging={snapshot.isDraggingOver}
               {...dropProvided.droppableProps}
             >
-              {columnHeaders.map((header, i) => (
-                <Draggable
-                  data-test-subj="draggable"
-                  // Required for drag events while hovering the sort button to work: https://github.com/atlassian/react-beautiful-dnd/blob/master/docs/api/draggable.md#interactive-child-elements-within-a-draggable-
-                  disableInteractiveElementBlocking
-                  draggableId={getDraggableFieldId({
-                    contextId: `timeline-column-headers-${timelineId}`,
-                    fieldId: header.id,
-                  })}
-                  index={i}
-                  isDragDisabled={isResizing}
+              {columnHeaders.map((header, draggableIndex) => (
+                <ColumnHeader
                   key={header.id}
-                  type={DRAG_TYPE_FIELD}
-                >
-                  {(dragProvided, dragSnapshot) => (
-                    <EventsTh
-                      {...dragProvided.draggableProps}
-                      {...dragProvided.dragHandleProps}
-                      data-test-subj="draggable-header"
-                      ref={dragProvided.innerRef}
-                      isDragging={dragSnapshot.isDragging}
-                      position="relative"
-                      // Passing the styles directly to the component because the width is being calculated and is recommended by Styled Components for performance: https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
-                      style={{
-                        flexBasis: `${header.width}px`,
-                        ...dragProvided.draggableProps.style,
-                      }}
-                    >
-                      {!dragSnapshot.isDragging ? (
-                        <EventsThContent>
-                          <Header
-                            timelineId={timelineId}
-                            header={header}
-                            onColumnRemoved={onColumnRemoved}
-                            onColumnResized={onColumnResized}
-                            onColumnSorted={onColumnSorted}
-                            onFilterChange={onFilterChange}
-                            setIsResizing={setIsResizing}
-                            sort={sort}
-                          />
-                        </EventsThContent>
-                      ) : (
-                        <DragEffects>
-                          <DraggableFieldBadge
-                            fieldId={header.id}
-                            fieldWidth={`${header.width}px`}
-                          />
-                        </DragEffects>
-                      )}
-                    </EventsTh>
-                  )}
-                </Draggable>
+                  draggableIndex={draggableIndex}
+                  timelineId={timelineId}
+                  header={header}
+                  onColumnRemoved={onColumnRemoved}
+                  onColumnSorted={onColumnSorted}
+                  onFilterChange={onFilterChange}
+                  onColumnResized={onColumnResized}
+                  sort={sort}
+                />
               ))}
             </EventsThGroupData>
-          )}
-        </Droppable>
-      </EventsTrHeader>
-    </EventsThead>
-  );
-};
-
-ColumnHeadersComponent.displayName = 'ColumnHeadersComponent';
+            {dropProvided.placeholder}
+          </>
+        )}
+      </Droppable>
+    </EventsTrHeader>
+  </EventsThead>
+);
 
 export const ColumnHeaders = React.memo(ColumnHeadersComponent);
-
-ColumnHeaders.displayName = 'ColumnHeaders';
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 a168f8d48fa33b..75c05dd1455afd 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
@@ -1,10 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Columns it renders the expected columns 1`] = `
-<EventsTdGroupData
+<styled.div
   data-test-subj="data-driven-columns"
 >
-  <EventsTd
+  <styled.div
     key="message"
     style={
       Object {
@@ -12,7 +12,7 @@ exports[`Columns it renders the expected columns 1`] = `
       }
     }
   >
-    <EventsTdContent
+    <styled.div
       data-test-subj="cell-container"
     >
       <DraggableWrapper
@@ -36,9 +36,9 @@ exports[`Columns it renders the expected columns 1`] = `
         render={[Function]}
         truncate={true}
       />
-    </EventsTdContent>
-  </EventsTd>
-  <EventsTd
+    </styled.div>
+  </styled.div>
+  <styled.div
     key="event.category"
     style={
       Object {
@@ -46,7 +46,7 @@ exports[`Columns it renders the expected columns 1`] = `
       }
     }
   >
-    <EventsTdContent
+    <styled.div
       data-test-subj="cell-container"
     >
       <FormattedFieldValue
@@ -59,9 +59,9 @@ exports[`Columns it renders the expected columns 1`] = `
         truncate={true}
         value="Access"
       />
-    </EventsTdContent>
-  </EventsTd>
-  <EventsTd
+    </styled.div>
+  </styled.div>
+  <styled.div
     key="event.action"
     style={
       Object {
@@ -69,7 +69,7 @@ exports[`Columns it renders the expected columns 1`] = `
       }
     }
   >
-    <EventsTdContent
+    <styled.div
       data-test-subj="cell-container"
     >
       <FormattedFieldValue
@@ -82,9 +82,9 @@ exports[`Columns it renders the expected columns 1`] = `
         truncate={true}
         value="Action"
       />
-    </EventsTdContent>
-  </EventsTd>
-  <EventsTd
+    </styled.div>
+  </styled.div>
+  <styled.div
     key="host.name"
     style={
       Object {
@@ -92,7 +92,7 @@ exports[`Columns it renders the expected columns 1`] = `
       }
     }
   >
-    <EventsTdContent
+    <styled.div
       data-test-subj="cell-container"
     >
       <FormattedFieldValue
@@ -105,9 +105,9 @@ exports[`Columns it renders the expected columns 1`] = `
         truncate={true}
         value="apache"
       />
-    </EventsTdContent>
-  </EventsTd>
-  <EventsTd
+    </styled.div>
+  </styled.div>
+  <styled.div
     key="source.ip"
     style={
       Object {
@@ -115,7 +115,7 @@ exports[`Columns it renders the expected columns 1`] = `
       }
     }
   >
-    <EventsTdContent
+    <styled.div
       data-test-subj="cell-container"
     >
       <FormattedFieldValue
@@ -128,9 +128,9 @@ exports[`Columns it renders the expected columns 1`] = `
         truncate={true}
         value="192.168.0.1"
       />
-    </EventsTdContent>
-  </EventsTd>
-  <EventsTd
+    </styled.div>
+  </styled.div>
+  <styled.div
     key="destination.ip"
     style={
       Object {
@@ -138,7 +138,7 @@ exports[`Columns it renders the expected columns 1`] = `
       }
     }
   >
-    <EventsTdContent
+    <styled.div
       data-test-subj="cell-container"
     >
       <FormattedFieldValue
@@ -151,9 +151,9 @@ exports[`Columns it renders the expected columns 1`] = `
         truncate={true}
         value="192.168.0.3"
       />
-    </EventsTdContent>
-  </EventsTd>
-  <EventsTd
+    </styled.div>
+  </styled.div>
+  <styled.div
     key="user.name"
     style={
       Object {
@@ -161,7 +161,7 @@ exports[`Columns it renders the expected columns 1`] = `
       }
     }
   >
-    <EventsTdContent
+    <styled.div
       data-test-subj="cell-container"
     >
       <FormattedFieldValue
@@ -174,7 +174,7 @@ exports[`Columns it renders the expected columns 1`] = `
         truncate={true}
         value="john.dee"
       />
-    </EventsTdContent>
-  </EventsTd>
-</EventsTdGroupData>
+    </styled.div>
+  </styled.div>
+</styled.div>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
index f0f41fc1f674fd..b6fdc1b2973aaf 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
@@ -27,7 +27,7 @@ export const TimelineBodyGlobalStyle = createGlobalStyle`
   }
 `;
 
-export const TimelineBody = styled.div.attrs(({ className }) => ({
+export const TimelineBody = styled.div.attrs(({ className = '' }) => ({
   className: `siemTimeline__body ${className}`,
 }))<{ bodyHeight: number }>`
   height: ${({ bodyHeight }) => `${bodyHeight}px`};
@@ -56,15 +56,14 @@ TimelineBody.displayName = 'TimelineBody';
  * EVENTS TABLE
  */
 
-export const EventsTable = styled.div.attrs(({ className }) => ({
+export const EventsTable = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable ${className}`,
   role: 'table',
 }))``;
-EventsTable.displayName = 'EventsTable';
 
 /* EVENTS HEAD */
 
-export const EventsThead = styled.div.attrs(({ className }) => ({
+export const EventsThead = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__thead ${className}`,
   role: 'rowgroup',
 }))`
@@ -75,7 +74,6 @@ export const EventsThead = styled.div.attrs(({ className }) => ({
   top: 0;
   z-index: ${({ theme }) => theme.eui.euiZLevel1};
 `;
-EventsThead.displayName = 'EventsThead';
 
 export const EventsTrHeader = styled.div.attrs(({ className }) => ({
   className: `siemEventsTable__trHeader ${className}`,
@@ -83,9 +81,8 @@ export const EventsTrHeader = styled.div.attrs(({ className }) => ({
 }))`
   display: flex;
 `;
-EventsTrHeader.displayName = 'EventsTrHeader';
 
-export const EventsThGroupActions = styled.div.attrs(({ className }) => ({
+export const EventsThGroupActions = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__thGroupActions ${className}`,
 }))<{ actionsColumnWidth: number; justifyContent: string }>`
   display: flex;
@@ -93,24 +90,27 @@ export const EventsThGroupActions = styled.div.attrs(({ className }) => ({
   justify-content: ${({ justifyContent }) => justifyContent};
   min-width: 0;
 `;
-EventsThGroupActions.displayName = 'EventsThGroupActions';
 
-export const EventsThGroupData = styled.div.attrs(({ className }) => ({
+export const EventsThGroupData = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__thGroupData ${className}`,
-}))`
+}))<{ isDragging?: boolean }>`
   display: flex;
+
+  > div:hover .siemEventsHeading__handle {
+    display: ${({ isDragging }) => (isDragging ? 'none' : 'block')};
+    opacity: 1;
+    visibility: visible;
+  }
 `;
-EventsThGroupData.displayName = 'EventsThGroupData';
 
-export const EventsTh = styled.div.attrs(({ className }) => ({
+export const EventsTh = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__th ${className}`,
   role: 'columnheader',
-}))<{ isDragging?: boolean; position?: string }>`
+}))`
   align-items: center;
   display: flex;
   flex-shrink: 0;
   min-width: 0;
-  position: ${({ position }) => position};
 
   .siemEventsTable__thGroupActions &:first-child:last-child {
     flex: 1;
@@ -121,10 +121,18 @@ export const EventsTh = styled.div.attrs(({ className }) => ({
     cursor: move; /* Fallback for IE11 */
     cursor: grab;
   }
+
+  > div:focus {
+    outline: 0; /* disable focus on Resizable element */
+  }
+
+  /* don't display Draggable placeholder */
+  [data-rbd-placeholder-context-id] {
+    display: none !important;
+  }
 `;
-EventsTh.displayName = 'EventsTh';
 
-export const EventsThContent = styled.div.attrs(({ className }) => ({
+export const EventsThContent = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__thContent ${className}`,
 }))<{ textAlign?: string }>`
   font-size: ${({ theme }) => theme.eui.euiFontSizeXS};
@@ -135,19 +143,17 @@ export const EventsThContent = styled.div.attrs(({ className }) => ({
   text-align: ${({ textAlign }) => textAlign};
   width: 100%; /* Using width: 100% instead of flex: 1 and max-width: 100% for IE11 */
 `;
-EventsThContent.displayName = 'EventsThContent';
 
 /* EVENTS BODY */
 
-export const EventsTbody = styled.div.attrs(({ className }) => ({
+export const EventsTbody = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__tbody ${className}`,
   role: 'rowgroup',
 }))`
   overflow-x: hidden;
 `;
-EventsTbody.displayName = 'EventsTbody';
 
-export const EventsTrGroup = styled.div.attrs(({ className }) => ({
+export const EventsTrGroup = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__trGroup ${className}`,
 }))<{ className?: string }>`
   border-bottom: ${({ theme }) => theme.eui.euiBorderWidthThin} solid
@@ -157,17 +163,15 @@ export const EventsTrGroup = styled.div.attrs(({ className }) => ({
     background-color: ${({ theme }) => theme.eui.euiTableHoverColor};
   }
 `;
-EventsTrGroup.displayName = 'EventsTrGroup';
 
-export const EventsTrData = styled.div.attrs(({ className }) => ({
+export const EventsTrData = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__trData ${className}`,
   role: 'row',
 }))`
   display: flex;
 `;
-EventsTrData.displayName = 'EventsTrData';
 
-export const EventsTrSupplement = styled.div.attrs(({ className }) => ({
+export const EventsTrSupplement = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__trSupplement ${className}`,
 }))<{ className: string }>`
   font-size: ${({ theme }) => theme.eui.euiFontSizeXS};
@@ -175,9 +179,8 @@ export const EventsTrSupplement = styled.div.attrs(({ className }) => ({
   padding: 0 ${({ theme }) => theme.eui.paddingSizes.xs} 0
     ${({ theme }) => theme.eui.paddingSizes.xl};
 `;
-EventsTrSupplement.displayName = 'EventsTrSupplement';
 
-export const EventsTdGroupActions = styled.div.attrs(({ className }) => ({
+export const EventsTdGroupActions = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__tdGroupActions ${className}`,
 }))<{ actionsColumnWidth: number }>`
   display: flex;
@@ -185,16 +188,14 @@ export const EventsTdGroupActions = styled.div.attrs(({ className }) => ({
   flex: 0 0 ${({ actionsColumnWidth }) => `${actionsColumnWidth}px`};
   min-width: 0;
 `;
-EventsTdGroupActions.displayName = 'EventsTdGroupActions';
 
-export const EventsTdGroupData = styled.div.attrs(({ className }) => ({
+export const EventsTdGroupData = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__tdGroupData ${className}`,
 }))`
   display: flex;
 `;
-EventsTdGroupData.displayName = 'EventsTdGroupData';
 
-export const EventsTd = styled.div.attrs(({ className }) => ({
+export const EventsTd = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsTable__td ${className}`,
   role: 'cell',
 }))`
@@ -207,7 +208,6 @@ export const EventsTd = styled.div.attrs(({ className }) => ({
     flex: 1;
   }
 `;
-EventsTd.displayName = 'EventsTd';
 
 export const EventsTdContent = styled.div.attrs(({ className }) => ({
   className: `siemEventsTable__tdContent ${className}`,
@@ -219,13 +219,12 @@ export const EventsTdContent = styled.div.attrs(({ className }) => ({
   text-align: ${({ textAlign }) => textAlign};
   width: 100%; /* Using width: 100% instead of flex: 1 and max-width: 100% for IE11 */
 `;
-EventsTdContent.displayName = 'EventsTdContent';
 
 /**
  * EVENTS HEADING
  */
 
-export const EventsHeading = styled.div.attrs(({ className }) => ({
+export const EventsHeading = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsHeading ${className}`,
 }))<{ isLoading: boolean }>`
   align-items: center;
@@ -235,9 +234,8 @@ export const EventsHeading = styled.div.attrs(({ className }) => ({
     cursor: ${({ isLoading }) => (isLoading ? 'wait' : 'grab')};
   }
 `;
-EventsHeading.displayName = 'EventsHeading';
 
-export const EventsHeadingTitleButton = styled.button.attrs(({ className }) => ({
+export const EventsHeadingTitleButton = styled.button.attrs(({ className = '' }) => ({
   className: `siemEventsHeading__title siemEventsHeading__title--aggregatable ${className}`,
   type: 'button',
 }))`
@@ -260,16 +258,14 @@ export const EventsHeadingTitleButton = styled.button.attrs(({ className }) => (
     margin-left: ${({ theme }) => theme.eui.euiSizeXS};
   }
 `;
-EventsHeadingTitleButton.displayName = 'EventsHeadingTitleButton';
 
 export const EventsHeadingTitleSpan = styled.span.attrs(({ className }) => ({
   className: `siemEventsHeading__title siemEventsHeading__title--notAggregatable ${className}`,
 }))`
   min-width: 0;
 `;
-EventsHeadingTitleSpan.displayName = 'EventsHeadingTitleSpan';
 
-export const EventsHeadingExtra = styled.div.attrs(({ className }) => ({
+export const EventsHeadingExtra = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsHeading__extra ${className}`,
 }))`
   margin-left: auto;
@@ -285,9 +281,8 @@ export const EventsHeadingExtra = styled.div.attrs(({ className }) => ({
     }
   }
 `;
-EventsHeadingExtra.displayName = 'EventsHeadingExtra';
 
-export const EventsHeadingHandle = styled.div.attrs(({ className }) => ({
+export const EventsHeadingHandle = styled.div.attrs(({ className = '' }) => ({
   className: `siemEventsHeading__handle ${className}`,
 }))`
   background-color: ${({ theme }) => theme.eui.euiBorderColor};
@@ -297,17 +292,11 @@ export const EventsHeadingHandle = styled.div.attrs(({ className }) => ({
   visibility: hidden;
   width: ${({ theme }) => theme.eui.euiBorderWidthThick};
 
-  .siemEventsTable__thead:hover & {
-    opacity: 1;
-    visibility: visible;
-  }
-
   &:hover {
     background-color: ${({ theme }) => theme.eui.euiColorPrimary};
     cursor: col-resize;
   }
 `;
-EventsHeadingHandle.displayName = 'EventsHeadingHandle';
 
 /**
  * EVENTS LOADING
diff --git a/x-pack/package.json b/x-pack/package.json
index d513e4ed349654..ffa593f5728ee3 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -321,6 +321,7 @@
     "request": "^2.88.0",
     "reselect": "3.0.1",
     "resize-observer-polyfill": "^1.5.0",
+    "re-resizable": "^6.1.1",
     "rison-node": "0.3.1",
     "rxjs": "^6.5.3",
     "semver": "5.7.0",
diff --git a/yarn.lock b/yarn.lock
index 9631ca271295ef..96ec5213badcb2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4003,10 +4003,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-beautiful-dnd@^11.0.3":
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-11.0.3.tgz#51d9f37942dd18cc4aa10da98a5c883664e7ee46"
-  integrity sha512-7ZbT/7mNJu+uRrUGdTQ1hAINtqg909L4NHrXyspV42fvVgBgda6ysiBzoDUMENmQ/RlRJdpyrcp8Dtd/77bp9Q==
+"@types/react-beautiful-dnd@^11.0.4":
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-11.0.4.tgz#25cdf16864df8fd1d82f9416c8c0fd957e793024"
+  integrity sha512-a1Nvt1AcSEA962OuXrk1gu5bJQhzu0B3qFNO999/0nmF+oAD7HIAY0DwraS3L3XM1cVuRO1+PtpTkD4CfRK2QA==
   dependencies:
     "@types/react" "*"
 
@@ -12374,6 +12374,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-memoize@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.1.tgz#c3519241e80552ce395e1a32dcdde8d1fd680f5d"
+  integrity sha512-xdmw296PCL01tMOXx9mdJSmWY29jQgxyuZdq0rEHMu+Tpe1eOEtCycoG6chzlcrWsNgpZP7oL8RiQr7+G6Bl6g==
+
 fast-safe-stringify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2"
@@ -22957,6 +22962,13 @@ re-reselect@^3.4.0:
   resolved "https://registry.yarnpkg.com/re-reselect/-/re-reselect-3.4.0.tgz#0f2303f3c84394f57f0cd31fea08a1ca4840a7cd"
   integrity sha512-JsecfN+JlckncVXTWFWjn0Vk6uInl8GSf4eEd9tTk5qXHlgqkPdILpnYpgZcISXNYAzvfvsCZviaDk8AxyS5sg==
 
+re-resizable@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.1.1.tgz#7ff7cfe92c0b9d8b0bceaa578aadaeeff8931eaf"
+  integrity sha512-ngzX5xbXi9LlIghJUYZaBDkJUIMLYqO3tQ2cJZoNprCRGhfHnbyufKm51MZRIOBlLigLzPPFKBxQE8ZLezKGfA==
+  dependencies:
+    fast-memoize "^2.5.1"
+
 react-ace@^5.5.0:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-5.10.0.tgz#e328b37ac52759f700be5afdb86ada2f5ec84c5e"

From 1ffd30eb859a679fa15ade5cad07258ce1523bb3 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Wed, 8 Jan 2020 08:08:51 -0800
Subject: [PATCH 54/96] [DOCS][Spaces] Adds example of of using default route
 setting (#54201)

* Added defaultRoute examples

Added `Examples: /app/monitoring, /app/ml, /app/kibana#/dashboards`

* [DOCS] Adds default route example to Spaces docs

Co-authored-by: ErnestoBezanilla <ErnestoBezanilla@users.noreply.github.com>
---
 .../images/spaces-configure-landing-page.png  | Bin 0 -> 78322 bytes
 docs/spaces/index.asciidoc                    |  65 ++++++++++--------
 2 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 docs/spaces/images/spaces-configure-landing-page.png

diff --git a/docs/spaces/images/spaces-configure-landing-page.png b/docs/spaces/images/spaces-configure-landing-page.png
new file mode 100644
index 0000000000000000000000000000000000000000..15006594b6d7bcb6c217273c0be6fd7850019dc5
GIT binary patch
literal 78322
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

literal 0
HcmV?d00001

diff --git a/docs/spaces/index.asciidoc b/docs/spaces/index.asciidoc
index 69655aac521e7a..fb5ef670692dc8 100644
--- a/docs/spaces/index.asciidoc
+++ b/docs/spaces/index.asciidoc
@@ -2,13 +2,13 @@
 [[xpack-spaces]]
 == Spaces
 
-Spaces enable you to organize your dashboards and other saved 
-objects into meaningful categories. Once inside a space, you see only 
-the dashboards and saved objects that belong to that space. 
+Spaces enable you to organize your dashboards and other saved
+objects into meaningful categories. Once inside a space, you see only
+the dashboards and saved objects that belong to that space.
 
-{kib} creates a default space for you. 
-After you create your own 
-spaces, you're asked to choose a space when you log in to Kibana. You can change your 
+{kib} creates a default space for you.
+After you create your own
+spaces, you're asked to choose a space when you log in to Kibana. You can change your
 current space at any time by using the menu in the upper left.
 
 [role="screenshot"]
@@ -29,24 +29,24 @@ Kibana supports spaces in several ways.  You can:
 [[spaces-managing]]
 === View, create, and delete spaces
 
-Go to **Management > Spaces** for an overview of your spaces.  This view provides actions 
+Go to **Management > Spaces** for an overview of your spaces.  This view provides actions
 for you to create, edit, and delete spaces.
 
 [role="screenshot"]
 image::spaces/images/space-management.png["Space management"]
 
 [float]
-==== Create or edit a space 
+==== Create or edit a space
 
-You can create as many spaces as you like. Click *Create a space* and provide a name, 
-URL identifier, optional description. 
+You can create as many spaces as you like. Click *Create a space* and provide a name,
+URL identifier, optional description.
 
-The URL identifier is a short text string that becomes part of the 
-{kib} URL when you are inside that space. {kib} suggests a URL identifier based 
+The URL identifier is a short text string that becomes part of the
+{kib} URL when you are inside that space. {kib} suggests a URL identifier based
 on the name of your space, but you can customize the identifier to your liking.
 You cannot change the space identifier once you create the space.
 
-{kib} also has an <<spaces-api, API>> 
+{kib} also has an <<spaces-api, API>>
 if you prefer to create spaces programatically.
 
 [role="screenshot"]
@@ -55,7 +55,7 @@ image::spaces/images/edit-space.png["Space management"]
 [float]
 ==== Delete a space
 
-Deleting a space permanently removes the space and all of its contents. 
+Deleting a space permanently removes the space and all of its contents.
 Find the space on the *Spaces* overview page and click the trash icon in the Actions column.
 You can't delete the default space, but you can customize it to your liking.
 
@@ -63,14 +63,14 @@ You can't delete the default space, but you can customize it to your liking.
 [[spaces-control-feature-visibility]]
 === Control feature access based on user needs
 
-You have control over which features are visible in each space. 
-For example, you might hide Dev Tools 
+You have control over which features are visible in each space.
+For example, you might hide Dev Tools
 in your "Executive" space or show Stack Monitoring only in your "Admin" space.
 You can define which features to show or hide when you add or edit a space.
 
-Controlling feature 
-visibility is not a security feature. To secure access 
-to specific features on a per-user basis, you must configure 
+Controlling feature
+visibility is not a security feature. To secure access
+to specific features on a per-user basis, you must configure
 <<xpack-security-authorization, Kibana Security>>.
 
 [role="screenshot"]
@@ -80,10 +80,10 @@ image::spaces/images/edit-space-feature-visibility.png["Controlling features vis
 [[spaces-control-user-access]]
 === Control feature access based on user privileges
 
-When using Kibana with security, you can configure applications and features 
-based on your users’ privileges. This means different roles can have access 
-to different features in the same space. 
-Power users might have privileges to create and edit visualizations and dashboards, 
+When using Kibana with security, you can configure applications and features
+based on your users’ privileges. This means different roles can have access
+to different features in the same space.
+Power users might have privileges to create and edit visualizations and dashboards,
 while analysts or executives might have Dashboard and Canvas with read-only privileges.
 See <<adding_kibana_privileges>> for details.
 
@@ -106,7 +106,7 @@ interface.
 . Import your saved objects.
 . (Optional) Delete objects in the export space that you no longer need.
 
-{kib} also has beta <<saved-objects-api-import, import>> and 
+{kib} also has beta <<saved-objects-api-import, import>> and
 <<saved-objects-api-export, export>> APIs if you want to automate this process.
 
 [float]
@@ -115,17 +115,22 @@ interface.
 
 You can create a custom experience for users by configuring the {kib} landing page on a per-space basis.
 The landing page can route users to a specific dashboard, application, or saved object as they enter each space.
-To configure the landing page, use the `defaultRoute` setting in <<kibana-general-settings, Management > Advanced settings>>.
+
+To configure the landing page, use the default route setting in <<kibana-general-settings, Management > Advanced settings>>.
+For example, you might set the default route to `/app/kibana#/dashboards`.
+
+[role="screenshot"]
+image::spaces/images/spaces-configure-landing-page.png["Configure space-level landing page"]
+
 
 [float]
 [[spaces-delete-started]]
 === Disable and version updates
 
-Spaces are automatically enabled in {kib}. If you don't want use this feature, 
+Spaces are automatically enabled in {kib}. If you don't want use this feature,
 you can disable it
-by setting `xpack.spaces.enabled` to `false` in your 
+by setting `xpack.spaces.enabled` to `false` in your
 `kibana.yml` configuration file.
 
-If you are upgrading your 
-version of {kib}, the default space will contain all of your existing saved objects. 
-
+If you are upgrading your
+version of {kib}, the default space will contain all of your existing saved objects.

From 513428af449188dda301110a4b962967466e23aa Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Wed, 8 Jan 2020 19:20:07 +0300
Subject: [PATCH 55/96] add `examples/` to no-restricted-path config (#54252)

---
 .eslintrc.js                          | 5 +++++
 examples/demo_search/server/plugin.ts | 2 +-
 src/plugins/data/server/index.ts      | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 8a9d4da6178e90..1b2459f196efd0 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -247,6 +247,7 @@ module.exports = {
                   '!x-pack/test/**/*',
                   '(src|x-pack)/plugins/**/(public|server)/**/*',
                   'src/core/(public|server)/**/*',
+                  'examples/**/*',
                 ],
                 from: [
                   'src/core/public/**/*',
@@ -283,11 +284,15 @@ module.exports = {
                   'x-pack/legacy/plugins/**/*',
                   '!x-pack/legacy/plugins/*/server/**/*',
                   '!x-pack/legacy/plugins/*/index.{js,ts,tsx}',
+
+                  'examples/**/*',
+                  '!examples/**/server/**/*',
                 ],
                 from: [
                   'src/core/server',
                   'src/core/server/**/*',
                   '(src|x-pack)/plugins/*/server/**/*',
+                  'examples/**/server/**/*',
                 ],
                 errorMessage:
                   'Server modules cannot be imported into client modules or shared modules.',
diff --git a/examples/demo_search/server/plugin.ts b/examples/demo_search/server/plugin.ts
index 23c82225563c89..653aa217717fa2 100644
--- a/examples/demo_search/server/plugin.ts
+++ b/examples/demo_search/server/plugin.ts
@@ -18,7 +18,7 @@
  */
 
 import { Plugin, CoreSetup, PluginInitializerContext } from 'kibana/server';
-import { DataPluginSetup } from 'src/plugins/data/server/plugin';
+import { PluginSetup as DataPluginSetup } from 'src/plugins/data/server';
 import { demoSearchStrategyProvider } from './demo_search_strategy';
 import { DEMO_SEARCH_STRATEGY, IDemoRequest, IDemoResponse } from '../common';
 
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 8194e9a6c847e4..3cd088744a4391 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -18,7 +18,7 @@
  */
 
 import { PluginInitializerContext } from '../../../core/server';
-import { DataServerPlugin } from './plugin';
+import { DataServerPlugin, DataPluginSetup } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new DataServerPlugin(initializerContext);
@@ -93,4 +93,4 @@ export {
   getKbnTypeNames,
 } from '../common';
 
-export { DataServerPlugin as Plugin };
+export { DataServerPlugin as Plugin, DataPluginSetup as PluginSetup };

From bc640bdcbaf1e1b5bb6a01d8495d545a1a67b4de Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Wed, 8 Jan 2020 16:26:56 +0000
Subject: [PATCH 56/96] [Dashboard] Removing 100% as dshDashboardViewport
 height (#54263)

---
 .../public/embeddable/viewport/_dashboard_viewport.scss         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss
index b446f1e57a895d..bb958406769698 100644
--- a/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss
@@ -1,9 +1,7 @@
 .dshDashboardViewport {
-  height: 100%;
   width: 100%;
 }
 
 .dshDashboardViewport-withMargins {
   width: 100%;
-  height: 100%;
 }

From 26a4ec4117426ea8dc54193c58cf70c707ab3e03 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 8 Jan 2020 19:46:10 +0300
Subject: [PATCH 57/96] use correct type (#54244)

---
 src/legacy/server/kbn_server.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
index 0af6dacee59c81..8da1b3b05fa764 100644
--- a/src/legacy/server/kbn_server.d.ts
+++ b/src/legacy/server/kbn_server.d.ts
@@ -129,7 +129,7 @@ export interface KibanaCore {
     plugins: PluginsSetup;
   };
   startDeps: {
-    core: CoreSetup;
+    core: CoreStart;
     plugins: Record<string, object>;
   };
   logger: LoggerFactory;

From 53d1c96a4a015c7a55f18bb32d50884f492d8ad3 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Wed, 8 Jan 2020 18:10:26 +0100
Subject: [PATCH 58/96] Remove non existing codeowners (#54274)

* Remove non existing codeowners

* Add TSVB to Kibana App codeowners
---
 .github/CODEOWNERS | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 18d60bce4b95e7..a0a22446ba31d1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,6 +14,7 @@
 /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/home/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
+/src/legacy/core_plugins/metrics/ @elastic/kibana-app
 /src/plugins/home/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
 /src/plugins/timelion/ @elastic/kibana-app
@@ -147,6 +148,3 @@
 /x-pack/legacy/plugins/searchprofiler/  @elastic/es-ui
 /x-pack/legacy/plugins/snapshot_restore/  @elastic/es-ui
 /x-pack/legacy/plugins/watcher/  @elastic/es-ui
-
-# Kibana TSVB external contractors
-/src/legacy/core_plugins/metrics/  @elastic/kibana-tsvb-external

From 7ffe38569e48cbebfeb00bd084799d8aa48f38f2 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Wed, 8 Jan 2020 18:19:20 +0100
Subject: [PATCH 59/96] Fix Vega react eslint errors (#54259)

---
 .eslintrc.js                                                | 6 ------
 .../vis_type_vega/public/components/vega_actions_menu.tsx   | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1b2459f196efd0..c43366abf0c3d8 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -113,12 +113,6 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['src/legacy/core_plugins/vis_type_vega/**/*.{js,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: ['src/legacy/ui/public/vis/**/*.{js,ts,tsx}'],
       rules: {
diff --git a/src/legacy/core_plugins/vis_type_vega/public/components/vega_actions_menu.tsx b/src/legacy/core_plugins/vis_type_vega/public/components/vega_actions_menu.tsx
index 71a88b47a8be3e..3d7fda990b2ae8 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/components/vega_actions_menu.tsx
+++ b/src/legacy/core_plugins/vis_type_vega/public/components/vega_actions_menu.tsx
@@ -34,12 +34,12 @@ function VegaActionsMenu({ formatHJson, formatJson }: VegaActionsMenuProps) {
   const onHJsonCLick = useCallback(() => {
     formatHJson();
     setIsPopoverOpen(false);
-  }, [isPopoverOpen, formatHJson]);
+  }, [formatHJson]);
 
   const onJsonCLick = useCallback(() => {
     formatJson();
     setIsPopoverOpen(false);
-  }, [isPopoverOpen, formatJson]);
+  }, [formatJson]);
 
   const closePopover = useCallback(() => setIsPopoverOpen(false), []);
 

From fc948a0c8e13c3bbeaefe95b12cf233e3ed8ec31 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Wed, 8 Jan 2020 13:38:34 -0500
Subject: [PATCH 60/96] [ML] DF Analytics Classification: ensure confusion
 matrix can be fetched (#53629)

* check depVar field type before adding keyword suffix for evaluate endpoint

* update indexPattern type and use FIELD types

* add keyword suffix if field type is keyword

* keyword suffix added if depVar is of type keyword AND text
---
 .../data_frame_analytics/common/analytics.ts  |  4 ++-
 .../evaluate_panel.tsx                        | 35 ++++++++++++++++++-
 .../services/new_job_capabilities_service.ts  |  3 +-
 3 files changed, 39 insertions(+), 3 deletions(-)

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 3dd98395ef701d..ce832513c4adc1 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
@@ -374,6 +374,7 @@ interface LoadEvalDataConfig {
   searchQuery?: ResultsSearchQuery;
   ignoreDefaultQuery?: boolean;
   jobType: ANALYSIS_CONFIG_TYPE;
+  requiresKeyword?: boolean;
 }
 
 export const loadEvalData = async ({
@@ -385,6 +386,7 @@ export const loadEvalData = async ({
   searchQuery,
   ignoreDefaultQuery,
   jobType,
+  requiresKeyword,
 }: LoadEvalDataConfig) => {
   const results: LoadEvaluateResult = { success: false, eval: null, error: null };
   const defaultPredictionField = `${dependentVariable}_prediction`;
@@ -392,7 +394,7 @@ export const loadEvalData = async ({
     predictionFieldName ? predictionFieldName : defaultPredictionField
   }`;
 
-  if (jobType === ANALYSIS_CONFIG_TYPE.CLASSIFICATION) {
+  if (jobType === ANALYSIS_CONFIG_TYPE.CLASSIFICATION && requiresKeyword === true) {
     predictedField = `${predictedField}.keyword`;
   }
 
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
index ddf52943c2feb2..7bb6949db1a99f 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
@@ -35,8 +35,13 @@ import {
   ResultsSearchQuery,
   ANALYSIS_CONFIG_TYPE,
 } from '../../../../common/analytics';
+import { IIndexPattern } from '../../../../../../../../../../../src/plugins/data/common/index_patterns';
+import { ES_FIELD_TYPES } from '../../../../../../../../../../../src/plugins/data/public';
 import { LoadingPanel } from '../loading_panel';
 import { getColumnData } from './column_data';
+import { useKibanaContext } from '../../../../../contexts/kibana';
+import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
+import { getIndexPatternIdFromName } from '../../../../../util/index_utils';
 
 const defaultPanelWidth = 500;
 
@@ -55,17 +60,19 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
   const [docsCount, setDocsCount] = useState<null | number>(null);
   const [error, setError] = useState<null | string>(null);
   const [panelWidth, setPanelWidth] = useState<number>(defaultPanelWidth);
-
   // Column visibility
   const [visibleColumns, setVisibleColumns] = useState(() =>
     columns.map(({ id }: { id: string }) => id)
   );
+  const kibanaContext = useKibanaContext();
 
   const index = jobConfig.dest.index;
+  const sourceIndex = jobConfig.source.index[0];
   const dependentVariable = getDependentVar(jobConfig.analysis);
   const predictionFieldName = getPredictionFieldName(jobConfig.analysis);
   // default is 'ml'
   const resultsField = jobConfig.dest.results_field;
+  let requiresKeyword = false;
 
   const loadData = async ({
     isTrainingClause,
@@ -76,6 +83,31 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
   }) => {
     setIsLoading(true);
 
+    try {
+      const indexPatternId = getIndexPatternIdFromName(sourceIndex) || sourceIndex;
+      const indexPattern: IIndexPattern = await kibanaContext.indexPatterns.get(indexPatternId);
+
+      if (indexPattern !== undefined) {
+        await newJobCapsService.initializeFromIndexPattern(indexPattern, false, false);
+        // If dependent_variable is of type keyword and text .keyword suffix is required for evaluate endpoint
+        const { fields } = newJobCapsService;
+        const depVarFieldType = fields.find(field => field.name === dependentVariable)?.type;
+
+        // If it's a keyword type - check if it has a corresponding text type
+        if (depVarFieldType !== undefined && depVarFieldType === ES_FIELD_TYPES.KEYWORD) {
+          const field = newJobCapsService.getFieldById(dependentVariable.replace(/\.keyword$/, ''));
+          requiresKeyword = field !== null && field.type === ES_FIELD_TYPES.TEXT;
+        } else if (depVarFieldType !== undefined && depVarFieldType === ES_FIELD_TYPES.TEXT) {
+          // If text, check if has corresponding keyword type
+          const field = newJobCapsService.getFieldById(`${dependentVariable}.keyword`);
+          requiresKeyword = field !== null && field.type === ES_FIELD_TYPES.KEYWORD;
+        }
+      }
+    } catch (e) {
+      // Additional error handling due to missing field type is handled by loadEvalData
+      console.error('Unable to load new field types', error); // eslint-disable-line no-console
+    }
+
     const evalData = await loadEvalData({
       isTraining: false,
       index,
@@ -85,6 +117,7 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
       searchQuery,
       ignoreDefaultQuery,
       jobType: ANALYSIS_CONFIG_TYPE.CLASSIFICATION,
+      requiresKeyword,
     });
 
     const docsCountResp = await loadDocsCount({
diff --git a/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts b/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts
index 9d5c33d6cfc5c0..d78c9298c60736 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts
@@ -14,6 +14,7 @@ import {
 } from '../../../common/types/fields';
 import {
   ES_FIELD_TYPES,
+  IIndexPattern,
   IndexPattern,
   IndexPatternsContract,
 } from '../../../../../../../src/plugins/data/public';
@@ -89,7 +90,7 @@ class NewJobCapsService {
   }
 
   public async initializeFromIndexPattern(
-    indexPattern: IndexPattern,
+    indexPattern: IIndexPattern,
     includeEventRateField = true,
     removeTextFields = true
   ) {

From 89e4daf5bd0d81b26caf3c1a87edad013ada639e Mon Sep 17 00:00:00 2001
From: Corey Robertson <corey.robertson@elastic.co>
Date: Wed, 8 Jan 2020 14:16:31 -0500
Subject: [PATCH 61/96] [Canvas] Fixes bugs with autoplay and refresh (#53149)

* Fixes bugs with autoplay and refresh

* Fix typecheck

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../plugins/canvas/public/lib/app_state.ts    |   2 +-
 .../__tests__/workpad_autoplay.test.ts        | 145 ++++++++++++++++
 .../__tests__/workpad_refresh.test.ts         | 161 ++++++++++++++++++
 ...orkpad_autoplay.js => workpad_autoplay.ts} |  33 ++--
 ...{workpad_refresh.js => workpad_refresh.ts} |  36 +++-
 5 files changed, 351 insertions(+), 26 deletions(-)
 create mode 100644 x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts
 create mode 100644 x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts
 rename x-pack/legacy/plugins/canvas/public/state/middleware/{workpad_autoplay.js => workpad_autoplay.ts} (77%)
 rename x-pack/legacy/plugins/canvas/public/state/middleware/{workpad_refresh.js => workpad_refresh.ts} (65%)

diff --git a/x-pack/legacy/plugins/canvas/public/lib/app_state.ts b/x-pack/legacy/plugins/canvas/public/lib/app_state.ts
index be0f76b170c70a..955125b7131400 100644
--- a/x-pack/legacy/plugins/canvas/public/lib/app_state.ts
+++ b/x-pack/legacy/plugins/canvas/public/lib/app_state.ts
@@ -92,7 +92,7 @@ export function setFullscreen(payload: boolean) {
   }
 }
 
-export function setAutoplayInterval(payload: string) {
+export function setAutoplayInterval(payload: string | null) {
   const appState = getAppState();
   const appValue = appState[AppStateKeys.AUTOPLAY_INTERVAL];
 
diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts b/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts
new file mode 100644
index 00000000000000..11ebdcdc51d4d9
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+jest.mock('../../../lib/app_state');
+jest.mock('../../../lib/router_provider');
+
+import { workpadAutoplay } from '../workpad_autoplay';
+import { setAutoplayInterval } from '../../../lib/app_state';
+import { createTimeInterval } from '../../../lib/time_interval';
+// @ts-ignore Untyped local
+import { routerProvider } from '../../../lib/router_provider';
+
+const next = jest.fn();
+const dispatch = jest.fn();
+const getState = jest.fn();
+const routerMock = { navigateTo: jest.fn() };
+routerProvider.mockReturnValue(routerMock);
+
+const middleware = workpadAutoplay({ dispatch, getState })(next);
+
+const workpadState = {
+  persistent: {
+    workpad: {
+      id: 'workpad-id',
+      pages: ['page1', 'page2', 'page3'],
+      page: 0,
+    },
+  },
+};
+
+const autoplayState = {
+  ...workpadState,
+  transient: {
+    autoplay: {
+      inFlight: false,
+      enabled: true,
+      interval: 5000,
+    },
+    fullscreen: true,
+  },
+};
+
+const autoplayDisabledState = {
+  ...workpadState,
+  transient: {
+    autoplay: {
+      inFlight: false,
+      enabled: false,
+      interval: 5000,
+    },
+  },
+};
+
+const action = {};
+
+describe('workpad autoplay middleware', () => {
+  beforeEach(() => {
+    dispatch.mockClear();
+    jest.resetAllMocks();
+  });
+
+  describe('app state', () => {
+    it('sets the app state to the interval from state when enabled', () => {
+      getState.mockReturnValue(autoplayState);
+      middleware(action);
+
+      expect(setAutoplayInterval).toBeCalledWith(
+        createTimeInterval(autoplayState.transient.autoplay.interval)
+      );
+    });
+
+    it('sets the app state to null when not enabled', () => {
+      getState.mockReturnValue(autoplayDisabledState);
+      middleware(action);
+
+      expect(setAutoplayInterval).toBeCalledWith(null);
+    });
+  });
+
+  describe('autoplay navigation', () => {
+    it('navigates forward after interval', () => {
+      jest.useFakeTimers();
+      getState.mockReturnValue(autoplayState);
+      middleware(action);
+
+      jest.advanceTimersByTime(autoplayState.transient.autoplay.interval + 1);
+
+      expect(routerMock.navigateTo).toBeCalledWith('loadWorkpad', {
+        id: workpadState.persistent.workpad.id,
+        page: workpadState.persistent.workpad.page + 2, // (index + 1) + 1 more for 1 indexed page number
+      });
+
+      jest.useRealTimers();
+    });
+
+    it('navigates from last page back to front', () => {
+      jest.useFakeTimers();
+      const onLastPageState = { ...autoplayState };
+      onLastPageState.persistent.workpad.page = onLastPageState.persistent.workpad.pages.length - 1;
+
+      getState.mockReturnValue(autoplayState);
+      middleware(action);
+
+      jest.advanceTimersByTime(autoplayState.transient.autoplay.interval + 1);
+
+      expect(routerMock.navigateTo).toBeCalledWith('loadWorkpad', {
+        id: workpadState.persistent.workpad.id,
+        page: 1,
+      });
+
+      jest.useRealTimers();
+    });
+
+    it('continues autoplaying', () => {
+      jest.useFakeTimers();
+      getState.mockReturnValue(autoplayState);
+      middleware(action);
+
+      jest.advanceTimersByTime(autoplayState.transient.autoplay.interval * 2 + 1);
+      expect(routerMock.navigateTo).toBeCalledTimes(2);
+      jest.useRealTimers();
+    });
+
+    it('does not reset timer between middleware calls', () => {
+      jest.useFakeTimers();
+
+      getState.mockReturnValue(autoplayState);
+      middleware(action);
+
+      // Advance until right before timeout
+      jest.advanceTimersByTime(autoplayState.transient.autoplay.interval - 1);
+
+      // Run middleware again
+      middleware(action);
+
+      // Advance timer
+      jest.advanceTimersByTime(1);
+
+      expect(routerMock.navigateTo).toBeCalled();
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts b/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts
new file mode 100644
index 00000000000000..2123c9606f1f0e
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.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.
+ */
+
+jest.mock('../../../legacy');
+jest.mock('ui/new_platform'); // actions/elements has some dependencies on ui/new_platform.
+jest.mock('../../../lib/app_state');
+
+import { workpadRefresh } from '../workpad_refresh';
+import { inFlightComplete } from '../../actions/resolved_args';
+// @ts-ignore untyped local
+import { setRefreshInterval } from '../../actions/workpad';
+import { setRefreshInterval as setAppStateRefreshInterval } from '../../../lib/app_state';
+
+import { createTimeInterval } from '../../../lib/time_interval';
+
+const next = jest.fn();
+const dispatch = jest.fn();
+const getState = jest.fn();
+
+const middleware = workpadRefresh({ dispatch, getState })(next);
+
+const refreshState = {
+  transient: {
+    refresh: {
+      interval: 5000,
+    },
+  },
+};
+
+const noRefreshState = {
+  transient: {
+    refresh: {
+      interval: 0,
+    },
+  },
+};
+
+const inFlightState = {
+  transient: {
+    refresh: {
+      interval: 5000,
+    },
+    inFlight: true,
+  },
+};
+
+describe('workpad refresh middleware', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('onInflightComplete', () => {
+    it('refreshes if interval gt 0', () => {
+      jest.useFakeTimers();
+      getState.mockReturnValue(refreshState);
+
+      middleware(inFlightComplete());
+
+      jest.runAllTimers();
+
+      expect(dispatch).toHaveBeenCalled();
+    });
+
+    it('does not reset interval if another action occurs', () => {
+      jest.useFakeTimers();
+      getState.mockReturnValue(refreshState);
+
+      middleware(inFlightComplete());
+
+      jest.advanceTimersByTime(refreshState.transient.refresh.interval - 1);
+
+      expect(dispatch).not.toHaveBeenCalled();
+      middleware(inFlightComplete());
+
+      jest.advanceTimersByTime(1);
+
+      expect(dispatch).toHaveBeenCalled();
+    });
+
+    it('does not refresh if interval is 0', () => {
+      jest.useFakeTimers();
+      getState.mockReturnValue(noRefreshState);
+
+      middleware(inFlightComplete());
+
+      jest.runAllTimers();
+      expect(dispatch).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('setRefreshInterval', () => {
+    it('does nothing if refresh interval is unchanged', () => {
+      getState.mockReturnValue(refreshState);
+
+      jest.useFakeTimers();
+      const interval = 1;
+      middleware(setRefreshInterval(interval));
+      jest.runAllTimers();
+
+      expect(setAppStateRefreshInterval).not.toBeCalled();
+    });
+
+    it('sets the app refresh interval', () => {
+      getState.mockReturnValue(noRefreshState);
+      next.mockImplementation(() => {
+        getState.mockReturnValue(refreshState);
+      });
+
+      jest.useFakeTimers();
+      const interval = 1;
+      middleware(setRefreshInterval(interval));
+
+      expect(setAppStateRefreshInterval).toBeCalledWith(createTimeInterval(interval));
+      jest.runAllTimers();
+    });
+
+    it('starts a refresh for the new interval', () => {
+      getState.mockReturnValue(refreshState);
+      jest.useFakeTimers();
+
+      const interval = 1000;
+
+      middleware(inFlightComplete());
+
+      jest.runTimersToTime(refreshState.transient.refresh.interval - 1);
+      expect(dispatch).not.toBeCalled();
+
+      getState.mockReturnValue(noRefreshState);
+      next.mockImplementation(() => {
+        getState.mockReturnValue(refreshState);
+      });
+      middleware(setRefreshInterval(interval));
+      jest.runTimersToTime(1);
+
+      expect(dispatch).not.toBeCalled();
+
+      jest.runTimersToTime(interval);
+      expect(dispatch).toBeCalled();
+    });
+  });
+
+  describe('inFlight in progress', () => {
+    it('requeues the refresh when inflight is active', () => {
+      jest.useFakeTimers();
+      getState.mockReturnValue(inFlightState);
+
+      middleware(inFlightComplete());
+      jest.runTimersToTime(refreshState.transient.refresh.interval);
+
+      expect(dispatch).not.toBeCalled();
+
+      getState.mockReturnValue(refreshState);
+      jest.runAllTimers();
+
+      expect(dispatch).toBeCalled();
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_autoplay.js b/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_autoplay.ts
similarity index 77%
rename from x-pack/legacy/plugins/canvas/public/state/middleware/workpad_autoplay.js
rename to x-pack/legacy/plugins/canvas/public/state/middleware/workpad_autoplay.ts
index 886620c5404cd3..700905213f54cf 100644
--- a/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_autoplay.js
+++ b/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_autoplay.ts
@@ -4,16 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { inFlightComplete } from '../actions/resolved_args';
+import { Middleware } from 'redux';
+import { State } from '../../../types';
 import { getFullscreen } from '../selectors/app';
 import { getInFlight } from '../selectors/resolved_args';
 import { getWorkpad, getPages, getSelectedPageIndex, getAutoplay } from '../selectors/workpad';
+// @ts-ignore untyped local
 import { routerProvider } from '../../lib/router_provider';
 import { setAutoplayInterval } from '../../lib/app_state';
 import { createTimeInterval } from '../../lib/time_interval';
 
-export const workpadAutoplay = ({ getState }) => next => {
-  let playTimeout;
+export const workpadAutoplay: Middleware<{}, State> = ({ getState }) => next => {
+  let playTimeout: number | undefined;
   let displayInterval = 0;
 
   const router = routerProvider();
@@ -42,18 +44,22 @@ export const workpadAutoplay = ({ getState }) => next => {
       }
     }
 
+    stopAutoUpdate();
     startDelayedUpdate();
   }
 
   function stopAutoUpdate() {
     clearTimeout(playTimeout); // cancel any pending update requests
+    playTimeout = undefined;
   }
 
   function startDelayedUpdate() {
-    stopAutoUpdate();
-    playTimeout = setTimeout(() => {
-      updateWorkpad();
-    }, displayInterval);
+    if (!playTimeout) {
+      stopAutoUpdate();
+      playTimeout = window.setTimeout(() => {
+        updateWorkpad();
+      }, displayInterval);
+    }
   }
 
   return action => {
@@ -68,21 +74,14 @@ export const workpadAutoplay = ({ getState }) => next => {
     if (autoplay.enabled) {
       setAutoplayInterval(createTimeInterval(autoplay.interval));
     } else {
-      setAutoplayInterval(0);
+      setAutoplayInterval(null);
     }
 
-    // when in-flight requests are finished, update the workpad after a given delay
-    if (action.type === inFlightComplete.toString() && shouldPlay) {
-      startDelayedUpdate();
-    } // create new update request
-
-    // This middleware creates or destroys an interval that will cause workpad elements to update
-    // clear any pending timeout
-    stopAutoUpdate();
-
     // if interval is larger than 0, start the delayed update
     if (shouldPlay) {
       startDelayedUpdate();
+    } else {
+      stopAutoUpdate();
     }
   };
 };
diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_refresh.js b/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_refresh.ts
similarity index 65%
rename from x-pack/legacy/plugins/canvas/public/state/middleware/workpad_refresh.js
rename to x-pack/legacy/plugins/canvas/public/state/middleware/workpad_refresh.ts
index 32822529f320c9..f638c42ec2de08 100644
--- a/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_refresh.js
+++ b/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_refresh.ts
@@ -4,18 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Middleware } from 'redux';
+import { State } from '../../../types';
+// @ts-ignore Untyped Local
 import { fetchAllRenderables } from '../actions/elements';
+// @ts-ignore Untyped Local
 import { setRefreshInterval } from '../actions/workpad';
 import { inFlightComplete } from '../actions/resolved_args';
 import { getInFlight } from '../selectors/resolved_args';
+import { getRefreshInterval } from '../selectors/workpad';
 import { setRefreshInterval as setAppStateRefreshInterval } from '../../lib/app_state';
 import { createTimeInterval } from '../../lib/time_interval';
 
-export const workpadRefresh = ({ dispatch, getState }) => next => {
-  let refreshTimeout;
+export const workpadRefresh: Middleware<{}, State> = ({ dispatch, getState }) => next => {
+  let refreshTimeout: number | undefined;
   let refreshInterval = 0;
 
   function updateWorkpad() {
+    cancelDelayedUpdate();
+
     if (refreshInterval === 0) {
       return;
     }
@@ -31,30 +38,43 @@ export const workpadRefresh = ({ dispatch, getState }) => next => {
     }
   }
 
+  function cancelDelayedUpdate() {
+    clearTimeout(refreshTimeout);
+    refreshTimeout = undefined;
+  }
+
   function startDelayedUpdate() {
-    clearTimeout(refreshTimeout); // cancel any pending update requests
-    refreshTimeout = setTimeout(() => {
-      updateWorkpad();
-    }, refreshInterval);
+    if (!refreshTimeout) {
+      clearTimeout(refreshTimeout); // cancel any pending update requests
+      refreshTimeout = window.setTimeout(() => {
+        updateWorkpad();
+      }, refreshInterval);
+    }
   }
 
   return action => {
+    const previousRefreshInterval = getRefreshInterval(getState());
     next(action);
 
+    refreshInterval = getRefreshInterval(getState());
+
     // when in-flight requests are finished, update the workpad after a given delay
     if (action.type === inFlightComplete.toString() && refreshInterval > 0) {
       startDelayedUpdate();
     } // create new update request
 
     // This middleware creates or destroys an interval that will cause workpad elements to update
-    if (action.type === setRefreshInterval.toString()) {
+    if (
+      action.type === setRefreshInterval.toString() &&
+      previousRefreshInterval !== refreshInterval
+    ) {
       // update the refresh interval
       refreshInterval = action.payload;
 
       setAppStateRefreshInterval(createTimeInterval(refreshInterval));
 
       // clear any pending timeout
-      clearTimeout(refreshTimeout);
+      cancelDelayedUpdate();
 
       // if interval is larger than 0, start the delayed update
       if (refreshInterval > 0) {

From 8edb53ddbc8676c456520100edff782cc260ef86 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Wed, 8 Jan 2020 13:46:01 -0600
Subject: [PATCH 62/96] [Metrics UI] Pass relevant shouldAllowEdit capabilities
 into SettingsPage (#49781)

* [Metrics UI] Pass relevant shouldAllowEdit capabilities into SettingsPage

* Split settings pages in two; add loading screen to settings page

* Restore timestamp field to metrics screen

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../fields_configuration_panel.tsx            | 386 +++++++++---------
 .../indices_configuration_panel.tsx           | 172 ++++----
 .../source_configuration_settings.tsx         |  30 +-
 .../public/pages/infrastructure/index.tsx     |   4 +-
 .../public/pages/infrastructure/settings.tsx  |  19 +
 .../plugins/infra/public/pages/logs/index.tsx |   4 +-
 .../settings/index.tsx => logs/settings.tsx}  |   7 +-
 7 files changed, 334 insertions(+), 288 deletions(-)
 create mode 100644 x-pack/legacy/plugins/infra/public/pages/infrastructure/settings.tsx
 rename x-pack/legacy/plugins/infra/public/pages/{shared/settings/index.tsx => logs/settings.tsx} (64%)

diff --git a/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx b/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
index 5f3d1a63e72eb3..e65753ef24e9e3 100644
--- a/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
@@ -26,6 +26,7 @@ interface FieldsConfigurationPanelProps {
   podFieldProps: InputFieldProps;
   tiebreakerFieldProps: InputFieldProps;
   timestampFieldProps: InputFieldProps;
+  displaySettings: 'metrics' | 'logs';
 }
 
 export const FieldsConfigurationPanel = ({
@@ -36,6 +37,7 @@ export const FieldsConfigurationPanel = ({
   podFieldProps,
   tiebreakerFieldProps,
   timestampFieldProps,
+  displaySettings,
 }: FieldsConfigurationPanelProps) => (
   <EuiForm>
     <EuiTitle size="s">
@@ -94,193 +96,201 @@ export const FieldsConfigurationPanel = ({
         />
       </EuiFormRow>
     </EuiDescribedFormGroup>
-    <EuiDescribedFormGroup
-      idAria="tiebreakerField"
-      title={
-        <h4>
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
-            defaultMessage="Tiebreaker"
-          />
-        </h4>
-      }
-      description={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.tiebreakerFieldDescription"
-          defaultMessage="Field used to break ties between two entries with the same timestamp"
-        />
-      }
-    >
-      <EuiFormRow
-        describedByIds={['tiebreakerField']}
-        error={tiebreakerFieldProps.error}
-        fullWidth
-        helpText={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.tiebreakerFieldRecommendedValue"
-            defaultMessage="The recommended value is {defaultValue}"
-            values={{
-              defaultValue: <EuiCode>_doc</EuiCode>,
-            }}
-          />
-        }
-        isInvalid={tiebreakerFieldProps.isInvalid}
-        label={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
-            defaultMessage="Tiebreaker"
-          />
-        }
-      >
-        <EuiFieldText
-          fullWidth
-          disabled={isLoading}
-          readOnly={readOnly}
-          isLoading={isLoading}
-          {...tiebreakerFieldProps}
-        />
-      </EuiFormRow>
-    </EuiDescribedFormGroup>
-    <EuiDescribedFormGroup
-      idAria="containerField"
-      title={
-        <h4>
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.containerFieldLabel"
-            defaultMessage="Container ID"
-          />
-        </h4>
-      }
-      description={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.containerFieldDescription"
-          defaultMessage="Field used to identify Docker containers"
-        />
-      }
-    >
-      <EuiFormRow
-        describedByIds={['containerField']}
-        error={containerFieldProps.error}
-        fullWidth
-        helpText={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.containerFieldRecommendedValue"
-            defaultMessage="The recommended value is {defaultValue}"
-            values={{
-              defaultValue: <EuiCode>container.id</EuiCode>,
-            }}
-          />
-        }
-        isInvalid={containerFieldProps.isInvalid}
-        label={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.containerFieldLabel"
-            defaultMessage="Container ID"
-          />
-        }
-      >
-        <EuiFieldText
-          fullWidth
-          disabled={isLoading}
-          readOnly={readOnly}
-          isLoading={isLoading}
-          {...containerFieldProps}
-        />
-      </EuiFormRow>
-    </EuiDescribedFormGroup>
-    <EuiDescribedFormGroup
-      idAria="hostNameField"
-      title={
-        <h4>
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.hostNameFieldLabel"
-            defaultMessage="Host name"
-          />
-        </h4>
-      }
-      description={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.hostNameFieldDescription"
-          defaultMessage="Field used to identify hosts"
-        />
-      }
-    >
-      <EuiFormRow
-        describedByIds={['hostNameField']}
-        error={hostFieldProps.error}
-        fullWidth
-        helpText={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.hostFieldDescription"
-            defaultMessage="The recommended value is {defaultValue}"
-            values={{
-              defaultValue: <EuiCode>host.name</EuiCode>,
-            }}
-          />
-        }
-        isInvalid={hostFieldProps.isInvalid}
-        label={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.hostFieldLabel"
-            defaultMessage="Host name"
-          />
-        }
-      >
-        <EuiFieldText
-          fullWidth
-          disabled={isLoading}
-          readOnly={readOnly}
-          isLoading={isLoading}
-          {...hostFieldProps}
-        />
-      </EuiFormRow>
-    </EuiDescribedFormGroup>
-    <EuiDescribedFormGroup
-      idAria="podField"
-      title={
-        <h4>
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.podFieldLabel"
-            defaultMessage="Pod ID"
-          />
-        </h4>
-      }
-      description={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.podFieldDescription"
-          defaultMessage="Field used to identify Kubernetes pods"
-        />
-      }
-    >
-      <EuiFormRow
-        describedByIds={['podField']}
-        error={podFieldProps.error}
-        fullWidth
-        helpText={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.podFieldRecommendedValue"
-            defaultMessage="The recommended value is {defaultValue}"
-            values={{
-              defaultValue: <EuiCode>kubernetes.pod.uid</EuiCode>,
-            }}
-          />
-        }
-        isInvalid={podFieldProps.isInvalid}
-        label={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.podFieldLabel"
-            defaultMessage="Pod ID"
-          />
-        }
-      >
-        <EuiFieldText
-          fullWidth
-          disabled={isLoading}
-          readOnly={readOnly}
-          isLoading={isLoading}
-          {...podFieldProps}
-        />
-      </EuiFormRow>
-    </EuiDescribedFormGroup>
+    {displaySettings === 'logs' && (
+      <>
+        <EuiDescribedFormGroup
+          idAria="tiebreakerField"
+          title={
+            <h4>
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
+                defaultMessage="Tiebreaker"
+              />
+            </h4>
+          }
+          description={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.tiebreakerFieldDescription"
+              defaultMessage="Field used to break ties between two entries with the same timestamp"
+            />
+          }
+        >
+          <EuiFormRow
+            describedByIds={['tiebreakerField']}
+            error={tiebreakerFieldProps.error}
+            fullWidth
+            helpText={
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.tiebreakerFieldRecommendedValue"
+                defaultMessage="The recommended value is {defaultValue}"
+                values={{
+                  defaultValue: <EuiCode>_doc</EuiCode>,
+                }}
+              />
+            }
+            isInvalid={tiebreakerFieldProps.isInvalid}
+            label={
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
+                defaultMessage="Tiebreaker"
+              />
+            }
+          >
+            <EuiFieldText
+              fullWidth
+              disabled={isLoading}
+              readOnly={readOnly}
+              isLoading={isLoading}
+              {...tiebreakerFieldProps}
+            />
+          </EuiFormRow>
+        </EuiDescribedFormGroup>
+      </>
+    )}
+    {displaySettings === 'metrics' && (
+      <>
+        <EuiDescribedFormGroup
+          idAria="containerField"
+          title={
+            <h4>
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.containerFieldLabel"
+                defaultMessage="Container ID"
+              />
+            </h4>
+          }
+          description={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.containerFieldDescription"
+              defaultMessage="Field used to identify Docker containers"
+            />
+          }
+        >
+          <EuiFormRow
+            describedByIds={['containerField']}
+            error={containerFieldProps.error}
+            fullWidth
+            helpText={
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.containerFieldRecommendedValue"
+                defaultMessage="The recommended value is {defaultValue}"
+                values={{
+                  defaultValue: <EuiCode>container.id</EuiCode>,
+                }}
+              />
+            }
+            isInvalid={containerFieldProps.isInvalid}
+            label={
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.containerFieldLabel"
+                defaultMessage="Container ID"
+              />
+            }
+          >
+            <EuiFieldText
+              fullWidth
+              disabled={isLoading}
+              readOnly={readOnly}
+              isLoading={isLoading}
+              {...containerFieldProps}
+            />
+          </EuiFormRow>
+        </EuiDescribedFormGroup>
+        <EuiDescribedFormGroup
+          idAria="hostNameField"
+          title={
+            <h4>
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.hostNameFieldLabel"
+                defaultMessage="Host name"
+              />
+            </h4>
+          }
+          description={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.hostNameFieldDescription"
+              defaultMessage="Field used to identify hosts"
+            />
+          }
+        >
+          <EuiFormRow
+            describedByIds={['hostNameField']}
+            error={hostFieldProps.error}
+            fullWidth
+            helpText={
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.hostFieldDescription"
+                defaultMessage="The recommended value is {defaultValue}"
+                values={{
+                  defaultValue: <EuiCode>host.name</EuiCode>,
+                }}
+              />
+            }
+            isInvalid={hostFieldProps.isInvalid}
+            label={
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.hostFieldLabel"
+                defaultMessage="Host name"
+              />
+            }
+          >
+            <EuiFieldText
+              fullWidth
+              disabled={isLoading}
+              readOnly={readOnly}
+              isLoading={isLoading}
+              {...hostFieldProps}
+            />
+          </EuiFormRow>
+        </EuiDescribedFormGroup>
+        <EuiDescribedFormGroup
+          idAria="podField"
+          title={
+            <h4>
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.podFieldLabel"
+                defaultMessage="Pod ID"
+              />
+            </h4>
+          }
+          description={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.podFieldDescription"
+              defaultMessage="Field used to identify Kubernetes pods"
+            />
+          }
+        >
+          <EuiFormRow
+            describedByIds={['podField']}
+            error={podFieldProps.error}
+            fullWidth
+            helpText={
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.podFieldRecommendedValue"
+                defaultMessage="The recommended value is {defaultValue}"
+                values={{
+                  defaultValue: <EuiCode>kubernetes.pod.uid</EuiCode>,
+                }}
+              />
+            }
+            isInvalid={podFieldProps.isInvalid}
+            label={
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.podFieldLabel"
+                defaultMessage="Pod ID"
+              />
+            }
+          >
+            <EuiFieldText
+              fullWidth
+              disabled={isLoading}
+              readOnly={readOnly}
+              isLoading={isLoading}
+              {...podFieldProps}
+            />
+          </EuiFormRow>
+        </EuiDescribedFormGroup>
+      </>
+    )}
   </EuiForm>
 );
diff --git a/x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx b/x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
index e779b35975ec3f..eed6768c8846cb 100644
--- a/x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
@@ -23,6 +23,7 @@ interface IndicesConfigurationPanelProps {
   readOnly: boolean;
   logAliasFieldProps: InputFieldProps;
   metricAliasFieldProps: InputFieldProps;
+  displaySettings: 'metrics' | 'logs';
 }
 
 export const IndicesConfigurationPanel = ({
@@ -30,6 +31,7 @@ export const IndicesConfigurationPanel = ({
   readOnly,
   logAliasFieldProps,
   metricAliasFieldProps,
+  displaySettings,
 }: IndicesConfigurationPanelProps) => (
   <EuiForm>
     <EuiTitle size="s">
@@ -41,101 +43,105 @@ export const IndicesConfigurationPanel = ({
       </h3>
     </EuiTitle>
     <EuiSpacer size="m" />
-    <EuiDescribedFormGroup
-      idAria="metricIndices"
-      title={
-        <h4>
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.metricIndicesTitle"
-            defaultMessage="Metric indices"
-          />
-        </h4>
-      }
-      description={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.metricIndicesDescription"
-          defaultMessage="Index pattern for matching indices that contain Metricbeat data"
-        />
-      }
-    >
-      <EuiFormRow
-        describedByIds={['metricIndices']}
-        error={metricAliasFieldProps.error}
-        fullWidth
-        helpText={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.metricIndicesRecommendedValue"
-            defaultMessage="The recommended value is {defaultValue}"
-            values={{
-              defaultValue: <EuiCode>metricbeat-*</EuiCode>,
-            }}
-          />
+    {displaySettings === 'metrics' && (
+      <EuiDescribedFormGroup
+        idAria="metricIndices"
+        title={
+          <h4>
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.metricIndicesTitle"
+              defaultMessage="Metric indices"
+            />
+          </h4>
         }
-        isInvalid={metricAliasFieldProps.isInvalid}
-        label={
+        description={
           <FormattedMessage
-            id="xpack.infra.sourceConfiguration.metricIndicesLabel"
-            defaultMessage="Metric indices"
+            id="xpack.infra.sourceConfiguration.metricIndicesDescription"
+            defaultMessage="Index pattern for matching indices that contain Metricbeat data"
           />
         }
       >
-        <EuiFieldText
-          data-test-subj="metricIndicesInput"
+        <EuiFormRow
+          describedByIds={['metricIndices']}
+          error={metricAliasFieldProps.error}
           fullWidth
-          disabled={isLoading}
-          readOnly={readOnly}
-          isLoading={isLoading}
-          {...metricAliasFieldProps}
-        />
-      </EuiFormRow>
-    </EuiDescribedFormGroup>
-    <EuiDescribedFormGroup
-      idAria="logIndices"
-      title={
-        <h4>
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.logIndicesTitle"
-            defaultMessage="Log indices"
-          />
-        </h4>
-      }
-      description={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.logIndicesDescription"
-          defaultMessage="Index pattern for matching indices that contain log data"
-        />
-      }
-    >
-      <EuiFormRow
-        describedByIds={['logIndices']}
-        error={logAliasFieldProps.error}
-        fullWidth
-        helpText={
-          <FormattedMessage
-            id="xpack.infra.sourceConfiguration.logIndicesRecommendedValue"
-            defaultMessage="The recommended value is {defaultValue}"
-            values={{
-              defaultValue: <EuiCode>filebeat-*</EuiCode>,
-            }}
+          helpText={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.metricIndicesRecommendedValue"
+              defaultMessage="The recommended value is {defaultValue}"
+              values={{
+                defaultValue: <EuiCode>metricbeat-*</EuiCode>,
+              }}
+            />
+          }
+          isInvalid={metricAliasFieldProps.isInvalid}
+          label={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.metricIndicesLabel"
+              defaultMessage="Metric indices"
+            />
+          }
+        >
+          <EuiFieldText
+            data-test-subj="metricIndicesInput"
+            fullWidth
+            disabled={isLoading}
+            readOnly={readOnly}
+            isLoading={isLoading}
+            {...metricAliasFieldProps}
           />
+        </EuiFormRow>
+      </EuiDescribedFormGroup>
+    )}
+    {displaySettings === 'logs' && (
+      <EuiDescribedFormGroup
+        idAria="logIndices"
+        title={
+          <h4>
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.logIndicesTitle"
+              defaultMessage="Log indices"
+            />
+          </h4>
         }
-        isInvalid={logAliasFieldProps.isInvalid}
-        label={
+        description={
           <FormattedMessage
-            id="xpack.infra.sourceConfiguration.logIndicesLabel"
-            defaultMessage="Log indices"
+            id="xpack.infra.sourceConfiguration.logIndicesDescription"
+            defaultMessage="Index pattern for matching indices that contain log data"
           />
         }
       >
-        <EuiFieldText
-          data-test-subj="logIndicesInput"
+        <EuiFormRow
+          describedByIds={['logIndices']}
+          error={logAliasFieldProps.error}
           fullWidth
-          disabled={isLoading}
-          isLoading={isLoading}
-          readOnly={readOnly}
-          {...logAliasFieldProps}
-        />
-      </EuiFormRow>
-    </EuiDescribedFormGroup>
+          helpText={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.logIndicesRecommendedValue"
+              defaultMessage="The recommended value is {defaultValue}"
+              values={{
+                defaultValue: <EuiCode>filebeat-*</EuiCode>,
+              }}
+            />
+          }
+          isInvalid={logAliasFieldProps.isInvalid}
+          label={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.logIndicesLabel"
+              defaultMessage="Log indices"
+            />
+          }
+        >
+          <EuiFieldText
+            data-test-subj="logIndicesInput"
+            fullWidth
+            disabled={isLoading}
+            isLoading={isLoading}
+            readOnly={readOnly}
+            {...logAliasFieldProps}
+          />
+        </EuiFormRow>
+      </EuiDescribedFormGroup>
+    )}
   </EuiForm>
 );
diff --git a/x-pack/legacy/plugins/infra/public/components/source_configuration/source_configuration_settings.tsx b/x-pack/legacy/plugins/infra/public/components/source_configuration/source_configuration_settings.tsx
index 31afedc8f31eea..68dbdf38e6af6c 100644
--- a/x-pack/legacy/plugins/infra/public/components/source_configuration/source_configuration_settings.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/source_configuration/source_configuration_settings.tsx
@@ -25,13 +25,16 @@ import { IndicesConfigurationPanel } from './indices_configuration_panel';
 import { NameConfigurationPanel } from './name_configuration_panel';
 import { LogColumnsConfigurationPanel } from './log_columns_configuration_panel';
 import { useSourceConfigurationFormState } from './source_configuration_form_state';
+import { SourceLoadingPage } from '../source_loading_page';
 
 interface SourceConfigurationSettingsProps {
   shouldAllowEdit: boolean;
+  displaySettings: 'metrics' | 'logs';
 }
 
 export const SourceConfigurationSettings = ({
   shouldAllowEdit,
+  displaySettings,
 }: SourceConfigurationSettingsProps) => {
   const {
     createSourceConfiguration,
@@ -80,7 +83,10 @@ export const SourceConfigurationSettings = ({
     source,
   ]);
 
-  if (!source || !source.configuration) {
+  if (!source) {
+    return <SourceLoadingPage />;
+  }
+  if (!source.configuration) {
     return null;
   }
 
@@ -112,6 +118,7 @@ export const SourceConfigurationSettings = ({
               logAliasFieldProps={indicesConfigurationProps.logAlias}
               metricAliasFieldProps={indicesConfigurationProps.metricAlias}
               readOnly={!isWriteable}
+              displaySettings={displaySettings}
             />
           </EuiPanel>
           <EuiSpacer />
@@ -124,18 +131,21 @@ export const SourceConfigurationSettings = ({
               readOnly={!isWriteable}
               tiebreakerFieldProps={indicesConfigurationProps.tiebreakerField}
               timestampFieldProps={indicesConfigurationProps.timestampField}
+              displaySettings={displaySettings}
             />
           </EuiPanel>
           <EuiSpacer />
-          <EuiPanel paddingSize="l">
-            <LogColumnsConfigurationPanel
-              addLogColumn={addLogColumn}
-              moveLogColumn={moveLogColumn}
-              availableFields={availableFields}
-              isLoading={isLoading}
-              logColumnConfiguration={logColumnConfigurationProps}
-            />
-          </EuiPanel>
+          {displaySettings === 'logs' && (
+            <EuiPanel paddingSize="l">
+              <LogColumnsConfigurationPanel
+                addLogColumn={addLogColumn}
+                moveLogColumn={moveLogColumn}
+                availableFields={availableFields}
+                isLoading={isLoading}
+                logColumnConfiguration={logColumnConfigurationProps}
+              />
+            </EuiPanel>
+          )}
           {errors.length > 0 ? (
             <>
               <EuiCallOut color="danger">
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
index dfe4fb05d669a8..5eaa2850aebdb2 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
@@ -20,7 +20,7 @@ import { WithSource } from '../../containers/with_source';
 import { Source } from '../../containers/source';
 import { MetricsExplorerPage } from './metrics_explorer';
 import { SnapshotPage } from './snapshot';
-import { SettingsPage } from '../shared/settings';
+import { MetricsSettingsPage } from './settings';
 import { AppNavigation } from '../../components/navigation/app_navigation';
 import { SourceLoadingPage } from '../../components/source_loading_page';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
@@ -106,7 +106,7 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
               </WithSource>
             )}
           />
-          <Route path={`${match.path}/settings`} component={SettingsPage} />
+          <Route path={`${match.path}/settings`} component={MetricsSettingsPage} />
         </Switch>
       </ColumnarPage>
     </Source.Provider>
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/settings.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/settings.tsx
new file mode 100644
index 00000000000000..d75af7879d17a0
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/settings.tsx
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { SourceConfigurationSettings } from '../../components/source_configuration/source_configuration_settings';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+
+export const MetricsSettingsPage = () => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
+  return (
+    <SourceConfigurationSettings
+      shouldAllowEdit={uiCapabilities?.infrastructure?.configureSource as boolean}
+      displaySettings="metrics"
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
index a8a75f99253c2b..f38f066b5323fd 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
@@ -17,7 +17,7 @@ import { SourceLoadingPage } from '../../components/source_loading_page';
 import { SourceErrorPage } from '../../components/source_error_page';
 import { Source, useSource } from '../../containers/source';
 import { StreamPage } from './stream';
-import { SettingsPage } from '../shared/settings';
+import { LogsSettingsPage } from './settings';
 import { AppNavigation } from '../../components/navigation/app_navigation';
 import {
   useLogAnalysisCapabilities,
@@ -107,7 +107,7 @@ export const LogsPage = ({ match }: RouteComponentProps) => {
                 <Route path={streamTab.path} component={StreamPage} />
                 <Route path={logRateTab.path} component={LogEntryRatePage} />
                 <Route path={logCategoriesTab.path} component={LogEntryCategoriesPage} />
-                <Route path={settingsTab.path} component={SettingsPage} />
+                <Route path={settingsTab.path} component={LogsSettingsPage} />
                 <RedirectWithQueryParams
                   from={`${match.path}/analysis`}
                   to={logRateTab.path}
diff --git a/x-pack/legacy/plugins/infra/public/pages/shared/settings/index.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/settings.tsx
similarity index 64%
rename from x-pack/legacy/plugins/infra/public/pages/shared/settings/index.tsx
rename to x-pack/legacy/plugins/infra/public/pages/logs/settings.tsx
index 23ed1b273aa0e5..52ccf5d59e6114 100644
--- a/x-pack/legacy/plugins/infra/public/pages/shared/settings/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/settings.tsx
@@ -5,14 +5,15 @@
  */
 
 import React from 'react';
-import { SourceConfigurationSettings } from '../../../components/source_configuration/source_configuration_settings';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { SourceConfigurationSettings } from '../../components/source_configuration/source_configuration_settings';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
-export const SettingsPage = () => {
+export const LogsSettingsPage = () => {
   const uiCapabilities = useKibana().services.application?.capabilities;
   return (
     <SourceConfigurationSettings
       shouldAllowEdit={uiCapabilities?.logs?.configureSource as boolean}
+      displaySettings="logs"
     />
   );
 };

From bbe700d797362c30af60f7269ab1cc81085a0a96 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 8 Jan 2020 14:48:00 -0500
Subject: [PATCH 63/96] Update schemas boolean, byteSize, and duration to
 coerce strings (#54177)

* Update Duration to coerce number strings to numbers (in millis)

* Coerce in a way that's consistent with kbn-config-schema

* Update ByteSizeValue to coerce strings to numbers

* Update Boolean to coerce strings to boolean values

* Fix Jest test

* Address PR review feedback

* Whoops

* Whoops 2

* Whoops 3
---
 packages/kbn-config-schema/README.md          |  7 +++--
 .../__snapshots__/index.test.ts.snap          | 10 ++++---
 .../src/byte_size_value/index.test.ts         | 10 +++----
 .../src/byte_size_value/index.ts              | 14 ++++++----
 .../kbn-config-schema/src/duration/index.ts   | 15 ++++++-----
 .../kbn-config-schema/src/internals/index.ts  | 18 ++++++++++++-
 .../__snapshots__/boolean_type.test.ts.snap   |  4 +++
 .../__snapshots__/byte_size_type.test.ts.snap | 26 +++++++++++--------
 .../__snapshots__/duration_type.test.ts.snap  | 18 ++++++++-----
 .../src/types/boolean_type.test.ts            | 15 +++++++++++
 .../src/types/byte_size_type.test.ts          | 24 +++++++++++++++--
 .../src/types/duration_type.test.ts           | 24 +++++++++++++++--
 .../builtin_action_types/es_index.test.ts     |  2 +-
 13 files changed, 141 insertions(+), 46 deletions(-)

diff --git a/packages/kbn-config-schema/README.md b/packages/kbn-config-schema/README.md
index fd62f1b3c03b22..e6f3e60128983d 100644
--- a/packages/kbn-config-schema/README.md
+++ b/packages/kbn-config-schema/README.md
@@ -156,6 +156,9 @@ __Usage:__
 const valueSchema = schema.boolean({ defaultValue: false });
 ```
 
+__Notes:__
+* The `schema.boolean()` also supports a string as input if it equals `'true'` or `'false'` (case-insensitive).
+
 #### `schema.literal()`
 
 Validates input data as a [string](https://www.typescriptlang.org/docs/handbook/advanced-types.html#string-literal-types), [numeric](https://www.typescriptlang.org/docs/handbook/advanced-types.html#numeric-literal-types) or boolean literal.
@@ -397,7 +400,7 @@ const valueSchema = schema.byteSize({ min: '3kb' });
 ```
 
 __Notes:__
-* The string value for `schema.byteSize()` and its options supports the following prefixes: `b`, `kb`, `mb`, `gb` and `tb`.
+* The string value for `schema.byteSize()` and its options supports the following optional suffixes: `b`, `kb`, `mb`, `gb` and `tb`. The default suffix is `b`.
 * The number value is treated as a number of bytes and hence should be a positive integer, e.g. `100` is equal to `'100b'`.
 * Currently you cannot specify zero bytes with a string format and should use number `0` instead.
 
@@ -417,7 +420,7 @@ const valueSchema = schema.duration({ defaultValue: '70ms' });
 ```
 
 __Notes:__
-* The string value for `schema.duration()` supports the following prefixes: `ms`, `s`, `m`, `h`, `d`, `w`, `M` and `Y`.
+* The string value for `schema.duration()` supports the following optional suffixes: `ms`, `s`, `m`, `h`, `d`, `w`, `M` and `Y`. The default suffix is `ms`.
 * The number value is treated as a number of milliseconds and hence should be a positive integer, e.g. `100` is equal to `'100ms'`.
 
 #### `schema.conditional()`
diff --git a/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap b/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap
index 1db6930062a9a1..97e9082401b3da 100644
--- a/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap
+++ b/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap
@@ -1,9 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`#constructor throws if number of bytes is negative 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [-1024]"`;
+exports[`#constructor throws if number of bytes is negative 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [-1024]."`;
 
-exports[`#constructor throws if number of bytes is not safe 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [NaN]"`;
+exports[`#constructor throws if number of bytes is not safe 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [NaN]."`;
 
-exports[`#constructor throws if number of bytes is not safe 2`] = `"Value in bytes is expected to be a safe positive integer, but provided [Infinity]"`;
+exports[`#constructor throws if number of bytes is not safe 2`] = `"Value in bytes is expected to be a safe positive integer, but provided [Infinity]."`;
 
-exports[`#constructor throws if number of bytes is not safe 3`] = `"Value in bytes is expected to be a safe positive integer, but provided [9007199254740992]"`;
+exports[`#constructor throws if number of bytes is not safe 3`] = `"Value in bytes is expected to be a safe positive integer, but provided [9007199254740992]."`;
+
+exports[`parsing units throws an error when unsupported unit specified 1`] = `"Failed to parse [1tb] as byte value. Value must be either number of bytes, or follow the format <count>[b|kb|mb|gb] (e.g., '1024kb', '200mb', '1gb'), where the number is a safe positive integer."`;
diff --git a/packages/kbn-config-schema/src/byte_size_value/index.test.ts b/packages/kbn-config-schema/src/byte_size_value/index.test.ts
index 46ed96c83dd1f7..198d95aa0ab4cc 100644
--- a/packages/kbn-config-schema/src/byte_size_value/index.test.ts
+++ b/packages/kbn-config-schema/src/byte_size_value/index.test.ts
@@ -20,6 +20,10 @@
 import { ByteSizeValue } from '.';
 
 describe('parsing units', () => {
+  test('number string (bytes)', () => {
+    expect(ByteSizeValue.parse('123').getValueInBytes()).toBe(123);
+  });
+
   test('bytes', () => {
     expect(ByteSizeValue.parse('123b').getValueInBytes()).toBe(123);
   });
@@ -37,12 +41,8 @@ describe('parsing units', () => {
     expect(ByteSizeValue.parse('1gb').getValueInBytes()).toBe(1073741824);
   });
 
-  test('throws an error when no unit specified', () => {
-    expect(() => ByteSizeValue.parse('123')).toThrowError('could not parse byte size value');
-  });
-
   test('throws an error when unsupported unit specified', () => {
-    expect(() => ByteSizeValue.parse('1tb')).toThrowError('could not parse byte size value');
+    expect(() => ByteSizeValue.parse('1tb')).toThrowErrorMatchingSnapshot();
   });
 });
 
diff --git a/packages/kbn-config-schema/src/byte_size_value/index.ts b/packages/kbn-config-schema/src/byte_size_value/index.ts
index fb0105503a1494..48862821bb78d9 100644
--- a/packages/kbn-config-schema/src/byte_size_value/index.ts
+++ b/packages/kbn-config-schema/src/byte_size_value/index.ts
@@ -35,9 +35,14 @@ export class ByteSizeValue {
   public static parse(text: string): ByteSizeValue {
     const match = /([1-9][0-9]*)(b|kb|mb|gb)/.exec(text);
     if (!match) {
-      throw new Error(
-        `could not parse byte size value [${text}]. Value must be a safe positive integer.`
-      );
+      const number = Number(text);
+      if (typeof number !== 'number' || isNaN(number)) {
+        throw new Error(
+          `Failed to parse [${text}] as byte value. Value must be either number of bytes, or follow the format <count>[b|kb|mb|gb] ` +
+            `(e.g., '1024kb', '200mb', '1gb'), where the number is a safe positive integer.`
+        );
+      }
+      return new ByteSizeValue(number);
     }
 
     const value = parseInt(match[1], 0);
@@ -49,8 +54,7 @@ export class ByteSizeValue {
   constructor(private readonly valueInBytes: number) {
     if (!Number.isSafeInteger(valueInBytes) || valueInBytes < 0) {
       throw new Error(
-        `Value in bytes is expected to be a safe positive integer, ` +
-          `but provided [${valueInBytes}]`
+        `Value in bytes is expected to be a safe positive integer, but provided [${valueInBytes}].`
       );
     }
   }
diff --git a/packages/kbn-config-schema/src/duration/index.ts b/packages/kbn-config-schema/src/duration/index.ts
index ff8f96614a193b..b96b5a3687bbb4 100644
--- a/packages/kbn-config-schema/src/duration/index.ts
+++ b/packages/kbn-config-schema/src/duration/index.ts
@@ -25,10 +25,14 @@ const timeFormatRegex = /^(0|[1-9][0-9]*)(ms|s|m|h|d|w|M|Y)$/;
 function stringToDuration(text: string) {
   const result = timeFormatRegex.exec(text);
   if (!result) {
-    throw new Error(
-      `Failed to parse [${text}] as time value. ` +
-        `Format must be <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y')`
-    );
+    const number = Number(text);
+    if (typeof number !== 'number' || isNaN(number)) {
+      throw new Error(
+        `Failed to parse [${text}] as time value. Value must be a duration in milliseconds, or follow the format ` +
+          `<count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer.`
+      );
+    }
+    return numberToDuration(number);
   }
 
   const count = parseInt(result[1], 0);
@@ -40,8 +44,7 @@ function stringToDuration(text: string) {
 function numberToDuration(numberMs: number) {
   if (!Number.isSafeInteger(numberMs) || numberMs < 0) {
     throw new Error(
-      `Failed to parse [${numberMs}] as time value. ` +
-        `Value should be a safe positive integer number.`
+      `Value in milliseconds is expected to be a safe positive integer, but provided [${numberMs}].`
     );
   }
 
diff --git a/packages/kbn-config-schema/src/internals/index.ts b/packages/kbn-config-schema/src/internals/index.ts
index 4d5091eaa09b13..044c3050f9fa87 100644
--- a/packages/kbn-config-schema/src/internals/index.ts
+++ b/packages/kbn-config-schema/src/internals/index.ts
@@ -82,7 +82,23 @@ export const internals = Joi.extend([
     base: Joi.boolean(),
     coerce(value: any, state: State, options: ValidationOptions) {
       // If value isn't defined, let Joi handle default value if it's defined.
-      if (value !== undefined && typeof value !== 'boolean') {
+      if (value === undefined) {
+        return value;
+      }
+
+      // Allow strings 'true' and 'false' to be coerced to booleans (case-insensitive).
+
+      // From Joi docs on `Joi.boolean`:
+      // > Generates a schema object that matches a boolean data type. Can also
+      // >  be called via bool(). If the validation convert option is on
+      // > (enabled by default), a string (either "true" or "false") will be
+      // converted to a boolean if specified.
+      if (typeof value === 'string') {
+        const normalized = value.toLowerCase();
+        value = normalized === 'true' ? true : normalized === 'false' ? false : value;
+      }
+
+      if (typeof value !== 'boolean') {
         return this.createError('boolean.base', { value }, state, options);
       }
 
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap
index c3f33dc29bf50e..0e5f6de2deea8f 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap
@@ -9,3 +9,7 @@ exports[`returns error when not boolean 1`] = `"expected value of type [boolean]
 exports[`returns error when not boolean 2`] = `"expected value of type [boolean] but got [Array]"`;
 
 exports[`returns error when not boolean 3`] = `"expected value of type [boolean] but got [string]"`;
+
+exports[`returns error when not boolean 4`] = `"expected value of type [boolean] but got [number]"`;
+
+exports[`returns error when not boolean 5`] = `"expected value of type [boolean] but got [string]"`;
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
index f6f45a96ca1612..ea2102b1776fbf 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
@@ -18,6 +18,12 @@ ByteSizeValue {
 }
 `;
 
+exports[`#defaultValue can be a string-formatted number 1`] = `
+ByteSizeValue {
+  "valueInBytes": 1024,
+}
+`;
+
 exports[`#max returns error when larger 1`] = `"Value is [1mb] ([1048576b]) but it must be equal to or less than [1kb]"`;
 
 exports[`#max returns value when smaller 1`] = `
@@ -38,20 +44,18 @@ exports[`includes namespace in failure 1`] = `"[foo-namespace]: expected value o
 
 exports[`is required by default 1`] = `"expected value of type [ByteSize] but got [undefined]"`;
 
-exports[`returns error when not string or positive safe integer 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [-123]"`;
+exports[`returns error when not valid string or positive safe integer 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [-123]."`;
 
-exports[`returns error when not string or positive safe integer 2`] = `"Value in bytes is expected to be a safe positive integer, but provided [NaN]"`;
+exports[`returns error when not valid string or positive safe integer 2`] = `"Value in bytes is expected to be a safe positive integer, but provided [NaN]."`;
 
-exports[`returns error when not string or positive safe integer 3`] = `"Value in bytes is expected to be a safe positive integer, but provided [Infinity]"`;
+exports[`returns error when not valid string or positive safe integer 3`] = `"Value in bytes is expected to be a safe positive integer, but provided [Infinity]."`;
 
-exports[`returns error when not string or positive safe integer 4`] = `"Value in bytes is expected to be a safe positive integer, but provided [9007199254740992]"`;
+exports[`returns error when not valid string or positive safe integer 4`] = `"Value in bytes is expected to be a safe positive integer, but provided [9007199254740992]."`;
 
-exports[`returns error when not string or positive safe integer 5`] = `"expected value of type [ByteSize] but got [Array]"`;
+exports[`returns error when not valid string or positive safe integer 5`] = `"expected value of type [ByteSize] but got [Array]"`;
 
-exports[`returns error when not string or positive safe integer 6`] = `"expected value of type [ByteSize] but got [RegExp]"`;
+exports[`returns error when not valid string or positive safe integer 6`] = `"expected value of type [ByteSize] but got [RegExp]"`;
 
-exports[`returns value by default 1`] = `
-ByteSizeValue {
-  "valueInBytes": 123,
-}
-`;
+exports[`returns error when not valid string or positive safe integer 7`] = `"Failed to parse [123foo] as byte value. Value must be either number of bytes, or follow the format <count>[b|kb|mb|gb] (e.g., '1024kb', '200mb', '1gb'), where the number is a safe positive integer."`;
+
+exports[`returns error when not valid string or positive safe integer 8`] = `"Failed to parse [123 456] as byte value. Value must be either number of bytes, or follow the format <count>[b|kb|mb|gb] (e.g., '1024kb', '200mb', '1gb'), where the number is a safe positive integer."`;
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
index a21c28e7cc6142..c4e4ff652a2d7e 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
@@ -6,20 +6,24 @@ exports[`#defaultValue can be a number 1`] = `"PT0.6S"`;
 
 exports[`#defaultValue can be a string 1`] = `"PT1H"`;
 
+exports[`#defaultValue can be a string-formatted number 1`] = `"PT0.6S"`;
+
 exports[`includes namespace in failure 1`] = `"[foo-namespace]: expected value of type [moment.Duration] but got [undefined]"`;
 
 exports[`is required by default 1`] = `"expected value of type [moment.Duration] but got [undefined]"`;
 
-exports[`returns error when not string or non-safe positive integer 1`] = `"Failed to parse [-123] as time value. Value should be a safe positive integer number."`;
+exports[`returns error when not valid string or non-safe positive integer 1`] = `"Value in milliseconds is expected to be a safe positive integer, but provided [-123]."`;
+
+exports[`returns error when not valid string or non-safe positive integer 2`] = `"Value in milliseconds is expected to be a safe positive integer, but provided [NaN]."`;
 
-exports[`returns error when not string or non-safe positive integer 2`] = `"Failed to parse [NaN] as time value. Value should be a safe positive integer number."`;
+exports[`returns error when not valid string or non-safe positive integer 3`] = `"Value in milliseconds is expected to be a safe positive integer, but provided [Infinity]."`;
 
-exports[`returns error when not string or non-safe positive integer 3`] = `"Failed to parse [Infinity] as time value. Value should be a safe positive integer number."`;
+exports[`returns error when not valid string or non-safe positive integer 4`] = `"Value in milliseconds is expected to be a safe positive integer, but provided [9007199254740992]."`;
 
-exports[`returns error when not string or non-safe positive integer 4`] = `"Failed to parse [9007199254740992] as time value. Value should be a safe positive integer number."`;
+exports[`returns error when not valid string or non-safe positive integer 5`] = `"expected value of type [moment.Duration] but got [Array]"`;
 
-exports[`returns error when not string or non-safe positive integer 5`] = `"expected value of type [moment.Duration] but got [Array]"`;
+exports[`returns error when not valid string or non-safe positive integer 6`] = `"expected value of type [moment.Duration] but got [RegExp]"`;
 
-exports[`returns error when not string or non-safe positive integer 6`] = `"expected value of type [moment.Duration] but got [RegExp]"`;
+exports[`returns error when not valid string or non-safe positive integer 7`] = `"Failed to parse [123foo] as time value. Value must be a duration in milliseconds, or follow the format <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer."`;
 
-exports[`returns value by default 1`] = `"PT2M3S"`;
+exports[`returns error when not valid string or non-safe positive integer 8`] = `"Failed to parse [123 456] as time value. Value must be a duration in milliseconds, or follow the format <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer."`;
diff --git a/packages/kbn-config-schema/src/types/boolean_type.test.ts b/packages/kbn-config-schema/src/types/boolean_type.test.ts
index d6e274f05e3ffa..e94999b5054377 100644
--- a/packages/kbn-config-schema/src/types/boolean_type.test.ts
+++ b/packages/kbn-config-schema/src/types/boolean_type.test.ts
@@ -23,6 +23,17 @@ test('returns value by default', () => {
   expect(schema.boolean().validate(true)).toBe(true);
 });
 
+test('handles boolean strings', () => {
+  expect(schema.boolean().validate('true')).toBe(true);
+  expect(schema.boolean().validate('TRUE')).toBe(true);
+  expect(schema.boolean().validate('True')).toBe(true);
+  expect(schema.boolean().validate('TrUe')).toBe(true);
+  expect(schema.boolean().validate('false')).toBe(false);
+  expect(schema.boolean().validate('FALSE')).toBe(false);
+  expect(schema.boolean().validate('False')).toBe(false);
+  expect(schema.boolean().validate('FaLse')).toBe(false);
+});
+
 test('is required by default', () => {
   expect(() => schema.boolean().validate(undefined)).toThrowErrorMatchingSnapshot();
 });
@@ -49,4 +60,8 @@ test('returns error when not boolean', () => {
   expect(() => schema.boolean().validate([1, 2, 3])).toThrowErrorMatchingSnapshot();
 
   expect(() => schema.boolean().validate('abc')).toThrowErrorMatchingSnapshot();
+
+  expect(() => schema.boolean().validate(0)).toThrowErrorMatchingSnapshot();
+
+  expect(() => schema.boolean().validate('no')).toThrowErrorMatchingSnapshot();
 });
diff --git a/packages/kbn-config-schema/src/types/byte_size_type.test.ts b/packages/kbn-config-schema/src/types/byte_size_type.test.ts
index 67eae1e7c382a6..7c65ec2945b493 100644
--- a/packages/kbn-config-schema/src/types/byte_size_type.test.ts
+++ b/packages/kbn-config-schema/src/types/byte_size_type.test.ts
@@ -23,7 +23,15 @@ import { ByteSizeValue } from '../byte_size_value';
 const { byteSize } = schema;
 
 test('returns value by default', () => {
-  expect(byteSize().validate('123b')).toMatchSnapshot();
+  expect(byteSize().validate('123b')).toEqual(new ByteSizeValue(123));
+});
+
+test('handles numeric strings', () => {
+  expect(byteSize().validate('123')).toEqual(new ByteSizeValue(123));
+});
+
+test('handles numbers', () => {
+  expect(byteSize().validate(123)).toEqual(new ByteSizeValue(123));
 });
 
 test('is required by default', () => {
@@ -51,6 +59,14 @@ describe('#defaultValue', () => {
     ).toMatchSnapshot();
   });
 
+  test('can be a string-formatted number', () => {
+    expect(
+      byteSize({
+        defaultValue: '1024',
+      }).validate(undefined)
+    ).toMatchSnapshot();
+  });
+
   test('can be a number', () => {
     expect(
       byteSize({
@@ -88,7 +104,7 @@ describe('#max', () => {
   });
 });
 
-test('returns error when not string or positive safe integer', () => {
+test('returns error when not valid string or positive safe integer', () => {
   expect(() => byteSize().validate(-123)).toThrowErrorMatchingSnapshot();
 
   expect(() => byteSize().validate(NaN)).toThrowErrorMatchingSnapshot();
@@ -100,4 +116,8 @@ test('returns error when not string or positive safe integer', () => {
   expect(() => byteSize().validate([1, 2, 3])).toThrowErrorMatchingSnapshot();
 
   expect(() => byteSize().validate(/abc/)).toThrowErrorMatchingSnapshot();
+
+  expect(() => byteSize().validate('123foo')).toThrowErrorMatchingSnapshot();
+
+  expect(() => byteSize().validate('123 456')).toThrowErrorMatchingSnapshot();
 });
diff --git a/packages/kbn-config-schema/src/types/duration_type.test.ts b/packages/kbn-config-schema/src/types/duration_type.test.ts
index 39655d43d7b75b..09e92ce727f2a2 100644
--- a/packages/kbn-config-schema/src/types/duration_type.test.ts
+++ b/packages/kbn-config-schema/src/types/duration_type.test.ts
@@ -23,7 +23,15 @@ import { schema } from '..';
 const { duration, object, contextRef, siblingRef } = schema;
 
 test('returns value by default', () => {
-  expect(duration().validate('123s')).toMatchSnapshot();
+  expect(duration().validate('123s')).toEqual(momentDuration(123000));
+});
+
+test('handles numeric string', () => {
+  expect(duration().validate('123000')).toEqual(momentDuration(123000));
+});
+
+test('handles number', () => {
+  expect(duration().validate(123000)).toEqual(momentDuration(123000));
 });
 
 test('is required by default', () => {
@@ -51,6 +59,14 @@ describe('#defaultValue', () => {
     ).toMatchSnapshot();
   });
 
+  test('can be a string-formatted number', () => {
+    expect(
+      duration({
+        defaultValue: '600',
+      }).validate(undefined)
+    ).toMatchSnapshot();
+  });
+
   test('can be a number', () => {
     expect(
       duration({
@@ -124,7 +140,7 @@ Object {
   });
 });
 
-test('returns error when not string or non-safe positive integer', () => {
+test('returns error when not valid string or non-safe positive integer', () => {
   expect(() => duration().validate(-123)).toThrowErrorMatchingSnapshot();
 
   expect(() => duration().validate(NaN)).toThrowErrorMatchingSnapshot();
@@ -136,4 +152,8 @@ test('returns error when not string or non-safe positive integer', () => {
   expect(() => duration().validate([1, 2, 3])).toThrowErrorMatchingSnapshot();
 
   expect(() => duration().validate(/abc/)).toThrowErrorMatchingSnapshot();
+
+  expect(() => duration().validate('123foo')).toThrowErrorMatchingSnapshot();
+
+  expect(() => duration().validate('123 456')).toThrowErrorMatchingSnapshot();
 });
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
index 35d81ba74fa72d..1da8b06e1587a9 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
@@ -142,7 +142,7 @@ describe('params validation', () => {
     );
 
     expect(() => {
-      validateParams(actionType, { refresh: 'true' });
+      validateParams(actionType, { refresh: 'foo' });
     }).toThrowErrorMatchingInlineSnapshot(
       `"error validating action params: [refresh]: expected value of type [boolean] but got [string]"`
     );

From e93c6b8d1a187c50867c60fc3a422ff868fbcc62 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Wed, 8 Jan 2020 15:07:14 -0500
Subject: [PATCH 64/96] [ML] DF Analytics Results: adds link to docs (#54189)

* add doc links to evaluate panel for analytics jobs

* fix confusion matrix dataGrid label

* internationalize link text
---
 .../evaluate_panel.tsx                        | 55 +++++++++++--------
 .../regression_exploration/evaluate_panel.tsx | 32 ++++++++++-
 2 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
index 7bb6949db1a99f..68ed2c08d0df18 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
@@ -8,6 +8,7 @@ import React, { FC, useState, useEffect, Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
+  EuiButtonEmpty,
   EuiDataGrid,
   EuiFlexGroup,
   EuiFlexItem,
@@ -18,6 +19,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
+import { metadata } from 'ui/metadata';
 import { ErrorCallout } from '../error_callout';
 import {
   getDependentVar,
@@ -243,7 +245,7 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
     <EuiPanel style={{ width: `${panelWidth}px` }}>
       <EuiFlexGroup direction="column" gutterSize="s">
         <EuiFlexItem>
-          <EuiFlexGroup gutterSize="s">
+          <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
             <EuiFlexItem grow={false}>
               <EuiTitle size="xs">
                 <span>
@@ -260,6 +262,25 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
             <EuiFlexItem grow={false}>
               <span>{getTaskStateBadge(jobStatus)}</span>
             </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiSpacer />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiButtonEmpty
+                target="_blank"
+                iconType="help"
+                iconSide="left"
+                color="primary"
+                href={`https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-dfanalytics-evaluate.html#ml-dfanalytics-classification`}
+              >
+                {i18n.translate(
+                  'xpack.ml.dataframe.analytics.classificationExploration.classificationDocsLink',
+                  {
+                    defaultMessage: 'Classification evaluation docs ',
+                  }
+                )}
+              </EuiButtonEmpty>
+            </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlexItem>
         {error !== null && (
@@ -327,28 +348,18 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
                     <Fragment>
                       <EuiFlexGroup direction="column" justifyContent="center" gutterSize="s">
                         <EuiFlexItem grow={false}>
-                          <EuiFlexGroup>
-                            <EuiFlexItem>
-                              <EuiSpacer />
-                            </EuiFlexItem>
-                            <EuiFlexItem>
-                              <EuiSpacer />
-                            </EuiFlexItem>
-                            <EuiFlexItem>
-                              <EuiFormRow
-                                helpText={i18n.translate(
-                                  'xpack.ml.dataframe.analytics.classificationExploration.confusionMatrixPredictedLabel',
-                                  {
-                                    defaultMessage: 'Predicted label',
-                                  }
-                                )}
-                              >
-                                <Fragment />
-                              </EuiFormRow>
-                            </EuiFlexItem>
-                          </EuiFlexGroup>
+                          <EuiFormRow
+                            helpText={i18n.translate(
+                              'xpack.ml.dataframe.analytics.classificationExploration.confusionMatrixPredictedLabel',
+                              {
+                                defaultMessage: 'Predicted label',
+                              }
+                            )}
+                          >
+                            <Fragment />
+                          </EuiFormRow>
                         </EuiFlexItem>
-                        <EuiFlexItem grow={false} style={{ width: '90%' }}>
+                        <EuiFlexItem grow={false}>
                           <EuiDataGrid
                             aria-label="Data grid demo"
                             columns={columns}
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
index a8a015c6ef3455..30744c1a88d830 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
@@ -7,7 +7,16 @@
 import React, { FC, Fragment, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+import {
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPanel,
+  EuiSpacer,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+import { metadata } from 'ui/metadata';
 import { ErrorCallout } from '../error_callout';
 import {
   getValuesFromResponse,
@@ -221,7 +230,7 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
 
   return (
     <EuiPanel>
-      <EuiFlexGroup gutterSize="s">
+      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle size="xs">
             <span>
@@ -238,6 +247,25 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
         <EuiFlexItem grow={false}>
           <span>{getTaskStateBadge(jobStatus)}</span>
         </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiSpacer />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty
+            target="_blank"
+            iconType="help"
+            iconSide="left"
+            color="primary"
+            href={`https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-dfanalytics-evaluate.html#ml-dfanalytics-regression-evaluation`}
+          >
+            {i18n.translate(
+              'xpack.ml.dataframe.analytics.classificationExploration.regressionDocsLink',
+              {
+                defaultMessage: 'Regression evaluation docs ',
+              }
+            )}
+          </EuiButtonEmpty>
+        </EuiFlexItem>
       </EuiFlexGroup>
       <EuiSpacer size="m" />
       <EuiFlexGroup justifyContent="spaceBetween">

From 26ce6104a9091574d4ff85325aa7e4b8565faf8c Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko <dzmitry.lemechko@elastic.co>
Date: Wed, 8 Jan 2020 21:08:48 +0100
Subject: [PATCH 65/96] Code coverage setup on CI (#49003)

* running code coverage in CI

* apply review feedback

* add custom function to upload merged coverage reports

* fix artifacts upload without coverage

* add file extension to fix validation

* Check code_coverage is set

* run oss tests via grunt task

* review fixes

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .ci/Jenkinsfile_coverage                    | 112 ++++++++++++++++++++
 scripts/functional_tests.js                 |  19 +++-
 src/dev/jest/config.js                      |   2 +-
 src/legacy/server/config/schema.js          |   2 +-
 tasks/config/run.js                         |   1 +
 tasks/function_test_groups.js               |  29 ++---
 test/functional/services/remote/remote.ts   |   4 +-
 test/scripts/jenkins_build_kibana.sh        |   7 +-
 test/scripts/jenkins_ci_group.sh            |  38 ++++---
 test/scripts/jenkins_unit.sh                |  14 ++-
 test/scripts/jenkins_xpack.sh               |  75 +++++++------
 test/scripts/jenkins_xpack_build_kibana.sh  |  17 +--
 test/scripts/jenkins_xpack_ci_group.sh      | 101 +++++++++---------
 vars/kibanaPipeline.groovy                  |  17 +++
 x-pack/dev-tools/jest/create_jest_config.js |   2 +-
 x-pack/scripts/functional_tests.js          |  59 ++++++-----
 16 files changed, 347 insertions(+), 152 deletions(-)
 create mode 100644 .ci/Jenkinsfile_coverage

diff --git a/.ci/Jenkinsfile_coverage b/.ci/Jenkinsfile_coverage
new file mode 100644
index 00000000000000..d9ec1861c9979e
--- /dev/null
+++ b/.ci/Jenkinsfile_coverage
@@ -0,0 +1,112 @@
+#!/bin/groovy
+
+library 'kibana-pipeline-library'
+kibanaLibrary.load() // load from the Jenkins instance
+
+stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a little bit
+  timeout(time: 180, unit: 'MINUTES') {
+    timestamps {
+      ansiColor('xterm') {
+        catchError {
+          withEnv([
+            'CODE_COVERAGE=1', // Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.
+          ]) {
+            parallel([
+              'kibana-intake-agent': {
+                withEnv([
+                  'NODE_ENV=test' // Needed for jest tests only
+                ]) {
+                  kibanaPipeline.legacyJobRunner('kibana-intake')()
+                }
+              },
+              'x-pack-intake-agent': {
+                withEnv([
+                  'NODE_ENV=test' // Needed for jest tests only
+                ]) {
+                  kibanaPipeline.legacyJobRunner('x-pack-intake')()
+                }
+              },
+              'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
+                'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
+                'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
+                'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
+                'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
+                'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
+                'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
+                'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
+                'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
+                'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
+                'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
+                'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
+                'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
+              ]),
+              'kibana-xpack-agent-1': kibanaPipeline.withWorkers('kibana-xpack-tests-1', { kibanaPipeline.buildXpack() }, [
+                'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
+                'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
+              ]),
+              'kibana-xpack-agent-2': kibanaPipeline.withWorkers('kibana-xpack-tests-2', { kibanaPipeline.buildXpack() }, [
+                'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
+                'xpack-ciGroup4': kibanaPipeline.getXpackCiGroupWorker(4),
+              ]),
+
+              'kibana-xpack-agent-3': kibanaPipeline.withWorkers('kibana-xpack-tests-3', { kibanaPipeline.buildXpack() }, [
+                'xpack-ciGroup5': kibanaPipeline.getXpackCiGroupWorker(5),
+                'xpack-ciGroup6': kibanaPipeline.getXpackCiGroupWorker(6),
+                'xpack-ciGroup7': kibanaPipeline.getXpackCiGroupWorker(7),
+                'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
+                'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
+                'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
+              ]),
+            ])
+            kibanaPipeline.jobRunner('tests-l', false) {
+              kibanaPipeline.downloadCoverageArtifacts()
+              kibanaPipeline.bash(
+                '''
+                  # bootstrap from x-pack folder
+                  source src/dev/ci_setup/setup_env.sh
+                  cd x-pack
+                  yarn kbn bootstrap --prefer-offline
+                  cd ..
+                  # extract archives
+                  mkdir -p /tmp/extracted_coverage
+                  echo extracting intakes
+                  tar -xzf /tmp/downloaded_coverage/coverage/kibana-intake/kibana-coverage.tar.gz -C /tmp/extracted_coverage
+                  tar -xzf /tmp/downloaded_coverage/coverage/x-pack-intake/kibana-coverage.tar.gz -C /tmp/extracted_coverage
+                  echo extracting kibana-oss-tests
+                  tar -xzf /tmp/downloaded_coverage/coverage/kibana-oss-tests/kibana-coverage.tar.gz -C /tmp/extracted_coverage
+                  echo extracting kibana-xpack-tests
+                  for i in {1..3}; do
+                    tar -xzf /tmp/downloaded_coverage/coverage/kibana-xpack-tests-${i}/kibana-coverage.tar.gz -C /tmp/extracted_coverage
+                  done
+                  # replace path in json files to have valid html report
+                  pwd=$(pwd)
+                  du -sh /tmp/extracted_coverage/target/kibana-coverage/
+                  echo replacing path in json files
+                  for i in {1..9}; do
+                    sed -i "s|/dev/shm/workspace/kibana|$pwd|g" /tmp/extracted_coverage/target/kibana-coverage/functional/${i}*.json &
+                  done
+                  wait
+                  # merge oss & x-pack reports
+                  echo merging coverage reports
+                  yarn nyc report --temp-dir /tmp/extracted_coverage/target/kibana-coverage/jest --report-dir target/kibana-coverage/jest-combined --reporter=html --reporter=json-summary
+                  yarn nyc report --temp-dir /tmp/extracted_coverage/target/kibana-coverage/functional --report-dir target/kibana-coverage/functional-combined --reporter=html --reporter=json-summary
+                  echo copy mocha reports
+                  mkdir -p target/kibana-coverage/mocha-combined
+                  cp -r /tmp/extracted_coverage/target/kibana-coverage/mocha target/kibana-coverage/mocha-combined
+                ''',
+                "run `yarn kbn bootstrap && merge coverage`"
+              )
+              sh 'tar -czf kibana-jest-coverage.tar.gz target/kibana-coverage/jest-combined/*'
+              kibanaPipeline.uploadCoverageArtifacts("coverage/jest-combined", 'kibana-jest-coverage.tar.gz')
+              sh 'tar -czf kibana-functional-coverage.tar.gz target/kibana-coverage/functional-combined/*'
+              kibanaPipeline.uploadCoverageArtifacts("coverage/functional-combined", 'kibana-functional-coverage.tar.gz')
+              sh 'tar -czf kibana-mocha-coverage.tar.gz target/kibana-coverage/mocha-combined/*'
+              kibanaPipeline.uploadCoverageArtifacts("coverage/mocha-combined", 'kibana-mocha-coverage.tar.gz')
+            }
+          }
+        }
+        kibanaPipeline.sendMail()
+      }
+    }
+  }
+}
diff --git a/scripts/functional_tests.js b/scripts/functional_tests.js
index 4472891e580fb9..fc88f2657018f0 100644
--- a/scripts/functional_tests.js
+++ b/scripts/functional_tests.js
@@ -17,12 +17,23 @@
  * under the License.
  */
 
-require('../src/setup_node_env');
-require('@kbn/test').runTestsCli([
+// eslint-disable-next-line no-restricted-syntax
+const alwaysImportedTests = [
   require.resolve('../test/functional/config.js'),
-  require.resolve('../test/api_integration/config.js'),
   require.resolve('../test/plugin_functional/config.js'),
-  require.resolve('../test/interpreter_functional/config.ts'),
   require.resolve('../test/ui_capabilities/newsfeed_err/config.ts'),
+];
+// eslint-disable-next-line no-restricted-syntax
+const onlyNotInCoverageTests = [
+  require.resolve('../test/api_integration/config.js'),
+  require.resolve('../test/interpreter_functional/config.ts'),
   require.resolve('../test/examples/config.js'),
+];
+
+require('../src/setup_node_env');
+require('@kbn/test').runTestsCli([
+  // eslint-disable-next-line no-restricted-syntax
+  ...alwaysImportedTests,
+  // eslint-disable-next-line no-restricted-syntax
+  ...(!!process.env.CODE_COVERAGE ? [] : onlyNotInCoverageTests),
 ]);
diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js
index 9321336f0f55eb..1c95e75396bcc2 100644
--- a/src/dev/jest/config.js
+++ b/src/dev/jest/config.js
@@ -69,7 +69,7 @@ export default {
   ],
   setupFilesAfterEnv: ['<rootDir>/src/dev/jest/setup/mocks.js'],
   coverageDirectory: '<rootDir>/target/kibana-coverage/jest',
-  coverageReporters: ['html', 'text'],
+  coverageReporters: !!process.env.CODE_COVERAGE ? ['json'] : ['html', 'text'],
   moduleFileExtensions: ['js', 'json', 'ts', 'tsx'],
   modulePathIgnorePatterns: ['__fixtures__/', 'target/'],
   testMatch: ['**/*.test.{js,ts,tsx}'],
diff --git a/src/legacy/server/config/schema.js b/src/legacy/server/config/schema.js
index a18cb7de5a61b9..a53e8e0498c42a 100644
--- a/src/legacy/server/config/schema.js
+++ b/src/legacy/server/config/schema.js
@@ -181,7 +181,7 @@ export default () =>
         .default('localhost'),
       watchPrebuild: Joi.boolean().default(false),
       watchProxyTimeout: Joi.number().default(10 * 60000),
-      useBundleCache: Joi.boolean().default(Joi.ref('$prod')),
+      useBundleCache: Joi.boolean().default(!!process.env.CODE_COVERAGE ? true : Joi.ref('$prod')),
       sourceMaps: Joi.when('$prod', {
         is: true,
         then: Joi.boolean().valid(false),
diff --git a/tasks/config/run.js b/tasks/config/run.js
index a29061c9a72405..857895d75595cb 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -152,6 +152,7 @@ module.exports = function(grunt) {
       args: [
         'nyc',
         '--reporter=html',
+        '--reporter=json-summary',
         '--report-dir=./target/kibana-coverage/mocha',
         NODE,
         'scripts/mocha',
diff --git a/tasks/function_test_groups.js b/tasks/function_test_groups.js
index 7854e2cd49837b..7b7293dc9a037d 100644
--- a/tasks/function_test_groups.js
+++ b/tasks/function_test_groups.js
@@ -29,6 +29,21 @@ const TEST_TAGS = safeLoad(JOBS_YAML)
   .JOB.filter(id => id.startsWith('kibana-ciGroup'))
   .map(id => id.replace(/^kibana-/, ''));
 
+const getDefaultArgs = tag => {
+  return [
+    'scripts/functional_tests',
+    '--include-tag',
+    tag,
+    '--config',
+    'test/functional/config.js',
+    '--config',
+    'test/ui_capabilities/newsfeed_err/config.ts',
+    // '--config', 'test/functional/config.firefox.js',
+    '--bail',
+    '--debug',
+  ];
+};
+
 export function getFunctionalTestGroupRunConfigs({ kibanaInstallDir } = {}) {
   return {
     // include a run task for each test group
@@ -38,18 +53,8 @@ export function getFunctionalTestGroupRunConfigs({ kibanaInstallDir } = {}) {
         [`functionalTests_${tag}`]: {
           cmd: process.execPath,
           args: [
-            'scripts/functional_tests',
-            '--include-tag',
-            tag,
-            '--config',
-            'test/functional/config.js',
-            '--config',
-            'test/ui_capabilities/newsfeed_err/config.ts',
-            // '--config', 'test/functional/config.firefox.js',
-            '--bail',
-            '--debug',
-            '--kibana-install-dir',
-            kibanaInstallDir,
+            ...getDefaultArgs(tag),
+            ...(!!process.env.CODE_COVERAGE ? [] : ['--kibana-install-dir', kibanaInstallDir]),
           ],
         },
       }),
diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index 69c27936210951..afe8499a1c2ea3 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -100,7 +100,9 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
     .subscribe({
       next({ message, level }) {
         const msg = message.replace(/\\n/g, '\n');
-        log[level === 'SEVERE' ? 'error' : 'debug'](`browser[${level}] ${msg}`);
+        log[level === 'SEVERE' || level === 'error' ? 'error' : 'debug'](
+          `browser[${level}] ${msg}`
+        );
       },
     });
 
diff --git a/test/scripts/jenkins_build_kibana.sh b/test/scripts/jenkins_build_kibana.sh
index f79fe98e07bef4..2605655ed7e7ad 100755
--- a/test/scripts/jenkins_build_kibana.sh
+++ b/test/scripts/jenkins_build_kibana.sh
@@ -8,5 +8,8 @@ node scripts/es snapshot --license=oss --download-only;
 echo " -> Ensuring all functional tests are in a ciGroup"
 yarn run grunt functionalTests:ensureAllTestsInCiGroup;
 
-echo " -> building and extracting OSS Kibana distributable for use in functional tests"
-node scripts/build --debug --oss
+# Do not build kibana for code coverage run
+if [[ -z "$CODE_COVERAGE" ]] ; then
+  echo " -> building and extracting OSS Kibana distributable for use in functional tests"
+  node scripts/build --debug --oss
+fi
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index 1cb566c908dbfb..fccdb29ff512bd 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -2,22 +2,30 @@
 
 source test/scripts/jenkins_test_setup.sh
 
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  yarn run grunt functionalTests:ensureAllTestsInCiGroup;
-  node scripts/build --debug --oss;
-else
-  installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
-  destDir=${installDir}-${CI_WORKER_NUMBER}
-  cp -R "$installDir" "$destDir"
+if [[ -z "$CODE_COVERAGE" ]] ; then
+  if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+    yarn run grunt functionalTests:ensureAllTestsInCiGroup;
+    node scripts/build --debug --oss;
+  else
+    installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
+    destDir=${installDir}-${CI_WORKER_NUMBER}
+    cp -R "$installDir" "$destDir"
 
-  export KIBANA_INSTALL_DIR="$destDir"
-fi
+    export KIBANA_INSTALL_DIR="$destDir"
+  fi
+
+  checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
+
+  if [ "$CI_GROUP" == "1" ]; then
+    source test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh
+    yarn run grunt run:pluginFunctionalTestsRelease --from=source;
+    yarn run grunt run:exampleFunctionalTestsRelease --from=source;
+    yarn run grunt run:interpreterFunctionalTestsRelease;
+  fi
+else
+  echo " -> Running Functional tests with code coverage"
 
-checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
+  export NODE_OPTIONS=--max_old_space_size=8192
 
-if [ "$CI_GROUP" == "1" ]; then
-  source test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh
-  yarn run grunt run:pluginFunctionalTestsRelease --from=source;
-  yarn run grunt run:exampleFunctionalTestsRelease --from=source;
-  yarn run grunt run:interpreterFunctionalTestsRelease;
+  yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
 fi
diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
index 75610884b542fd..a8b5e8e4fdf976 100755
--- a/test/scripts/jenkins_unit.sh
+++ b/test/scripts/jenkins_unit.sh
@@ -4,4 +4,16 @@ set -e
 
 export TEST_BROWSER_HEADLESS=1
 
-"$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --dev;
+if [[ -z "$CODE_COVERAGE" ]] ; then
+  "$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --dev;
+else
+  echo "NODE_ENV=$NODE_ENV"
+  echo " -> Running jest tests with coverage"
+  node scripts/jest --ci --verbose --coverage
+  echo ""
+  echo ""
+  echo " -> Running mocha tests with coverage"
+  yarn run grunt "test:mochaCoverage";
+  echo ""
+  echo ""
+fi
diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
index 27f73c0b6e20d2..e0055085d9b372 100755
--- a/test/scripts/jenkins_xpack.sh
+++ b/test/scripts/jenkins_xpack.sh
@@ -4,33 +4,48 @@ set -e
 
 export TEST_BROWSER_HEADLESS=1
 
-echo " -> Running mocha tests"
-cd "$XPACK_DIR"
-checks-reporter-with-killswitch "X-Pack Karma Tests" yarn test:browser
-echo ""
-echo ""
-
-echo " -> Running jest tests"
-cd "$XPACK_DIR"
-checks-reporter-with-killswitch "X-Pack Jest" node scripts/jest --ci --verbose
-echo ""
-echo ""
-
-echo " -> Running SIEM cyclic dependency test"
-cd "$XPACK_DIR"
-checks-reporter-with-killswitch "X-Pack SIEM cyclic dependency test" node legacy/plugins/siem/scripts/check_circular_deps
-echo ""
-echo ""
-
-# FAILING: https://github.com/elastic/kibana/issues/44250
-# echo " -> Running jest contracts tests"
-# cd "$XPACK_DIR"
-# SLAPSHOT_ONLINE=true CONTRACT_ONLINE=true node scripts/jest_contract.js --ci --verbose
-# echo ""
-# echo ""
-
-# echo " -> Running jest integration tests"
-# cd "$XPACK_DIR"
-# node scripts/jest_integration --ci --verbose
-# echo ""
-# echo ""
+if [[ -z "$CODE_COVERAGE" ]] ; then
+  echo " -> Running mocha tests"
+  cd "$XPACK_DIR"
+  checks-reporter-with-killswitch "X-Pack Karma Tests" yarn test:browser
+  echo ""
+  echo ""
+    
+  echo " -> Running jest tests"
+  cd "$XPACK_DIR"
+  checks-reporter-with-killswitch "X-Pack Jest" node scripts/jest --ci --verbose
+  echo ""
+  echo ""
+    
+  echo " -> Running SIEM cyclic dependency test"
+  cd "$XPACK_DIR"
+  checks-reporter-with-killswitch "X-Pack SIEM cyclic dependency test" node legacy/plugins/siem/scripts/check_circular_deps
+  echo ""
+  echo ""
+    
+  # FAILING: https://github.com/elastic/kibana/issues/44250
+  # echo " -> Running jest contracts tests"
+  # cd "$XPACK_DIR"
+  # SLAPSHOT_ONLINE=true CONTRACT_ONLINE=true node scripts/jest_contract.js --ci --verbose
+  # echo ""
+  # echo ""
+    
+  # echo " -> Running jest integration tests"
+  # cd "$XPACK_DIR"
+  # node scripts/jest_integration --ci --verbose
+  # echo ""
+  # echo ""
+else
+  echo " -> Running jest tests with coverage"
+  cd "$XPACK_DIR"
+  # build runtime for canvas
+  echo "NODE_ENV=$NODE_ENV"
+  node ./legacy/plugins/canvas/scripts/shareable_runtime
+  node scripts/jest --ci --verbose --coverage
+  # rename file in order to be unique one
+  test -f ../target/kibana-coverage/jest/coverage-final.json \
+    && mv ../target/kibana-coverage/jest/coverage-final.json \
+    ../target/kibana-coverage/jest/xpack-coverage-final.json
+  echo ""
+  echo ""
+fi
\ No newline at end of file
diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh
index 9f2bafc863f41a..20b12b302cb397 100755
--- a/test/scripts/jenkins_xpack_build_kibana.sh
+++ b/test/scripts/jenkins_xpack_build_kibana.sh
@@ -20,10 +20,13 @@ node scripts/functional_tests --assert-none-excluded \
   --include-tag ciGroup9 \
   --include-tag ciGroup10
 
-echo " -> building and extracting default Kibana distributable for use in functional tests"
-cd "$KIBANA_DIR"
-node scripts/build --debug --no-oss
-linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
-installDir="$PARENT_DIR/install/kibana"
-mkdir -p "$installDir"
-tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+# Do not build kibana for code coverage run
+if [[ -z "$CODE_COVERAGE" ]] ; then
+  echo " -> building and extracting default Kibana distributable for use in functional tests"
+  cd "$KIBANA_DIR"
+  node scripts/build --debug --no-oss
+  linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
+  installDir="$PARENT_DIR/install/kibana"
+  mkdir -p "$installDir"
+  tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+fi
diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
index fba05f8f252d76..58c407a848ae3d 100755
--- a/test/scripts/jenkins_xpack_ci_group.sh
+++ b/test/scripts/jenkins_xpack_ci_group.sh
@@ -2,59 +2,60 @@
 
 source test/scripts/jenkins_test_setup.sh
 
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  echo " -> Ensuring all functional tests are in a ciGroup"
+if [[ -z "$CODE_COVERAGE" ]] ; then
+  if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+    echo " -> Ensuring all functional tests are in a ciGroup"
+    cd "$XPACK_DIR"
+    node scripts/functional_tests --assert-none-excluded \
+      --include-tag ciGroup1 \
+      --include-tag ciGroup2 \
+      --include-tag ciGroup3 \
+      --include-tag ciGroup4 \
+      --include-tag ciGroup5 \
+      --include-tag ciGroup6 \
+      --include-tag ciGroup7 \
+      --include-tag ciGroup8 \
+      --include-tag ciGroup9 \
+      --include-tag ciGroup10
+  fi
+
+  cd "$KIBANA_DIR"
+
+  if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+    echo " -> building and extracting default Kibana distributable for use in functional tests"
+    node scripts/build --debug --no-oss
+
+    linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
+    installDir="$PARENT_DIR/install/kibana"
+
+    mkdir -p "$installDir"
+    tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+
+    export KIBANA_INSTALL_DIR="$installDir"
+  else
+    installDir="$PARENT_DIR/install/kibana"
+    destDir="${installDir}-${CI_WORKER_NUMBER}"
+    cp -R "$installDir" "$destDir"
+
+    export KIBANA_INSTALL_DIR="$destDir"
+  fi
+
+  echo " -> Running functional and api tests"
   cd "$XPACK_DIR"
-  node scripts/functional_tests --assert-none-excluded \
-    --include-tag ciGroup1 \
-    --include-tag ciGroup2 \
-    --include-tag ciGroup3 \
-    --include-tag ciGroup4 \
-    --include-tag ciGroup5 \
-    --include-tag ciGroup6 \
-    --include-tag ciGroup7 \
-    --include-tag ciGroup8 \
-    --include-tag ciGroup9 \
-    --include-tag ciGroup10
-fi
-
-cd "$KIBANA_DIR"
-
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  echo " -> building and extracting default Kibana distributable for use in functional tests"
-  node scripts/build --debug --no-oss
-
-  linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
-  installDir="$PARENT_DIR/install/kibana"
 
-  mkdir -p "$installDir"
-  tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+  checks-reporter-with-killswitch "X-Pack Chrome Functional tests / Group ${CI_GROUP}" \
+    node scripts/functional_tests \
+      --debug --bail \
+      --kibana-install-dir "$KIBANA_INSTALL_DIR" \
+      --include-tag "ciGroup$CI_GROUP"
 
-  export KIBANA_INSTALL_DIR="$installDir"
+  echo ""
+  echo ""
 else
-  installDir="$PARENT_DIR/install/kibana"
-  destDir="${installDir}-${CI_WORKER_NUMBER}"
-  cp -R "$installDir" "$destDir"
+  echo " -> Running X-Pack functional tests with code coverage"
+  cd "$XPACK_DIR"
 
-  export KIBANA_INSTALL_DIR="$destDir"
-fi
+  export NODE_OPTIONS=--max_old_space_size=8192
 
-echo " -> Running functional and api tests"
-cd "$XPACK_DIR"
-
-checks-reporter-with-killswitch "X-Pack Chrome Functional tests / Group ${CI_GROUP}" \
-  node scripts/functional_tests \
-    --debug --bail \
-    --kibana-install-dir "$KIBANA_INSTALL_DIR" \
-    --include-tag "ciGroup$CI_GROUP"
-
-echo ""
-echo ""
-
-# checks-reporter-with-killswitch "X-Pack Firefox Functional tests / Group ${CI_GROUP}" \
-#   node scripts/functional_tests --debug --bail \
-#   --kibana-install-dir "$installDir" \
-#   --include-tag "ciGroup$CI_GROUP" \
-#   --config "test/functional/config.firefox.js"
-# echo ""
-# echo ""
+  node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP"
+fi
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index c778dd799f6e59..5c6be70514c610 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -176,6 +176,18 @@ def uploadGcsArtifact(uploadPrefix, pattern) {
   )
 }
 
+def downloadCoverageArtifacts() {
+  def storageLocation = "gs://kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/coverage/"
+  def targetLocation = "/tmp/downloaded_coverage"
+
+  sh "mkdir -p '${targetLocation}' && gsutil -m cp -r '${storageLocation}' '${targetLocation}'"
+}
+
+def uploadCoverageArtifacts(prefix, pattern) {
+  def uploadPrefix = "kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/coverage/${prefix}"
+  uploadGcsArtifact(uploadPrefix, pattern)
+}
+
 def withGcsArtifactUpload(workerName, closure) {
   def uploadPrefix = "kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/${workerName}"
   def ARTIFACT_PATTERNS = [
@@ -201,6 +213,11 @@ def withGcsArtifactUpload(workerName, closure) {
       }
     }
   })
+
+  if (env.CODE_COVERAGE) {
+    sh 'tar -czf kibana-coverage.tar.gz target/kibana-coverage/**/*'
+    uploadGcsArtifact("kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/coverage/${workerName}", 'kibana-coverage.tar.gz')
+  }
 }
 
 def publishJunit() {
diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js
index cd4414b5fdebe6..02904cc48e0306 100644
--- a/x-pack/dev-tools/jest/create_jest_config.js
+++ b/x-pack/dev-tools/jest/create_jest_config.js
@@ -30,7 +30,7 @@ export function createJestConfig({ kibanaDirectory, xPackKibanaDirectory }) {
       '^test_utils/find_test_subject': `${xPackKibanaDirectory}/test_utils/find_test_subject.ts`,
     },
     coverageDirectory: '<rootDir>/../target/kibana-coverage/jest',
-    coverageReporters: ['html'],
+    coverageReporters: !!process.env.CODE_COVERAGE ? ['json'] : ['html'],
     setupFiles: [
       `${kibanaDirectory}/src/dev/jest/setup/babel_polyfill.js`,
       `<rootDir>/dev-tools/jest/setup/polyfills.js`,
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index 2b92e70fb30afa..86db39823ba91c 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -4,38 +4,43 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-require('@kbn/plugin-helpers').babelRegister();
-require('@kbn/test').runTestsCli([
+const alwaysImportedTests = [require.resolve('../test/functional/config.js')];
+const onlyNotInCoverageTests = [
   require.resolve('../test/reporting/configs/chromium_api.js'),
   require.resolve('../test/reporting/configs/chromium_functional.js'),
-  require.resolve('../test/reporting/configs/generate_api'),
-  require.resolve('../test/functional/config.js'),
+  require.resolve('../test/reporting/configs/generate_api.js'),
   require.resolve('../test/api_integration/config_security_basic.js'),
   require.resolve('../test/api_integration/config.js'),
   require.resolve('../test/alerting_api_integration/spaces_only/config.ts'),
   require.resolve('../test/alerting_api_integration/security_and_spaces/config.ts'),
   require.resolve('../test/plugin_api_integration/config.js'),
-  require.resolve('../test/plugin_functional/config'),
-  require.resolve('../test/kerberos_api_integration/config'),
-  require.resolve('../test/kerberos_api_integration/anonymous_access.config'),
-  require.resolve('../test/saml_api_integration/config'),
-  require.resolve('../test/token_api_integration/config'),
-  require.resolve('../test/oidc_api_integration/config'),
-  require.resolve('../test/oidc_api_integration/implicit_flow.config'),
-  require.resolve('../test/pki_api_integration/config'),
-  require.resolve('../test/spaces_api_integration/spaces_only/config'),
-  require.resolve('../test/spaces_api_integration/security_and_spaces/config_trial'),
-  require.resolve('../test/spaces_api_integration/security_and_spaces/config_basic'),
-  require.resolve('../test/saved_object_api_integration/security_and_spaces/config_trial'),
-  require.resolve('../test/saved_object_api_integration/security_and_spaces/config_basic'),
-  require.resolve('../test/saved_object_api_integration/security_only/config_trial'),
-  require.resolve('../test/saved_object_api_integration/security_only/config_basic'),
-  require.resolve('../test/saved_object_api_integration/spaces_only/config'),
-  require.resolve('../test/ui_capabilities/security_and_spaces/config'),
-  require.resolve('../test/ui_capabilities/security_only/config'),
-  require.resolve('../test/ui_capabilities/spaces_only/config'),
-  require.resolve('../test/upgrade_assistant_integration/config'),
-  require.resolve('../test/licensing_plugin/config'),
-  require.resolve('../test/licensing_plugin/config.public'),
-  require.resolve('../test/licensing_plugin/config.legacy'),
+  require.resolve('../test/plugin_functional/config.ts'),
+  require.resolve('../test/kerberos_api_integration/config.ts'),
+  require.resolve('../test/kerberos_api_integration/anonymous_access.config.ts'),
+  require.resolve('../test/saml_api_integration/config.ts'),
+  require.resolve('../test/token_api_integration/config.js'),
+  require.resolve('../test/oidc_api_integration/config.ts'),
+  require.resolve('../test/oidc_api_integration/implicit_flow.config.ts'),
+  require.resolve('../test/pki_api_integration/config.ts'),
+  require.resolve('../test/spaces_api_integration/spaces_only/config.ts'),
+  require.resolve('../test/spaces_api_integration/security_and_spaces/config_trial.ts'),
+  require.resolve('../test/spaces_api_integration/security_and_spaces/config_basic.ts'),
+  require.resolve('../test/saved_object_api_integration/security_and_spaces/config_trial.ts'),
+  require.resolve('../test/saved_object_api_integration/security_and_spaces/config_basic.ts'),
+  require.resolve('../test/saved_object_api_integration/security_only/config_trial.ts'),
+  require.resolve('../test/saved_object_api_integration/security_only/config_basic.ts'),
+  require.resolve('../test/saved_object_api_integration/spaces_only/config.ts'),
+  require.resolve('../test/ui_capabilities/security_and_spaces/config.ts'),
+  require.resolve('../test/ui_capabilities/security_only/config.ts'),
+  require.resolve('../test/ui_capabilities/spaces_only/config.ts'),
+  require.resolve('../test/upgrade_assistant_integration/config.js'),
+  require.resolve('../test/licensing_plugin/config.ts'),
+  require.resolve('../test/licensing_plugin/config.public.ts'),
+  require.resolve('../test/licensing_plugin/config.legacy.ts'),
+];
+
+require('@kbn/plugin-helpers').babelRegister();
+require('@kbn/test').runTestsCli([
+  ...alwaysImportedTests,
+  ...(!!process.env.CODE_COVERAGE ? [] : onlyNotInCoverageTests),
 ]);

From 303e4842ea14f9316bfa28d3029e2abcc92acb6d Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Wed, 8 Jan 2020 14:28:29 -0700
Subject: [PATCH 66/96] [SIEM] [Case] Case workflow api schema (#51535)

---
 .../lib/case/saved_object_mappings_temp.ts    |  91 +++++++++
 x-pack/plugins/case/README.md                 |   9 +
 x-pack/plugins/case/kibana.json               |   9 +
 x-pack/plugins/case/server/config.ts          |  15 ++
 x-pack/plugins/case/server/constants.ts       |   8 +
 x-pack/plugins/case/server/index.ts           |  14 ++
 x-pack/plugins/case/server/plugin.ts          |  63 ++++++
 .../routes/api/__fixtures__/authc_mock.ts     |  35 ++++
 .../__fixtures__/create_mock_so_repository.ts |  77 +++++++
 .../server/routes/api/__fixtures__/index.ts   |  11 +
 .../routes/api/__fixtures__/mock_router.ts    |  34 ++++
 .../api/__fixtures__/mock_saved_objects.ts    | 143 +++++++++++++
 .../routes/api/__fixtures__/route_contexts.ts |  17 ++
 .../routes/api/__tests__/delete_case.test.ts  |  83 ++++++++
 .../api/__tests__/delete_comment.test.ts      |  53 +++++
 .../api/__tests__/get_all_cases.test.ts       |  34 ++++
 .../routes/api/__tests__/get_case.test.ts     | 101 +++++++++
 .../routes/api/__tests__/get_comment.test.ts  |  51 +++++
 .../routes/api/__tests__/post_case.test.ts    |  82 ++++++++
 .../routes/api/__tests__/post_comment.test.ts |  97 +++++++++
 .../routes/api/__tests__/update_case.test.ts  |  59 ++++++
 .../api/__tests__/update_comment.test.ts      |  59 ++++++
 .../case/server/routes/api/delete_case.ts     |  56 +++++
 .../case/server/routes/api/delete_comment.ts  |  34 ++++
 .../routes/api/get_all_case_comments.ts       |  33 +++
 .../case/server/routes/api/get_all_cases.ts   |  27 +++
 .../case/server/routes/api/get_case.ts        |  49 +++++
 .../case/server/routes/api/get_comment.ts     |  33 +++
 .../plugins/case/server/routes/api/index.ts   |  36 ++++
 .../case/server/routes/api/post_case.ts       |  40 ++++
 .../case/server/routes/api/post_comment.ts    |  62 ++++++
 .../plugins/case/server/routes/api/schema.ts  |  44 ++++
 .../plugins/case/server/routes/api/types.ts   |  36 ++++
 .../case/server/routes/api/update_case.ts     |  36 ++++
 .../case/server/routes/api/update_comment.ts  |  36 ++++
 .../plugins/case/server/routes/api/utils.ts   |  48 +++++
 x-pack/plugins/case/server/services/index.ts  | 192 ++++++++++++++++++
 x-pack/plugins/security/server/index.ts       |   2 +
 38 files changed, 1909 insertions(+)
 create mode 100644 x-pack/legacy/plugins/siem/server/lib/case/saved_object_mappings_temp.ts
 create mode 100644 x-pack/plugins/case/README.md
 create mode 100644 x-pack/plugins/case/kibana.json
 create mode 100644 x-pack/plugins/case/server/config.ts
 create mode 100644 x-pack/plugins/case/server/constants.ts
 create mode 100644 x-pack/plugins/case/server/index.ts
 create mode 100644 x-pack/plugins/case/server/plugin.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__fixtures__/authc_mock.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__fixtures__/create_mock_so_repository.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__fixtures__/index.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__fixtures__/mock_router.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__fixtures__/mock_saved_objects.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__fixtures__/route_contexts.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/delete_case.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/delete_comment.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/get_all_cases.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/get_case.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/get_comment.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/post_case.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/post_comment.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/update_case.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/__tests__/update_comment.test.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/delete_case.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/delete_comment.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/get_all_case_comments.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/get_all_cases.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/get_case.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/get_comment.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/index.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/post_case.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/post_comment.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/schema.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/types.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/update_case.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/update_comment.ts
 create mode 100644 x-pack/plugins/case/server/routes/api/utils.ts
 create mode 100644 x-pack/plugins/case/server/services/index.ts

diff --git a/x-pack/legacy/plugins/siem/server/lib/case/saved_object_mappings_temp.ts b/x-pack/legacy/plugins/siem/server/lib/case/saved_object_mappings_temp.ts
new file mode 100644
index 00000000000000..bd73805600a338
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/case/saved_object_mappings_temp.ts
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/* eslint-disable @typescript-eslint/no-empty-interface */
+/* eslint-disable @typescript-eslint/camelcase */
+import {
+  NewCaseFormatted,
+  NewCommentFormatted,
+} from '../../../../../../../x-pack/plugins/case/server';
+import { ElasticsearchMappingOf } from '../../utils/typed_elasticsearch_mappings';
+
+// Temporary file to write mappings for case
+// while Saved Object Mappings API is programmed for the NP
+// See: https://github.com/elastic/kibana/issues/50309
+
+export const caseSavedObjectType = 'case-workflow';
+export const caseCommentSavedObjectType = 'case-workflow-comment';
+
+export const caseSavedObjectMappings: {
+  [caseSavedObjectType]: ElasticsearchMappingOf<NewCaseFormatted>;
+} = {
+  [caseSavedObjectType]: {
+    properties: {
+      assignees: {
+        properties: {
+          username: {
+            type: 'keyword',
+          },
+          full_name: {
+            type: 'keyword',
+          },
+        },
+      },
+      created_at: {
+        type: 'date',
+      },
+      description: {
+        type: 'text',
+      },
+      title: {
+        type: 'keyword',
+      },
+      created_by: {
+        properties: {
+          username: {
+            type: 'keyword',
+          },
+          full_name: {
+            type: 'keyword',
+          },
+        },
+      },
+      state: {
+        type: 'keyword',
+      },
+      tags: {
+        type: 'keyword',
+      },
+      case_type: {
+        type: 'keyword',
+      },
+    },
+  },
+};
+
+export const caseCommentSavedObjectMappings: {
+  [caseCommentSavedObjectType]: ElasticsearchMappingOf<NewCommentFormatted>;
+} = {
+  [caseCommentSavedObjectType]: {
+    properties: {
+      comment: {
+        type: 'text',
+      },
+      created_at: {
+        type: 'date',
+      },
+      created_by: {
+        properties: {
+          full_name: {
+            type: 'keyword',
+          },
+          username: {
+            type: 'keyword',
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/x-pack/plugins/case/README.md b/x-pack/plugins/case/README.md
new file mode 100644
index 00000000000000..c0acb878352079
--- /dev/null
+++ b/x-pack/plugins/case/README.md
@@ -0,0 +1,9 @@
+# Case Workflow
+
+*Experimental Feature*
+
+Elastic is developing a Case Management Workflow. Follow our progress:
+
+- [Case API Documentation](https://documenter.getpostman.com/view/172706/SW7c2SuF?version=latest)
+- [Github Meta](https://github.com/elastic/kibana/issues/50103)
+
diff --git a/x-pack/plugins/case/kibana.json b/x-pack/plugins/case/kibana.json
new file mode 100644
index 00000000000000..23e3cc789ad3b3
--- /dev/null
+++ b/x-pack/plugins/case/kibana.json
@@ -0,0 +1,9 @@
+{
+  "configPath": ["xpack", "case"],
+  "id": "case",
+  "kibanaVersion": "kibana",
+  "requiredPlugins": ["security"],
+  "server": true,
+  "ui": false,
+  "version": "8.0.0"
+}
diff --git a/x-pack/plugins/case/server/config.ts b/x-pack/plugins/case/server/config.ts
new file mode 100644
index 00000000000000..a7cb117198f9b7
--- /dev/null
+++ b/x-pack/plugins/case/server/config.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 { schema, TypeOf } from '@kbn/config-schema';
+
+export const ConfigSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: false }),
+  indexPattern: schema.string({ defaultValue: '.case-test-2' }),
+  secret: schema.string({ defaultValue: 'Cool secret huh?' }),
+});
+
+export type ConfigType = TypeOf<typeof ConfigSchema>;
diff --git a/x-pack/plugins/case/server/constants.ts b/x-pack/plugins/case/server/constants.ts
new file mode 100644
index 00000000000000..276dcd135254a3
--- /dev/null
+++ b/x-pack/plugins/case/server/constants.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const CASE_SAVED_OBJECT = 'case-workflow';
+export const CASE_COMMENT_SAVED_OBJECT = 'case-workflow-comment';
diff --git a/x-pack/plugins/case/server/index.ts b/x-pack/plugins/case/server/index.ts
new file mode 100644
index 00000000000000..3963debea97955
--- /dev/null
+++ b/x-pack/plugins/case/server/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializerContext } from '../../../../src/core/server';
+import { ConfigSchema } from './config';
+import { CasePlugin } from './plugin';
+export { NewCaseFormatted, NewCommentFormatted } from './routes/api/types';
+
+export const config = { schema: ConfigSchema };
+export const plugin = (initializerContext: PluginInitializerContext) =>
+  new CasePlugin(initializerContext);
diff --git a/x-pack/plugins/case/server/plugin.ts b/x-pack/plugins/case/server/plugin.ts
new file mode 100644
index 00000000000000..c52461cade0586
--- /dev/null
+++ b/x-pack/plugins/case/server/plugin.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { first, map } from 'rxjs/operators';
+import { CoreSetup, Logger, PluginInitializerContext } from 'kibana/server';
+import { ConfigType } from './config';
+import { initCaseApi } from './routes/api';
+import { CaseService } from './services';
+import { PluginSetupContract as SecurityPluginSetup } from '../../security/server';
+
+function createConfig$(context: PluginInitializerContext) {
+  return context.config.create<ConfigType>().pipe(map(config => config));
+}
+
+export interface PluginsSetup {
+  security: SecurityPluginSetup;
+}
+
+export class CasePlugin {
+  private readonly log: Logger;
+
+  constructor(private readonly initializerContext: PluginInitializerContext) {
+    this.log = this.initializerContext.logger.get();
+  }
+
+  public async setup(core: CoreSetup, plugins: PluginsSetup) {
+    const config = await createConfig$(this.initializerContext)
+      .pipe(first())
+      .toPromise();
+
+    if (!config.enabled) {
+      return;
+    }
+    const service = new CaseService(this.log);
+
+    this.log.debug(
+      `Setting up Case Workflow with core contract [${Object.keys(
+        core
+      )}] and plugins [${Object.keys(plugins)}]`
+    );
+
+    const caseService = await service.setup({
+      authentication: plugins.security.authc,
+    });
+
+    const router = core.http.createRouter();
+    initCaseApi({
+      caseService,
+      router,
+    });
+  }
+
+  public start() {
+    this.log.debug(`Starting Case Workflow`);
+  }
+
+  public stop() {
+    this.log.debug(`Stopping Case Workflow`);
+  }
+}
diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/authc_mock.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/authc_mock.ts
new file mode 100644
index 00000000000000..94ce9627b9ac64
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__fixtures__/authc_mock.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { Authentication } from '../../../../../security/server';
+
+const getCurrentUser = jest.fn().mockReturnValue({
+  username: 'awesome',
+  full_name: 'Awesome D00d',
+});
+const getCurrentUserThrow = jest.fn().mockImplementation(() => {
+  throw new Error('Bad User - the user is not authenticated');
+});
+
+export const authenticationMock = {
+  create: (): jest.Mocked<Authentication> => ({
+    login: jest.fn(),
+    createAPIKey: jest.fn(),
+    getCurrentUser,
+    invalidateAPIKey: jest.fn(),
+    isAuthenticated: jest.fn(),
+    logout: jest.fn(),
+    getSessionInfo: jest.fn(),
+  }),
+  createInvalid: (): jest.Mocked<Authentication> => ({
+    login: jest.fn(),
+    createAPIKey: jest.fn(),
+    getCurrentUser: getCurrentUserThrow,
+    invalidateAPIKey: jest.fn(),
+    isAuthenticated: jest.fn(),
+    logout: jest.fn(),
+    getSessionInfo: jest.fn(),
+  }),
+};
diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/create_mock_so_repository.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/create_mock_so_repository.ts
new file mode 100644
index 00000000000000..360c6de67b2a81
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__fixtures__/create_mock_so_repository.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectsClientContract, SavedObjectsErrorHelpers } from 'src/core/server';
+import { CASE_COMMENT_SAVED_OBJECT } from '../../../constants';
+
+export const createMockSavedObjectsRepository = (savedObject: any[] = []) => {
+  const mockSavedObjectsClientContract = ({
+    get: jest.fn((type, id) => {
+      const result = savedObject.filter(s => s.id === id);
+      if (!result.length) {
+        throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+      }
+      return result[0];
+    }),
+    find: jest.fn(findArgs => {
+      if (findArgs.hasReference && findArgs.hasReference.id === 'bad-guy') {
+        throw SavedObjectsErrorHelpers.createBadRequestError('Error thrown for testing');
+      }
+      return {
+        total: savedObject.length,
+        saved_objects: savedObject,
+      };
+    }),
+    create: jest.fn((type, attributes, references) => {
+      if (attributes.description === 'Throw an error' || attributes.comment === 'Throw an error') {
+        throw SavedObjectsErrorHelpers.createBadRequestError('Error thrown for testing');
+      }
+      if (type === CASE_COMMENT_SAVED_OBJECT) {
+        return {
+          type,
+          id: 'mock-comment',
+          attributes,
+          ...references,
+          updated_at: '2019-12-02T22:48:08.327Z',
+          version: 'WzksMV0=',
+        };
+      }
+      return {
+        type,
+        id: 'mock-it',
+        attributes,
+        references: [],
+        updated_at: '2019-12-02T22:48:08.327Z',
+        version: 'WzksMV0=',
+      };
+    }),
+    update: jest.fn((type, id, attributes) => {
+      if (!savedObject.find(s => s.id === id)) {
+        throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+      }
+      return {
+        id,
+        type,
+        updated_at: '2019-11-22T22:50:55.191Z',
+        version: 'WzE3LDFd',
+        attributes,
+      };
+    }),
+    delete: jest.fn((type: string, id: string) => {
+      const result = savedObject.filter(s => s.id === id);
+      if (!result.length) {
+        throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+      }
+      if (type === 'case-workflow-comment' && id === 'bad-guy') {
+        throw SavedObjectsErrorHelpers.createBadRequestError('Error thrown for testing');
+      }
+      return {};
+    }),
+    deleteByNamespace: jest.fn(),
+  } as unknown) as jest.Mocked<SavedObjectsClientContract>;
+
+  return mockSavedObjectsClientContract;
+};
diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/index.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/index.ts
new file mode 100644
index 00000000000000..e1fec2d6b229ce
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__fixtures__/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { mockCases, mockCasesErrorTriggerData, mockCaseComments } from './mock_saved_objects';
+export { createMockSavedObjectsRepository } from './create_mock_so_repository';
+export { createRouteContext } from './route_contexts';
+export { authenticationMock } from './authc_mock';
+export { createRoute } from './mock_router';
diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/mock_router.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/mock_router.ts
new file mode 100644
index 00000000000000..84889c3ac49be1
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__fixtures__/mock_router.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IRouter } from 'kibana/server';
+import { loggingServiceMock, httpServiceMock } from '../../../../../../../src/core/server/mocks';
+import { CaseService } from '../../../services';
+import { authenticationMock } from '../__fixtures__';
+import { RouteDeps } from '../index';
+
+export const createRoute = async (
+  api: (deps: RouteDeps) => void,
+  method: 'get' | 'post' | 'delete',
+  badAuth = false
+) => {
+  const httpService = httpServiceMock.createSetupContract();
+  const router = httpService.createRouter('') as jest.Mocked<IRouter>;
+
+  const log = loggingServiceMock.create().get('case');
+
+  const service = new CaseService(log);
+  const caseService = await service.setup({
+    authentication: badAuth ? authenticationMock.createInvalid() : authenticationMock.create(),
+  });
+
+  api({
+    router,
+    caseService,
+  });
+
+  return router[method].mock.calls[0][1];
+};
diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/mock_saved_objects.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/mock_saved_objects.ts
new file mode 100644
index 00000000000000..d59f0977e69934
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__fixtures__/mock_saved_objects.ts
@@ -0,0 +1,143 @@
+/*
+ * 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 mockCases = [
+  {
+    type: 'case-workflow',
+    id: 'mock-id-1',
+    attributes: {
+      created_at: 1574718888885,
+      created_by: {
+        full_name: null,
+        username: 'elastic',
+      },
+      description: 'This is a brand new case of a bad meanie defacing data',
+      title: 'Super Bad Security Issue',
+      state: 'open',
+      tags: ['defacement'],
+      case_type: 'security',
+      assignees: [],
+    },
+    references: [],
+    updated_at: '2019-11-25T21:54:48.952Z',
+    version: 'WzAsMV0=',
+  },
+  {
+    type: 'case-workflow',
+    id: 'mock-id-2',
+    attributes: {
+      created_at: 1574721120834,
+      created_by: {
+        full_name: null,
+        username: 'elastic',
+      },
+      description: 'Oh no, a bad meanie destroying data!',
+      title: 'Damaging Data Destruction Detected',
+      state: 'open',
+      tags: ['Data Destruction'],
+      case_type: 'security',
+      assignees: [],
+    },
+    references: [],
+    updated_at: '2019-11-25T22:32:00.900Z',
+    version: 'WzQsMV0=',
+  },
+  {
+    type: 'case-workflow',
+    id: 'mock-id-3',
+    attributes: {
+      created_at: 1574721137881,
+      created_by: {
+        full_name: null,
+        username: 'elastic',
+      },
+      description: 'Oh no, a bad meanie going LOLBins all over the place!',
+      title: 'Another bad one',
+      state: 'open',
+      tags: ['LOLBins'],
+      case_type: 'security',
+      assignees: [],
+    },
+    references: [],
+    updated_at: '2019-11-25T22:32:17.947Z',
+    version: 'WzUsMV0=',
+  },
+];
+
+export const mockCasesErrorTriggerData = [
+  {
+    id: 'valid-id',
+  },
+  {
+    id: 'bad-guy',
+  },
+];
+
+export const mockCaseComments = [
+  {
+    type: 'case-workflow-comment',
+    id: 'mock-comment-1',
+    attributes: {
+      comment: 'Wow, good luck catching that bad meanie!',
+      created_at: 1574718900112,
+      created_by: {
+        full_name: null,
+        username: 'elastic',
+      },
+    },
+    references: [
+      {
+        type: 'case-workflow',
+        name: 'associated-case-workflow',
+        id: 'mock-id-1',
+      },
+    ],
+    updated_at: '2019-11-25T21:55:00.177Z',
+    version: 'WzEsMV0=',
+  },
+  {
+    type: 'case-workflow-comment',
+    id: 'mock-comment-2',
+    attributes: {
+      comment: 'Well I decided to update my comment. So what? Deal with it.',
+      created_at: 1574718902724,
+      created_by: {
+        full_name: null,
+        username: 'elastic',
+      },
+    },
+    references: [
+      {
+        type: 'case-workflow',
+        name: 'associated-case-workflow',
+        id: 'mock-id-1',
+      },
+    ],
+    updated_at: '2019-11-25T21:55:14.633Z',
+    version: 'WzMsMV0=',
+  },
+  {
+    type: 'case-workflow-comment',
+    id: 'mock-comment-3',
+    attributes: {
+      comment: 'Wow, good luck catching that bad meanie!',
+      created_at: 1574721150542,
+      created_by: {
+        full_name: null,
+        username: 'elastic',
+      },
+    },
+    references: [
+      {
+        type: 'case-workflow',
+        name: 'associated-case-workflow',
+        id: 'mock-id-3',
+      },
+    ],
+    updated_at: '2019-11-25T22:32:30.608Z',
+    version: 'WzYsMV0=',
+  },
+];
diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/route_contexts.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/route_contexts.ts
new file mode 100644
index 00000000000000..b1881e394e796a
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__fixtures__/route_contexts.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 { RequestHandlerContext } from 'src/core/server';
+
+export const createRouteContext = (client: any) => {
+  return ({
+    core: {
+      savedObjects: {
+        client,
+      },
+    },
+  } as unknown) as RequestHandlerContext;
+};
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/delete_case.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/delete_case.test.ts
new file mode 100644
index 00000000000000..9ea42ba42406b1
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/delete_case.test.ts
@@ -0,0 +1,83 @@
+/*
+ * 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 {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCases,
+  mockCasesErrorTriggerData,
+} from '../__fixtures__';
+import { initDeleteCaseApi } from '../delete_case';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('DELETE case', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initDeleteCaseApi, 'delete');
+  });
+  it(`deletes the case. responds with 204`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      method: 'delete',
+      params: {
+        id: 'mock-id-1',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(204);
+  });
+  it(`returns an error when thrown from deleteCase service`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      method: 'delete',
+      params: {
+        id: 'not-real',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(404);
+  });
+  it(`returns an error when thrown from getAllCaseComments service`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      method: 'delete',
+      params: {
+        id: 'bad-guy',
+      },
+    });
+
+    const theContext = createRouteContext(
+      createMockSavedObjectsRepository(mockCasesErrorTriggerData)
+    );
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(400);
+  });
+  it(`returns an error when thrown from deleteComment service`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      method: 'delete',
+      params: {
+        id: 'valid-id',
+      },
+    });
+
+    const theContext = createRouteContext(
+      createMockSavedObjectsRepository(mockCasesErrorTriggerData)
+    );
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(400);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/delete_comment.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/delete_comment.test.ts
new file mode 100644
index 00000000000000..e50b3cbaa9c9a1
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/delete_comment.test.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCases,
+  mockCasesErrorTriggerData,
+} from '../__fixtures__';
+import { initDeleteCommentApi } from '../delete_comment';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('DELETE comment', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initDeleteCommentApi, 'delete');
+  });
+  it(`deletes the comment. responds with 204`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/comments/{comment_id}',
+      method: 'delete',
+      params: {
+        comment_id: 'mock-id-1',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(204);
+  });
+  it(`returns an error when thrown from deleteComment service`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/comments/{comment_id}',
+      method: 'delete',
+      params: {
+        comment_id: 'bad-guy',
+      },
+    });
+
+    const theContext = createRouteContext(
+      createMockSavedObjectsRepository(mockCasesErrorTriggerData)
+    );
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(400);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/get_all_cases.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/get_all_cases.test.ts
new file mode 100644
index 00000000000000..2f8a229c08f29c
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/get_all_cases.test.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCases,
+} from '../__fixtures__';
+import { initGetAllCasesApi } from '../get_all_cases';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('GET all cases', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initGetAllCasesApi, 'get');
+  });
+  it(`returns the case without case comments when includeComments is false`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases',
+      method: 'get',
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(200);
+    expect(response.payload.saved_objects).toHaveLength(3);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/get_case.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/get_case.test.ts
new file mode 100644
index 00000000000000..3c5f8e52d19466
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/get_case.test.ts
@@ -0,0 +1,101 @@
+/*
+ * 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 {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCases,
+  mockCasesErrorTriggerData,
+} from '../__fixtures__';
+import { initGetCaseApi } from '../get_case';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('GET case', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initGetCaseApi, 'get');
+  });
+  it(`returns the case without case comments when includeComments is false`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      params: {
+        id: 'mock-id-1',
+      },
+      method: 'get',
+      query: {
+        includeComments: false,
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+
+    expect(response.status).toEqual(200);
+    expect(response.payload).toEqual(mockCases.find(s => s.id === 'mock-id-1'));
+    expect(response.payload.comments).toBeUndefined();
+  });
+  it(`returns an error when thrown from getCase`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      params: {
+        id: 'abcdefg',
+      },
+      method: 'get',
+      query: {
+        includeComments: false,
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+
+    expect(response.status).toEqual(404);
+    expect(response.payload.isBoom).toEqual(true);
+  });
+  it(`returns the case with case comments when includeComments is true`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      params: {
+        id: 'mock-id-1',
+      },
+      method: 'get',
+      query: {
+        includeComments: true,
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+
+    expect(response.status).toEqual(200);
+    expect(response.payload.comments.saved_objects).toHaveLength(3);
+  });
+  it(`returns an error when thrown from getAllCaseComments`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      params: {
+        id: 'bad-guy',
+      },
+      method: 'get',
+      query: {
+        includeComments: true,
+      },
+    });
+
+    const theContext = createRouteContext(
+      createMockSavedObjectsRepository(mockCasesErrorTriggerData)
+    );
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+
+    expect(response.status).toEqual(400);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/get_comment.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/get_comment.test.ts
new file mode 100644
index 00000000000000..9b6a1e435838bd
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/get_comment.test.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCaseComments,
+} from '../__fixtures__';
+import { initGetCommentApi } from '../get_comment';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('GET comment', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initGetCommentApi, 'get');
+  });
+  it(`returns the comment`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/comments/{id}',
+      method: 'get',
+      params: {
+        id: 'mock-comment-1',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCaseComments));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(200);
+    expect(response.payload).toEqual(mockCaseComments.find(s => s.id === 'mock-comment-1'));
+  });
+  it(`returns an error when getComment throws`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/comments/{id}',
+      method: 'get',
+      params: {
+        id: 'not-real',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCaseComments));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(404);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/post_case.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/post_case.test.ts
new file mode 100644
index 00000000000000..bb688dde4c58f8
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/post_case.test.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCases,
+} from '../__fixtures__';
+import { initPostCaseApi } from '../post_case';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('POST cases', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initPostCaseApi, 'post');
+  });
+  it(`Posts a new case`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases',
+      method: 'post',
+      body: {
+        description: 'This is a brand new case of a bad meanie defacing data',
+        title: 'Super Bad Security Issue',
+        state: 'open',
+        tags: ['defacement'],
+        case_type: 'security',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(200);
+    expect(response.payload.id).toEqual('mock-it');
+    expect(response.payload.attributes.created_by.username).toEqual('awesome');
+  });
+  it(`Returns an error if postNewCase throws`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases',
+      method: 'post',
+      body: {
+        description: 'Throw an error',
+        title: 'Super Bad Security Issue',
+        state: 'open',
+        tags: ['error'],
+        case_type: 'security',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(400);
+    expect(response.payload.isBoom).toEqual(true);
+  });
+  it(`Returns an error if user authentication throws`, async () => {
+    routeHandler = await createRoute(initPostCaseApi, 'post', true);
+
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases',
+      method: 'post',
+      body: {
+        description: 'This is a brand new case of a bad meanie defacing data',
+        title: 'Super Bad Security Issue',
+        state: 'open',
+        tags: ['defacement'],
+        case_type: 'security',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(500);
+    expect(response.payload.isBoom).toEqual(true);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/post_comment.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/post_comment.test.ts
new file mode 100644
index 00000000000000..0c059b7f15ea48
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/post_comment.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 {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCases,
+} from '../__fixtures__';
+import { initPostCommentApi } from '../post_comment';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('POST comment', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initPostCommentApi, 'post');
+  });
+  it(`Posts a new comment`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}/comment',
+      method: 'post',
+      params: {
+        id: 'mock-id-1',
+      },
+      body: {
+        comment: 'Wow, good luck catching that bad meanie!',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(200);
+    expect(response.payload.id).toEqual('mock-comment');
+    expect(response.payload.references[0].id).toEqual('mock-id-1');
+  });
+  it(`Returns an error if the case does not exist`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}/comment',
+      method: 'post',
+      params: {
+        id: 'this-is-not-real',
+      },
+      body: {
+        comment: 'Wow, good luck catching that bad meanie!',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(404);
+    expect(response.payload.isBoom).toEqual(true);
+  });
+  it(`Returns an error if postNewCase throws`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}/comment',
+      method: 'post',
+      params: {
+        id: 'mock-id-1',
+      },
+      body: {
+        comment: 'Throw an error',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(400);
+    expect(response.payload.isBoom).toEqual(true);
+  });
+  it(`Returns an error if user authentication throws`, async () => {
+    routeHandler = await createRoute(initPostCommentApi, 'post', true);
+
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}/comment',
+      method: 'post',
+      params: {
+        id: 'mock-id-1',
+      },
+      body: {
+        comment: 'Wow, good luck catching that bad meanie!',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(500);
+    expect(response.payload.isBoom).toEqual(true);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/update_case.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/update_case.test.ts
new file mode 100644
index 00000000000000..7ed478d2e7c019
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/update_case.test.ts
@@ -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 {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCases,
+} from '../__fixtures__';
+import { initUpdateCaseApi } from '../update_case';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('UPDATE case', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initUpdateCaseApi, 'post');
+  });
+  it(`Updates a case`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      method: 'post',
+      params: {
+        id: 'mock-id-1',
+      },
+      body: {
+        state: 'closed',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(200);
+    expect(response.payload.id).toEqual('mock-id-1');
+    expect(response.payload.attributes.state).toEqual('closed');
+  });
+  it(`Returns an error if updateCase throws`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/{id}',
+      method: 'post',
+      params: {
+        id: 'mock-id-does-not-exist',
+      },
+      body: {
+        state: 'closed',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCases));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(404);
+    expect(response.payload.isBoom).toEqual(true);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/__tests__/update_comment.test.ts b/x-pack/plugins/case/server/routes/api/__tests__/update_comment.test.ts
new file mode 100644
index 00000000000000..8aa84b45b7dbb2
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/__tests__/update_comment.test.ts
@@ -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 {
+  createMockSavedObjectsRepository,
+  createRoute,
+  createRouteContext,
+  mockCaseComments,
+} from '../__fixtures__';
+import { initUpdateCommentApi } from '../update_comment';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServerMock } from 'src/core/server/mocks';
+
+describe('UPDATE comment', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+  beforeAll(async () => {
+    routeHandler = await createRoute(initUpdateCommentApi, 'post');
+  });
+  it(`Updates a comment`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/comment/{id}',
+      method: 'post',
+      params: {
+        id: 'mock-comment-1',
+      },
+      body: {
+        comment: 'Update my comment',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCaseComments));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(200);
+    expect(response.payload.id).toEqual('mock-comment-1');
+    expect(response.payload.attributes.comment).toEqual('Update my comment');
+  });
+  it(`Returns an error if updateComment throws`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      path: '/api/cases/comment/{id}',
+      method: 'post',
+      params: {
+        id: 'mock-comment-does-not-exist',
+      },
+      body: {
+        comment: 'Update my comment',
+      },
+    });
+
+    const theContext = createRouteContext(createMockSavedObjectsRepository(mockCaseComments));
+
+    const response = await routeHandler(theContext, request, kibanaResponseFactory);
+    expect(response.status).toEqual(404);
+    expect(response.payload.isBoom).toEqual(true);
+  });
+});
diff --git a/x-pack/plugins/case/server/routes/api/delete_case.ts b/x-pack/plugins/case/server/routes/api/delete_case.ts
new file mode 100644
index 00000000000000..a5ae72b8b46ff0
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/delete_case.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { RouteDeps } from '.';
+import { wrapError } from './utils';
+
+export function initDeleteCaseApi({ caseService, router }: RouteDeps) {
+  router.delete(
+    {
+      path: '/api/cases/{id}',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      let allCaseComments;
+      try {
+        await caseService.deleteCase({
+          client: context.core.savedObjects.client,
+          caseId: request.params.id,
+        });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+      try {
+        allCaseComments = await caseService.getAllCaseComments({
+          client: context.core.savedObjects.client,
+          caseId: request.params.id,
+        });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+      try {
+        if (allCaseComments.saved_objects.length > 0) {
+          await Promise.all(
+            allCaseComments.saved_objects.map(({ id }) =>
+              caseService.deleteComment({
+                client: context.core.savedObjects.client,
+                commentId: id,
+              })
+            )
+          );
+        }
+        return response.noContent();
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/delete_comment.ts b/x-pack/plugins/case/server/routes/api/delete_comment.ts
new file mode 100644
index 00000000000000..4a540dd9fd69ff
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/delete_comment.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { RouteDeps } from '.';
+import { wrapError } from './utils';
+
+export function initDeleteCommentApi({ caseService, router }: RouteDeps) {
+  router.delete(
+    {
+      path: '/api/cases/comments/{comment_id}',
+      validate: {
+        params: schema.object({
+          comment_id: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      const client = context.core.savedObjects.client;
+      try {
+        await caseService.deleteComment({
+          client,
+          commentId: request.params.comment_id,
+        });
+        return response.noContent();
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/get_all_case_comments.ts b/x-pack/plugins/case/server/routes/api/get_all_case_comments.ts
new file mode 100644
index 00000000000000..cc4956ead1bd78
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/get_all_case_comments.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { RouteDeps } from '.';
+import { wrapError } from './utils';
+
+export function initGetAllCaseCommentsApi({ caseService, router }: RouteDeps) {
+  router.get(
+    {
+      path: '/api/cases/{id}/comments',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const theComments = await caseService.getAllCaseComments({
+          client: context.core.savedObjects.client,
+          caseId: request.params.id,
+        });
+        return response.ok({ body: theComments });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/get_all_cases.ts b/x-pack/plugins/case/server/routes/api/get_all_cases.ts
new file mode 100644
index 00000000000000..749a183dfe9807
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/get_all_cases.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RouteDeps } from '.';
+import { wrapError } from './utils';
+
+export function initGetAllCasesApi({ caseService, router }: RouteDeps) {
+  router.get(
+    {
+      path: '/api/cases',
+      validate: false,
+    },
+    async (context, request, response) => {
+      try {
+        const cases = await caseService.getAllCases({
+          client: context.core.savedObjects.client,
+        });
+        return response.ok({ body: cases });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/get_case.ts b/x-pack/plugins/case/server/routes/api/get_case.ts
new file mode 100644
index 00000000000000..6aad22a1ebf1b6
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/get_case.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { RouteDeps } from '.';
+import { wrapError } from './utils';
+
+export function initGetCaseApi({ caseService, router }: RouteDeps) {
+  router.get(
+    {
+      path: '/api/cases/{id}',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+        query: schema.object({
+          includeComments: schema.string({ defaultValue: 'true' }),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      let theCase;
+      const includeComments = JSON.parse(request.query.includeComments);
+      try {
+        theCase = await caseService.getCase({
+          client: context.core.savedObjects.client,
+          caseId: request.params.id,
+        });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+      if (!includeComments) {
+        return response.ok({ body: theCase });
+      }
+      try {
+        const theComments = await caseService.getAllCaseComments({
+          client: context.core.savedObjects.client,
+          caseId: request.params.id,
+        });
+        return response.ok({ body: { ...theCase, comments: theComments } });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/get_comment.ts b/x-pack/plugins/case/server/routes/api/get_comment.ts
new file mode 100644
index 00000000000000..6fd507d89738da
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/get_comment.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { RouteDeps } from '.';
+import { wrapError } from './utils';
+
+export function initGetCommentApi({ caseService, router }: RouteDeps) {
+  router.get(
+    {
+      path: '/api/cases/comments/{id}',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const theComment = await caseService.getComment({
+          client: context.core.savedObjects.client,
+          commentId: request.params.id,
+        });
+        return response.ok({ body: theComment });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/index.ts b/x-pack/plugins/case/server/routes/api/index.ts
new file mode 100644
index 00000000000000..11ef91d539e87b
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/index.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IRouter } from 'src/core/server';
+import { initDeleteCommentApi } from './delete_comment';
+import { initDeleteCaseApi } from './delete_case';
+import { initGetAllCaseCommentsApi } from './get_all_case_comments';
+import { initGetAllCasesApi } from './get_all_cases';
+import { initGetCaseApi } from './get_case';
+import { initGetCommentApi } from './get_comment';
+import { initPostCaseApi } from './post_case';
+import { initPostCommentApi } from './post_comment';
+import { initUpdateCaseApi } from './update_case';
+import { initUpdateCommentApi } from './update_comment';
+import { CaseServiceSetup } from '../../services';
+
+export interface RouteDeps {
+  caseService: CaseServiceSetup;
+  router: IRouter;
+}
+
+export function initCaseApi(deps: RouteDeps) {
+  initGetAllCaseCommentsApi(deps);
+  initGetAllCasesApi(deps);
+  initGetCaseApi(deps);
+  initGetCommentApi(deps);
+  initDeleteCaseApi(deps);
+  initDeleteCommentApi(deps);
+  initPostCaseApi(deps);
+  initPostCommentApi(deps);
+  initUpdateCaseApi(deps);
+  initUpdateCommentApi(deps);
+}
diff --git a/x-pack/plugins/case/server/routes/api/post_case.ts b/x-pack/plugins/case/server/routes/api/post_case.ts
new file mode 100644
index 00000000000000..e5aa0a3548b48f
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/post_case.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { formatNewCase, wrapError } from './utils';
+import { NewCaseSchema } from './schema';
+import { RouteDeps } from '.';
+
+export function initPostCaseApi({ caseService, router }: RouteDeps) {
+  router.post(
+    {
+      path: '/api/cases',
+      validate: {
+        body: NewCaseSchema,
+      },
+    },
+    async (context, request, response) => {
+      let createdBy;
+      try {
+        createdBy = await caseService.getUser({ request, response });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+
+      try {
+        const newCase = await caseService.postNewCase({
+          client: context.core.savedObjects.client,
+          attributes: formatNewCase(request.body, {
+            ...createdBy,
+          }),
+        });
+        return response.ok({ body: newCase });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/post_comment.ts b/x-pack/plugins/case/server/routes/api/post_comment.ts
new file mode 100644
index 00000000000000..3f4592f5bb11f3
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/post_comment.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { formatNewComment, wrapError } from './utils';
+import { NewCommentSchema } from './schema';
+import { RouteDeps } from '.';
+import { CASE_SAVED_OBJECT } from '../../constants';
+
+export function initPostCommentApi({ caseService, router }: RouteDeps) {
+  router.post(
+    {
+      path: '/api/cases/{id}/comment',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+        body: NewCommentSchema,
+      },
+    },
+    async (context, request, response) => {
+      let createdBy;
+      let newComment;
+      try {
+        await caseService.getCase({
+          client: context.core.savedObjects.client,
+          caseId: request.params.id,
+        });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+      try {
+        createdBy = await caseService.getUser({ request, response });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+      try {
+        newComment = await caseService.postNewComment({
+          client: context.core.savedObjects.client,
+          attributes: formatNewComment({
+            newComment: request.body,
+            ...createdBy,
+          }),
+          references: [
+            {
+              type: CASE_SAVED_OBJECT,
+              name: `associated-${CASE_SAVED_OBJECT}`,
+              id: request.params.id,
+            },
+          ],
+        });
+
+        return response.ok({ body: newComment });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/schema.ts b/x-pack/plugins/case/server/routes/api/schema.ts
new file mode 100644
index 00000000000000..4a4a0c3a11e362
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/schema.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+export const UserSchema = schema.object({
+  username: schema.string(),
+  full_name: schema.maybe(schema.string()),
+});
+
+export const NewCommentSchema = schema.object({
+  comment: schema.string(),
+});
+
+export const CommentSchema = schema.object({
+  comment: schema.string(),
+  created_at: schema.number(),
+  created_by: UserSchema,
+});
+
+export const UpdatedCommentSchema = schema.object({
+  comment: schema.string(),
+});
+
+export const NewCaseSchema = schema.object({
+  assignees: schema.arrayOf(UserSchema, { defaultValue: [] }),
+  description: schema.string(),
+  title: schema.string(),
+  state: schema.oneOf([schema.literal('open'), schema.literal('closed')], { defaultValue: 'open' }),
+  tags: schema.arrayOf(schema.string(), { defaultValue: [] }),
+  case_type: schema.string(),
+});
+
+export const UpdatedCaseSchema = schema.object({
+  assignees: schema.maybe(schema.arrayOf(UserSchema)),
+  description: schema.maybe(schema.string()),
+  title: schema.maybe(schema.string()),
+  state: schema.maybe(schema.oneOf([schema.literal('open'), schema.literal('closed')])),
+  tags: schema.maybe(schema.arrayOf(schema.string())),
+  case_type: schema.maybe(schema.string()),
+});
diff --git a/x-pack/plugins/case/server/routes/api/types.ts b/x-pack/plugins/case/server/routes/api/types.ts
new file mode 100644
index 00000000000000..d943e4e5fd7dd7
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/types.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { TypeOf } from '@kbn/config-schema';
+import {
+  CommentSchema,
+  NewCaseSchema,
+  NewCommentSchema,
+  UpdatedCaseSchema,
+  UpdatedCommentSchema,
+  UserSchema,
+} from './schema';
+
+export type NewCaseType = TypeOf<typeof NewCaseSchema>;
+export type NewCommentFormatted = TypeOf<typeof CommentSchema>;
+export type NewCommentType = TypeOf<typeof NewCommentSchema>;
+export type UpdatedCaseTyped = TypeOf<typeof UpdatedCaseSchema>;
+export type UpdatedCommentType = TypeOf<typeof UpdatedCommentSchema>;
+export type UserType = TypeOf<typeof UserSchema>;
+
+export interface NewCaseFormatted extends NewCaseType {
+  created_at: number;
+  created_by: UserType;
+}
+
+export interface UpdatedCaseType {
+  assignees?: UpdatedCaseTyped['assignees'];
+  description?: UpdatedCaseTyped['description'];
+  title?: UpdatedCaseTyped['title'];
+  state?: UpdatedCaseTyped['state'];
+  tags?: UpdatedCaseTyped['tags'];
+  case_type?: UpdatedCaseTyped['case_type'];
+}
diff --git a/x-pack/plugins/case/server/routes/api/update_case.ts b/x-pack/plugins/case/server/routes/api/update_case.ts
new file mode 100644
index 00000000000000..52c8cab0022dd1
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/update_case.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { wrapError } from './utils';
+import { RouteDeps } from '.';
+import { UpdatedCaseSchema } from './schema';
+
+export function initUpdateCaseApi({ caseService, router }: RouteDeps) {
+  router.post(
+    {
+      path: '/api/cases/{id}',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+        body: UpdatedCaseSchema,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const updatedCase = await caseService.updateCase({
+          client: context.core.savedObjects.client,
+          caseId: request.params.id,
+          updatedAttributes: request.body,
+        });
+        return response.ok({ body: updatedCase });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/update_comment.ts b/x-pack/plugins/case/server/routes/api/update_comment.ts
new file mode 100644
index 00000000000000..e1ee6029e8e4fc
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/update_comment.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { wrapError } from './utils';
+import { NewCommentSchema } from './schema';
+import { RouteDeps } from '.';
+
+export function initUpdateCommentApi({ caseService, router }: RouteDeps) {
+  router.post(
+    {
+      path: '/api/cases/comment/{id}',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+        body: NewCommentSchema,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const updatedComment = await caseService.updateComment({
+          client: context.core.savedObjects.client,
+          commentId: request.params.id,
+          updatedAttributes: request.body,
+        });
+        return response.ok({ body: updatedComment });
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/case/server/routes/api/utils.ts b/x-pack/plugins/case/server/routes/api/utils.ts
new file mode 100644
index 00000000000000..c6e33dbb8433bd
--- /dev/null
+++ b/x-pack/plugins/case/server/routes/api/utils.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { boomify, isBoom } from 'boom';
+import { CustomHttpResponseOptions, ResponseError } from 'kibana/server';
+import {
+  NewCaseType,
+  NewCaseFormatted,
+  NewCommentType,
+  NewCommentFormatted,
+  UserType,
+} from './types';
+
+export const formatNewCase = (
+  newCase: NewCaseType,
+  { full_name, username }: { full_name?: string; username: string }
+): NewCaseFormatted => ({
+  created_at: new Date().valueOf(),
+  created_by: { full_name, username },
+  ...newCase,
+});
+
+interface NewCommentArgs {
+  newComment: NewCommentType;
+  full_name?: UserType['full_name'];
+  username: UserType['username'];
+}
+export const formatNewComment = ({
+  newComment,
+  full_name,
+  username,
+}: NewCommentArgs): NewCommentFormatted => ({
+  ...newComment,
+  created_at: new Date().valueOf(),
+  created_by: { full_name, username },
+});
+
+export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
+  const boom = isBoom(error) ? error : boomify(error);
+  return {
+    body: boom,
+    headers: boom.output.headers,
+    statusCode: boom.output.statusCode,
+  };
+}
diff --git a/x-pack/plugins/case/server/services/index.ts b/x-pack/plugins/case/server/services/index.ts
new file mode 100644
index 00000000000000..684d905a5c71fe
--- /dev/null
+++ b/x-pack/plugins/case/server/services/index.ts
@@ -0,0 +1,192 @@
+/*
+ * 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,
+  KibanaResponseFactory,
+  Logger,
+  SavedObject,
+  SavedObjectsClientContract,
+  SavedObjectsFindResponse,
+  SavedObjectsUpdateResponse,
+  SavedObjectReference,
+} from 'kibana/server';
+import { CASE_COMMENT_SAVED_OBJECT, CASE_SAVED_OBJECT } from '../constants';
+import {
+  NewCaseFormatted,
+  NewCommentFormatted,
+  UpdatedCaseType,
+  UpdatedCommentType,
+} from '../routes/api/types';
+import {
+  AuthenticatedUser,
+  PluginSetupContract as SecurityPluginSetup,
+} from '../../../security/server';
+
+interface ClientArgs {
+  client: SavedObjectsClientContract;
+}
+
+interface GetCaseArgs extends ClientArgs {
+  caseId: string;
+}
+interface GetCommentArgs extends ClientArgs {
+  commentId: string;
+}
+interface PostCaseArgs extends ClientArgs {
+  attributes: NewCaseFormatted;
+}
+
+interface PostCommentArgs extends ClientArgs {
+  attributes: NewCommentFormatted;
+  references: SavedObjectReference[];
+}
+interface UpdateCaseArgs extends ClientArgs {
+  caseId: string;
+  updatedAttributes: UpdatedCaseType;
+}
+interface UpdateCommentArgs extends ClientArgs {
+  commentId: string;
+  updatedAttributes: UpdatedCommentType;
+}
+
+interface GetUserArgs {
+  request: KibanaRequest;
+  response: KibanaResponseFactory;
+}
+
+interface CaseServiceDeps {
+  authentication: SecurityPluginSetup['authc'];
+}
+export interface CaseServiceSetup {
+  deleteCase(args: GetCaseArgs): Promise<{}>;
+  deleteComment(args: GetCommentArgs): Promise<{}>;
+  getAllCases(args: ClientArgs): Promise<SavedObjectsFindResponse>;
+  getAllCaseComments(args: GetCaseArgs): Promise<SavedObjectsFindResponse>;
+  getCase(args: GetCaseArgs): Promise<SavedObject>;
+  getComment(args: GetCommentArgs): Promise<SavedObject>;
+  getUser(args: GetUserArgs): Promise<AuthenticatedUser>;
+  postNewCase(args: PostCaseArgs): Promise<SavedObject>;
+  postNewComment(args: PostCommentArgs): Promise<SavedObject>;
+  updateCase(args: UpdateCaseArgs): Promise<SavedObjectsUpdateResponse>;
+  updateComment(args: UpdateCommentArgs): Promise<SavedObjectsUpdateResponse>;
+}
+
+export class CaseService {
+  constructor(private readonly log: Logger) {}
+  public setup = async ({ authentication }: CaseServiceDeps): Promise<CaseServiceSetup> => ({
+    deleteCase: async ({ client, caseId }: GetCaseArgs) => {
+      try {
+        this.log.debug(`Attempting to GET case ${caseId}`);
+        return await client.delete(CASE_SAVED_OBJECT, caseId);
+      } catch (error) {
+        this.log.debug(`Error on GET case ${caseId}: ${error}`);
+        throw error;
+      }
+    },
+    deleteComment: async ({ client, commentId }: GetCommentArgs) => {
+      try {
+        this.log.debug(`Attempting to GET comment ${commentId}`);
+        return await client.delete(CASE_COMMENT_SAVED_OBJECT, commentId);
+      } catch (error) {
+        this.log.debug(`Error on GET comment ${commentId}: ${error}`);
+        throw error;
+      }
+    },
+    getCase: async ({ client, caseId }: GetCaseArgs) => {
+      try {
+        this.log.debug(`Attempting to GET case ${caseId}`);
+        return await client.get(CASE_SAVED_OBJECT, caseId);
+      } catch (error) {
+        this.log.debug(`Error on GET case ${caseId}: ${error}`);
+        throw error;
+      }
+    },
+    getComment: async ({ client, commentId }: GetCommentArgs) => {
+      try {
+        this.log.debug(`Attempting to GET comment ${commentId}`);
+        return await client.get(CASE_COMMENT_SAVED_OBJECT, commentId);
+      } catch (error) {
+        this.log.debug(`Error on GET comment ${commentId}: ${error}`);
+        throw error;
+      }
+    },
+    getAllCases: async ({ client }: ClientArgs) => {
+      try {
+        this.log.debug(`Attempting to GET all cases`);
+        return await client.find({ type: CASE_SAVED_OBJECT });
+      } catch (error) {
+        this.log.debug(`Error on GET cases: ${error}`);
+        throw error;
+      }
+    },
+    getAllCaseComments: async ({ client, caseId }: GetCaseArgs) => {
+      try {
+        this.log.debug(`Attempting to GET all comments for case ${caseId}`);
+        return await client.find({
+          type: CASE_COMMENT_SAVED_OBJECT,
+          hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
+        });
+      } catch (error) {
+        this.log.debug(`Error on GET all comments for case ${caseId}: ${error}`);
+        throw error;
+      }
+    },
+    getUser: async ({ request, response }: GetUserArgs) => {
+      let user;
+      try {
+        this.log.debug(`Attempting to authenticate a user`);
+        user = await authentication!.getCurrentUser(request);
+      } catch (error) {
+        this.log.debug(`Error on GET user: ${error}`);
+        throw error;
+      }
+      if (!user) {
+        this.log.debug(`Error on GET user: Bad User`);
+        throw new Error('Bad User - the user is not authenticated');
+      }
+      return user;
+    },
+    postNewCase: async ({ client, attributes }: PostCaseArgs) => {
+      try {
+        this.log.debug(`Attempting to POST a new case`);
+        return await client.create(CASE_SAVED_OBJECT, { ...attributes });
+      } catch (error) {
+        this.log.debug(`Error on POST a new case: ${error}`);
+        throw error;
+      }
+    },
+    postNewComment: async ({ client, attributes, references }: PostCommentArgs) => {
+      try {
+        this.log.debug(`Attempting to POST a new comment`);
+        return await client.create(CASE_COMMENT_SAVED_OBJECT, attributes, { references });
+      } catch (error) {
+        this.log.debug(`Error on POST a new comment: ${error}`);
+        throw error;
+      }
+    },
+    updateCase: async ({ client, caseId, updatedAttributes }: UpdateCaseArgs) => {
+      try {
+        this.log.debug(`Attempting to UPDATE case ${caseId}`);
+        return await client.update(CASE_SAVED_OBJECT, caseId, { ...updatedAttributes });
+      } catch (error) {
+        this.log.debug(`Error on UPDATE case ${caseId}: ${error}`);
+        throw error;
+      }
+    },
+    updateComment: async ({ client, commentId, updatedAttributes }: UpdateCommentArgs) => {
+      try {
+        this.log.debug(`Attempting to UPDATE comment ${commentId}`);
+        return await client.update(CASE_COMMENT_SAVED_OBJECT, commentId, {
+          ...updatedAttributes,
+        });
+      } catch (error) {
+        this.log.debug(`Error on UPDATE comment ${commentId}: ${error}`);
+        throw error;
+      }
+    },
+  });
+}
diff --git a/x-pack/plugins/security/server/index.ts b/x-pack/plugins/security/server/index.ts
index 33f554be5caa3b..17e49b8cf40d30 100644
--- a/x-pack/plugins/security/server/index.ts
+++ b/x-pack/plugins/security/server/index.ts
@@ -17,6 +17,7 @@ import { Plugin, PluginSetupContract, PluginSetupDependencies } from './plugin';
 // These exports are part of public Security plugin contract, any change in signature of exported
 // functions or removal of exports should be considered as a breaking change.
 export {
+  Authentication,
   AuthenticationResult,
   DeauthenticationResult,
   CreateAPIKeyResult,
@@ -24,6 +25,7 @@ export {
   InvalidateAPIKeyResult,
 } from './authentication';
 export { PluginSetupContract };
+export { AuthenticatedUser } from '../common/model';
 
 export const config: PluginConfigDescriptor<TypeOf<typeof ConfigSchema>> = {
   schema: ConfigSchema,

From e1e1d964c67d77d20d0d309bf09121bb9fc8e5ac Mon Sep 17 00:00:00 2001
From: Phillip Burch <phillip.burch@live.com>
Date: Wed, 8 Jan 2020 16:37:37 -0600
Subject: [PATCH 67/96] Reset region and Account when switching inventory
 (#54287)

---
 .../components/waffle/waffle_inventory_switcher.tsx   |  8 +++++++-
 .../public/pages/infrastructure/snapshot/toolbar.tsx  | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
index bdd08ab6b366f7..785531db2ff5ed 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
@@ -28,6 +28,8 @@ interface WaffleInventorySwitcherProps {
   changeNodeType: (nodeType: InfraNodeType) => void;
   changeGroupBy: (groupBy: InfraSnapshotGroupbyInput[]) => void;
   changeMetric: (metric: InfraSnapshotMetricInput) => void;
+  changeAccount: (id: string) => void;
+  changeRegion: (name: string) => void;
 }
 
 const getDisplayNameForType = (type: InventoryItemType) => {
@@ -39,6 +41,8 @@ export const WaffleInventorySwitcher: React.FC<WaffleInventorySwitcherProps> = (
   changeNodeType,
   changeGroupBy,
   changeMetric,
+  changeAccount,
+  changeRegion,
   nodeType,
 }) => {
   const [isOpen, setIsOpen] = useState(false);
@@ -49,12 +53,14 @@ export const WaffleInventorySwitcher: React.FC<WaffleInventorySwitcherProps> = (
       closePopover();
       changeNodeType(targetNodeType);
       changeGroupBy([]);
+      changeAccount('');
+      changeRegion('');
       const inventoryModel = findInventoryModel(targetNodeType);
       changeMetric({
         type: inventoryModel.metrics.defaultSnapshot as InfraSnapshotMetricType,
       });
     },
-    [closePopover, changeNodeType, changeGroupBy, changeMetric]
+    [closePopover, changeNodeType, changeGroupBy, changeMetric, changeAccount, changeRegion]
   );
   const goToHost = useCallback(() => goToNodeType('host' as InfraNodeType), [goToNodeType]);
   const goToK8 = useCallback(() => goToNodeType('pod' as InfraNodeType), [goToNodeType]);
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
index a828cd207aa5ba..a5780f44050e13 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
@@ -23,12 +23,21 @@ export const SnapshotToolbar = () => (
     <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="m">
       <EuiFlexItem grow={false}>
         <WithWaffleOptions>
-          {({ changeMetric, changeNodeType, changeGroupBy, nodeType }) => (
+          {({
+            changeMetric,
+            changeNodeType,
+            changeGroupBy,
+            changeAccount,
+            changeRegion,
+            nodeType,
+          }) => (
             <WaffleInventorySwitcher
               nodeType={nodeType}
               changeNodeType={changeNodeType}
               changeMetric={changeMetric}
               changeGroupBy={changeGroupBy}
+              changeAccount={changeAccount}
+              changeRegion={changeRegion}
             />
           )}
         </WithWaffleOptions>

From 9282f19bf54df2d2ccdfaaf526626e94f29cc45f Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Wed, 8 Jan 2020 17:43:10 -0600
Subject: [PATCH 68/96] Management - New platform api (#52579)

* implement management new platform api
---
 .../kibana/public/management/index.js         |  13 +-
 src/legacy/ui/public/_index.scss              |   1 +
 src/legacy/ui/public/management/_index.scss   |   1 -
 .../__snapshots__/sidebar_nav.test.ts.snap    |  24 ---
 .../management/components/sidebar_nav.tsx     | 107 ----------
 src/legacy/ui/public/management/index.js      |   2 -
 src/plugins/management/kibana.json            |   2 +-
 .../management_app.test.tsx.snap              |  11 +
 .../management/public/components/_index.scss  |   1 +
 .../management/public/components/index.ts     |  21 ++
 .../components/management_chrome}/index.ts    |   2 +-
 .../management_chrome/management_chrome.tsx   |  57 +++++
 .../management_sidebar_nav.test.ts.snap       |  95 +++++++++
 .../management_sidebar_nav}/_index.scss       |   0
 .../management_sidebar_nav}/_sidebar_nav.scss |   2 +-
 .../management_sidebar_nav/index.ts           |  20 ++
 .../management_sidebar_nav.test.ts}           |  26 ++-
 .../management_sidebar_nav.tsx                | 200 ++++++++++++++++++
 src/plugins/management/public/index.ts        |   5 +-
 src/plugins/management/public/legacy/index.js |   3 +-
 .../management/public/legacy/section.js       |   8 +-
 .../management/public/legacy/section.test.js  |  40 ++--
 .../public/legacy/sections_register.js        |  72 ++++---
 .../management/public/management_app.test.tsx |  66 ++++++
 .../management/public/management_app.tsx      | 102 +++++++++
 .../public/management_section.test.ts         |  65 ++++++
 .../management/public/management_section.ts   |  78 +++++++
 .../public/management_service.test.ts         |  55 +++++
 .../management/public/management_service.ts   | 103 +++++++++
 src/plugins/management/public/plugin.ts       |  24 ++-
 src/plugins/management/public/types.ts        |  76 +++++++
 test/plugin_functional/config.js              |   1 +
 .../management_test_plugin/kibana.json        |   9 +
 .../management_test_plugin/package.json       |  17 ++
 .../management_test_plugin/public/index.ts    |  28 +++
 .../management_test_plugin/public/plugin.tsx  |  73 +++++++
 .../management_test_plugin/tsconfig.json      |  14 ++
 .../test_suites/management/index.js           |  24 +++
 .../management/management_plugin.js           |  40 ++++
 x-pack/legacy/plugins/infra/types/eui.d.ts    |   2 +-
 .../management/management_service.test.ts     |  10 +
 .../translations/translations/ja-JP.json      |   4 +-
 .../translations/translations/zh-CN.json      |   4 +-
 43 files changed, 1296 insertions(+), 212 deletions(-)
 delete mode 100644 src/legacy/ui/public/management/_index.scss
 delete mode 100644 src/legacy/ui/public/management/components/__snapshots__/sidebar_nav.test.ts.snap
 delete mode 100644 src/legacy/ui/public/management/components/sidebar_nav.tsx
 create mode 100644 src/plugins/management/public/__snapshots__/management_app.test.tsx.snap
 create mode 100644 src/plugins/management/public/components/_index.scss
 create mode 100644 src/plugins/management/public/components/index.ts
 rename src/{legacy/ui/public/management/components => plugins/management/public/components/management_chrome}/index.ts (93%)
 create mode 100644 src/plugins/management/public/components/management_chrome/management_chrome.tsx
 create mode 100644 src/plugins/management/public/components/management_sidebar_nav/__snapshots__/management_sidebar_nav.test.ts.snap
 rename src/{legacy/ui/public/management/components => plugins/management/public/components/management_sidebar_nav}/_index.scss (100%)
 rename src/{legacy/ui/public/management/components => plugins/management/public/components/management_sidebar_nav}/_sidebar_nav.scss (88%)
 create mode 100644 src/plugins/management/public/components/management_sidebar_nav/index.ts
 rename src/{legacy/ui/public/management/components/sidebar_nav.test.ts => plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.test.ts} (75%)
 create mode 100644 src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
 create mode 100644 src/plugins/management/public/management_app.test.tsx
 create mode 100644 src/plugins/management/public/management_app.tsx
 create mode 100644 src/plugins/management/public/management_section.test.ts
 create mode 100644 src/plugins/management/public/management_section.ts
 create mode 100644 src/plugins/management/public/management_service.test.ts
 create mode 100644 src/plugins/management/public/management_service.ts
 create mode 100644 test/plugin_functional/plugins/management_test_plugin/kibana.json
 create mode 100644 test/plugin_functional/plugins/management_test_plugin/package.json
 create mode 100644 test/plugin_functional/plugins/management_test_plugin/public/index.ts
 create mode 100644 test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
 create mode 100644 test/plugin_functional/plugins/management_test_plugin/tsconfig.json
 create mode 100644 test/plugin_functional/test_suites/management/index.js
 create mode 100644 test/plugin_functional/test_suites/management/management_plugin.js

diff --git a/src/legacy/core_plugins/kibana/public/management/index.js b/src/legacy/core_plugins/kibana/public/management/index.js
index 5323fb2dac2d2f..d62770956b88ef 100644
--- a/src/legacy/core_plugins/kibana/public/management/index.js
+++ b/src/legacy/core_plugins/kibana/public/management/index.js
@@ -28,7 +28,8 @@ import { I18nContext } from 'ui/i18n';
 import { uiModules } from 'ui/modules';
 import appTemplate from './app.html';
 import landingTemplate from './landing.html';
-import { management, SidebarNav, MANAGEMENT_BREADCRUMB } from 'ui/management';
+import { management, MANAGEMENT_BREADCRUMB } from 'ui/management';
+import { ManagementSidebarNav } from '../../../../../plugins/management/public';
 import {
   FeatureCatalogueRegistryProvider,
   FeatureCatalogueCategory,
@@ -42,6 +43,7 @@ import {
   EuiIcon,
   EuiHorizontalRule,
 } from '@elastic/eui';
+import { npStart } from 'ui/new_platform';
 
 const SIDENAV_ID = 'management-sidenav';
 const LANDING_ID = 'management-landing';
@@ -102,7 +104,7 @@ export function updateLandingPage(version) {
   );
 }
 
-export function updateSidebar(items, id) {
+export function updateSidebar(legacySections, id) {
   const node = document.getElementById(SIDENAV_ID);
   if (!node) {
     return;
@@ -110,7 +112,12 @@ export function updateSidebar(items, id) {
 
   render(
     <I18nContext>
-      <SidebarNav sections={items} selectedId={id} className="mgtSideNav" />
+      <ManagementSidebarNav
+        getSections={npStart.plugins.management.sections.getSectionsEnabled}
+        legacySections={legacySections}
+        selectedId={id}
+        className="mgtSideNav"
+      />
     </I18nContext>,
     node
   );
diff --git a/src/legacy/ui/public/_index.scss b/src/legacy/ui/public/_index.scss
index 98675402b43ccc..747ad025ef691d 100644
--- a/src/legacy/ui/public/_index.scss
+++ b/src/legacy/ui/public/_index.scss
@@ -20,6 +20,7 @@
 @import './saved_objects/index';
 @import './share/index';
 @import './style_compile/index';
+@import '../../../plugins/management/public/components/index';
 
 // The following are prefixed with "vis"
 
diff --git a/src/legacy/ui/public/management/_index.scss b/src/legacy/ui/public/management/_index.scss
deleted file mode 100644
index 30ac0c9fe9b27d..00000000000000
--- a/src/legacy/ui/public/management/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './components/index';
\ No newline at end of file
diff --git a/src/legacy/ui/public/management/components/__snapshots__/sidebar_nav.test.ts.snap b/src/legacy/ui/public/management/components/__snapshots__/sidebar_nav.test.ts.snap
deleted file mode 100644
index 3364bee33a5443..00000000000000
--- a/src/legacy/ui/public/management/components/__snapshots__/sidebar_nav.test.ts.snap
+++ /dev/null
@@ -1,24 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Management filters and filters and maps section objects into SidebarNav items 1`] = `
-Array [
-  Object {
-    "data-test-subj": "activeSection",
-    "href": undefined,
-    "icon": null,
-    "id": "activeSection",
-    "isSelected": false,
-    "items": Array [
-      Object {
-        "data-test-subj": "item",
-        "href": undefined,
-        "icon": null,
-        "id": "item",
-        "isSelected": false,
-        "name": "item",
-      },
-    ],
-    "name": "activeSection",
-  },
-]
-`;
diff --git a/src/legacy/ui/public/management/components/sidebar_nav.tsx b/src/legacy/ui/public/management/components/sidebar_nav.tsx
deleted file mode 100644
index cd3d85090dce01..00000000000000
--- a/src/legacy/ui/public/management/components/sidebar_nav.tsx
+++ /dev/null
@@ -1,107 +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 { EuiIcon, EuiSideNav, IconType, EuiScreenReaderOnly } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import React from 'react';
-import { IndexedArray } from 'ui/indexed_array';
-
-interface Subsection {
-  disabled: boolean;
-  visible: boolean;
-  id: string;
-  display: string;
-  url?: string;
-  icon?: IconType;
-}
-interface Section extends Subsection {
-  visibleItems: IndexedArray<Subsection>;
-}
-
-const sectionVisible = (section: Subsection) => !section.disabled && section.visible;
-const sectionToNav = (selectedId: string) => ({ display, id, url, icon }: Subsection) => ({
-  id,
-  name: display,
-  icon: icon ? <EuiIcon type={icon} /> : null,
-  isSelected: selectedId === id,
-  href: url,
-  'data-test-subj': id,
-});
-
-export const sideNavItems = (sections: Section[], selectedId: string) =>
-  sections
-    .filter(sectionVisible)
-    .filter(section => section.visibleItems.filter(sectionVisible).length)
-    .map(section => ({
-      items: section.visibleItems.filter(sectionVisible).map(sectionToNav(selectedId)),
-      ...sectionToNav(selectedId)(section),
-    }));
-
-interface SidebarNavProps {
-  sections: Section[];
-  selectedId: string;
-}
-
-interface SidebarNavState {
-  isSideNavOpenOnMobile: boolean;
-}
-
-export class SidebarNav extends React.Component<SidebarNavProps, SidebarNavState> {
-  constructor(props: SidebarNavProps) {
-    super(props);
-    this.state = {
-      isSideNavOpenOnMobile: false,
-    };
-  }
-
-  public render() {
-    const HEADER_ID = 'management-nav-header';
-
-    return (
-      <>
-        <EuiScreenReaderOnly>
-          <h2 id={HEADER_ID}>
-            {i18n.translate('common.ui.management.nav.label', {
-              defaultMessage: 'Management',
-            })}
-          </h2>
-        </EuiScreenReaderOnly>
-        <EuiSideNav
-          aria-labelledby={HEADER_ID}
-          mobileTitle={this.renderMobileTitle()}
-          isOpenOnMobile={this.state.isSideNavOpenOnMobile}
-          toggleOpenOnMobile={this.toggleOpenOnMobile}
-          items={sideNavItems(this.props.sections, this.props.selectedId)}
-          className="mgtSideBarNav"
-        />
-      </>
-    );
-  }
-
-  private renderMobileTitle() {
-    return <FormattedMessage id="common.ui.management.nav.menu" defaultMessage="Management menu" />;
-  }
-
-  private toggleOpenOnMobile = () => {
-    this.setState({
-      isSideNavOpenOnMobile: !this.state.isSideNavOpenOnMobile,
-    });
-  };
-}
diff --git a/src/legacy/ui/public/management/index.js b/src/legacy/ui/public/management/index.js
index ed8ddb65315e2c..b2f1946dbc59cb 100644
--- a/src/legacy/ui/public/management/index.js
+++ b/src/legacy/ui/public/management/index.js
@@ -23,8 +23,6 @@ export {
   PAGE_FOOTER_COMPONENT,
 } from '../../../core_plugins/kibana/public/management/sections/settings/components/default_component_registry';
 export { registerSettingsComponent } from '../../../core_plugins/kibana/public/management/sections/settings/components/component_registry';
-export { SidebarNav } from './components';
 export { MANAGEMENT_BREADCRUMB } from './breadcrumbs';
-
 import { npStart } from 'ui/new_platform';
 export const management = npStart.plugins.management.legacy;
diff --git a/src/plugins/management/kibana.json b/src/plugins/management/kibana.json
index 755a387afbd051..80135f1bfb6c84 100644
--- a/src/plugins/management/kibana.json
+++ b/src/plugins/management/kibana.json
@@ -3,5 +3,5 @@
   "version": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": []
+  "requiredPlugins": ["kibana_legacy"]
 }
diff --git a/src/plugins/management/public/__snapshots__/management_app.test.tsx.snap b/src/plugins/management/public/__snapshots__/management_app.test.tsx.snap
new file mode 100644
index 00000000000000..7f13472ee02eed
--- /dev/null
+++ b/src/plugins/management/public/__snapshots__/management_app.test.tsx.snap
@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Management app can mount and unmount 1`] = `
+<div>
+  <div>
+    Test App - Hello world!
+  </div>
+</div>
+`;
+
+exports[`Management app can mount and unmount 2`] = `<div />`;
diff --git a/src/plugins/management/public/components/_index.scss b/src/plugins/management/public/components/_index.scss
new file mode 100644
index 00000000000000..df0ebb48803d97
--- /dev/null
+++ b/src/plugins/management/public/components/_index.scss
@@ -0,0 +1 @@
+@import './management_sidebar_nav/index';
diff --git a/src/plugins/management/public/components/index.ts b/src/plugins/management/public/components/index.ts
new file mode 100644
index 00000000000000..2650d23d3c25ca
--- /dev/null
+++ b/src/plugins/management/public/components/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { ManagementSidebarNav } from './management_sidebar_nav';
+export { ManagementChrome } from './management_chrome';
diff --git a/src/legacy/ui/public/management/components/index.ts b/src/plugins/management/public/components/management_chrome/index.ts
similarity index 93%
rename from src/legacy/ui/public/management/components/index.ts
rename to src/plugins/management/public/components/management_chrome/index.ts
index e3a18ec4e2698f..b82c1af871be71 100644
--- a/src/legacy/ui/public/management/components/index.ts
+++ b/src/plugins/management/public/components/management_chrome/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { SidebarNav } from './sidebar_nav';
+export { ManagementChrome } from './management_chrome';
diff --git a/src/plugins/management/public/components/management_chrome/management_chrome.tsx b/src/plugins/management/public/components/management_chrome/management_chrome.tsx
new file mode 100644
index 00000000000000..7e5cabd32e48f8
--- /dev/null
+++ b/src/plugins/management/public/components/management_chrome/management_chrome.tsx
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as React from 'react';
+import { EuiPage, EuiPageBody } from '@elastic/eui';
+import { I18nProvider } from '@kbn/i18n/react';
+import { ManagementSidebarNav } from '../management_sidebar_nav';
+import { LegacySection } from '../../types';
+import { ManagementSection } from '../../management_section';
+
+interface Props {
+  getSections: () => ManagementSection[];
+  legacySections: LegacySection[];
+  selectedId: string;
+  onMounted: (element: HTMLDivElement) => void;
+}
+
+export class ManagementChrome extends React.Component<Props> {
+  private container = React.createRef<HTMLDivElement>();
+  componentDidMount() {
+    if (this.container.current) {
+      this.props.onMounted(this.container.current);
+    }
+  }
+  render() {
+    return (
+      <I18nProvider>
+        <EuiPage>
+          <ManagementSidebarNav
+            getSections={this.props.getSections}
+            legacySections={this.props.legacySections}
+            selectedId={this.props.selectedId}
+          />
+          <EuiPageBody>
+            <div ref={this.container} />
+          </EuiPageBody>
+        </EuiPage>
+      </I18nProvider>
+    );
+  }
+}
diff --git a/src/plugins/management/public/components/management_sidebar_nav/__snapshots__/management_sidebar_nav.test.ts.snap b/src/plugins/management/public/components/management_sidebar_nav/__snapshots__/management_sidebar_nav.test.ts.snap
new file mode 100644
index 00000000000000..e7225b356ed685
--- /dev/null
+++ b/src/plugins/management/public/components/management_sidebar_nav/__snapshots__/management_sidebar_nav.test.ts.snap
@@ -0,0 +1,95 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Management adds legacy apps to existing SidebarNav sections 1`] = `
+Array [
+  Object {
+    "data-test-subj": "activeSection",
+    "icon": null,
+    "id": "activeSection",
+    "items": Array [
+      Object {
+        "data-test-subj": "item",
+        "href": undefined,
+        "id": "item",
+        "isSelected": false,
+        "name": "item",
+        "order": undefined,
+      },
+    ],
+    "name": "activeSection",
+    "order": 10,
+  },
+  Object {
+    "data-test-subj": "no-active-items",
+    "icon": null,
+    "id": "no-active-items",
+    "items": Array [
+      Object {
+        "data-test-subj": "disabled",
+        "href": undefined,
+        "id": "disabled",
+        "isSelected": false,
+        "name": "disabled",
+        "order": undefined,
+      },
+      Object {
+        "data-test-subj": "notVisible",
+        "href": undefined,
+        "id": "notVisible",
+        "isSelected": false,
+        "name": "notVisible",
+        "order": undefined,
+      },
+    ],
+    "name": "No active items",
+    "order": 10,
+  },
+]
+`;
+
+exports[`Management maps legacy sections and apps into SidebarNav items 1`] = `
+Array [
+  Object {
+    "data-test-subj": "no-active-items",
+    "icon": null,
+    "id": "no-active-items",
+    "items": Array [
+      Object {
+        "data-test-subj": "disabled",
+        "href": undefined,
+        "id": "disabled",
+        "isSelected": false,
+        "name": "disabled",
+        "order": undefined,
+      },
+      Object {
+        "data-test-subj": "notVisible",
+        "href": undefined,
+        "id": "notVisible",
+        "isSelected": false,
+        "name": "notVisible",
+        "order": undefined,
+      },
+    ],
+    "name": "No active items",
+    "order": 10,
+  },
+  Object {
+    "data-test-subj": "activeSection",
+    "icon": null,
+    "id": "activeSection",
+    "items": Array [
+      Object {
+        "data-test-subj": "item",
+        "href": undefined,
+        "id": "item",
+        "isSelected": false,
+        "name": "item",
+        "order": undefined,
+      },
+    ],
+    "name": "activeSection",
+    "order": 10,
+  },
+]
+`;
diff --git a/src/legacy/ui/public/management/components/_index.scss b/src/plugins/management/public/components/management_sidebar_nav/_index.scss
similarity index 100%
rename from src/legacy/ui/public/management/components/_index.scss
rename to src/plugins/management/public/components/management_sidebar_nav/_index.scss
diff --git a/src/legacy/ui/public/management/components/_sidebar_nav.scss b/src/plugins/management/public/components/management_sidebar_nav/_sidebar_nav.scss
similarity index 88%
rename from src/legacy/ui/public/management/components/_sidebar_nav.scss
rename to src/plugins/management/public/components/management_sidebar_nav/_sidebar_nav.scss
index 0c2b2bc228b2cc..cf88ed9b0a88b5 100644
--- a/src/legacy/ui/public/management/components/_sidebar_nav.scss
+++ b/src/plugins/management/public/components/management_sidebar_nav/_sidebar_nav.scss
@@ -1,4 +1,4 @@
-.mgtSidebarNav {
+.mgtSideBarNav {
   width: 192px;
 }
 
diff --git a/src/plugins/management/public/components/management_sidebar_nav/index.ts b/src/plugins/management/public/components/management_sidebar_nav/index.ts
new file mode 100644
index 00000000000000..79142fdb69a74d
--- /dev/null
+++ b/src/plugins/management/public/components/management_sidebar_nav/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { ManagementSidebarNav } from './management_sidebar_nav';
diff --git a/src/legacy/ui/public/management/components/sidebar_nav.test.ts b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.test.ts
similarity index 75%
rename from src/legacy/ui/public/management/components/sidebar_nav.test.ts
rename to src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.test.ts
index e02cc7d2901b64..e04e0a75726126 100644
--- a/src/legacy/ui/public/management/components/sidebar_nav.test.ts
+++ b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.test.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { IndexedArray } from '../../indexed_array';
-import { sideNavItems } from '../components/sidebar_nav';
+import { IndexedArray } from '../../../../../legacy/ui/public/indexed_array';
+import { mergeLegacyItems } from './management_sidebar_nav';
 
 const toIndexedArray = (initialSet: any[]) =>
   new IndexedArray({
@@ -30,30 +30,33 @@ const toIndexedArray = (initialSet: any[]) =>
 const activeProps = { visible: true, disabled: false };
 const disabledProps = { visible: true, disabled: true };
 const notVisibleProps = { visible: false, disabled: false };
-
 const visibleItem = { display: 'item', id: 'item', ...activeProps };
 
 const notVisibleSection = {
   display: 'Not visible',
   id: 'not-visible',
+  order: 10,
   visibleItems: toIndexedArray([visibleItem]),
   ...notVisibleProps,
 };
 const disabledSection = {
   display: 'Disabled',
   id: 'disabled',
+  order: 10,
   visibleItems: toIndexedArray([visibleItem]),
   ...disabledProps,
 };
 const noItemsSection = {
   display: 'No items',
   id: 'no-items',
+  order: 10,
   visibleItems: toIndexedArray([]),
   ...activeProps,
 };
 const noActiveItemsSection = {
   display: 'No active items',
   id: 'no-active-items',
+  order: 10,
   visibleItems: toIndexedArray([
     { display: 'disabled', id: 'disabled', ...disabledProps },
     { display: 'notVisible', id: 'notVisible', ...notVisibleProps },
@@ -63,6 +66,7 @@ const noActiveItemsSection = {
 const activeSection = {
   display: 'activeSection',
   id: 'activeSection',
+  order: 10,
   visibleItems: toIndexedArray([visibleItem]),
   ...activeProps,
 };
@@ -76,7 +80,19 @@ const managementSections = [
 ];
 
 describe('Management', () => {
-  it('filters and filters and maps section objects into SidebarNav items', () => {
-    expect(sideNavItems(managementSections, 'active-item-id')).toMatchSnapshot();
+  it('maps legacy sections and apps into SidebarNav items', () => {
+    expect(mergeLegacyItems([], managementSections, 'active-item-id')).toMatchSnapshot();
+  });
+
+  it('adds legacy apps to existing SidebarNav sections', () => {
+    const navSection = {
+      'data-test-subj': 'activeSection',
+      icon: null,
+      id: 'activeSection',
+      items: [],
+      name: 'activeSection',
+      order: 10,
+    };
+    expect(mergeLegacyItems([navSection], managementSections, 'active-item-id')).toMatchSnapshot();
   });
 });
diff --git a/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
new file mode 100644
index 00000000000000..cb0b82d0f0bde4
--- /dev/null
+++ b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
@@ -0,0 +1,200 @@
+/*
+ * 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 {
+  EuiIcon,
+  // @ts-ignore
+  EuiSideNav,
+  EuiScreenReaderOnly,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { LegacySection, LegacyApp } from '../../types';
+import { ManagementApp } from '../../management_app';
+import { ManagementSection } from '../../management_section';
+
+interface NavApp {
+  id: string;
+  name: string;
+  [key: string]: unknown;
+  order: number; // only needed while merging platform and legacy
+}
+
+interface NavSection extends NavApp {
+  items: NavApp[];
+}
+
+interface ManagementSidebarNavProps {
+  getSections: () => ManagementSection[];
+  legacySections: LegacySection[];
+  selectedId: string;
+}
+
+interface ManagementSidebarNavState {
+  isSideNavOpenOnMobile: boolean;
+}
+
+const managementSectionOrAppToNav = (appOrSection: ManagementApp | ManagementSection) => ({
+  id: appOrSection.id,
+  name: appOrSection.title,
+  'data-test-subj': appOrSection.id,
+  order: appOrSection.order,
+});
+
+const managementSectionToNavSection = (section: ManagementSection) => {
+  const iconType = section.euiIconType
+    ? section.euiIconType
+    : section.icon
+    ? section.icon
+    : 'empty';
+
+  return {
+    icon: <EuiIcon type={iconType} size="m" />,
+    ...managementSectionOrAppToNav(section),
+  };
+};
+
+const managementAppToNavItem = (selectedId?: string, parentId?: string) => (
+  app: ManagementApp
+) => ({
+  isSelected: selectedId === app.id,
+  href: `#/management/${parentId}/${app.id}`,
+  ...managementSectionOrAppToNav(app),
+});
+
+const legacySectionToNavSection = (section: LegacySection) => ({
+  name: section.display,
+  id: section.id,
+  icon: section.icon ? <EuiIcon type={section.icon} /> : null,
+  items: [],
+  'data-test-subj': section.id,
+  // @ts-ignore
+  order: section.order,
+});
+
+const legacyAppToNavItem = (app: LegacyApp, selectedId: string) => ({
+  isSelected: selectedId === app.id,
+  name: app.display,
+  id: app.id,
+  href: app.url,
+  'data-test-subj': app.id,
+  // @ts-ignore
+  order: app.order,
+});
+
+const sectionVisible = (section: LegacySection | LegacyApp) => !section.disabled && section.visible;
+
+const sideNavItems = (sections: ManagementSection[], selectedId: string) =>
+  sections.map(section => ({
+    items: section.getAppsEnabled().map(managementAppToNavItem(selectedId, section.id)),
+    ...managementSectionToNavSection(section),
+  }));
+
+const findOrAddSection = (navItems: NavSection[], legacySection: LegacySection): NavSection => {
+  const foundSection = navItems.find(sec => sec.id === legacySection.id);
+
+  if (foundSection) {
+    return foundSection;
+  } else {
+    const newSection = legacySectionToNavSection(legacySection);
+    navItems.push(newSection);
+    navItems.sort((a: NavSection, b: NavSection) => a.order - b.order); // only needed while merging platform and legacy
+    return newSection;
+  }
+};
+
+export const mergeLegacyItems = (
+  navItems: NavSection[],
+  legacySections: LegacySection[],
+  selectedId: string
+) => {
+  const filteredLegacySections = legacySections
+    .filter(sectionVisible)
+    .filter(section => section.visibleItems.length);
+
+  filteredLegacySections.forEach(legacySection => {
+    const section = findOrAddSection(navItems, legacySection);
+    legacySection.visibleItems.forEach(app => {
+      section.items.push(legacyAppToNavItem(app, selectedId));
+      return section.items.sort((a, b) => a.order - b.order);
+    });
+  });
+
+  return navItems;
+};
+
+const sectionsToItems = (
+  sections: ManagementSection[],
+  legacySections: LegacySection[],
+  selectedId: string
+) => {
+  const navItems = sideNavItems(sections, selectedId);
+  return mergeLegacyItems(navItems, legacySections, selectedId);
+};
+
+export class ManagementSidebarNav extends React.Component<
+  ManagementSidebarNavProps,
+  ManagementSidebarNavState
+> {
+  constructor(props: ManagementSidebarNavProps) {
+    super(props);
+    this.state = {
+      isSideNavOpenOnMobile: false,
+    };
+  }
+
+  public render() {
+    const HEADER_ID = 'management-nav-header';
+
+    return (
+      <>
+        <EuiScreenReaderOnly>
+          <h2 id={HEADER_ID}>
+            {i18n.translate('management.nav.label', {
+              defaultMessage: 'Management',
+            })}
+          </h2>
+        </EuiScreenReaderOnly>
+        <EuiSideNav
+          aria-labelledby={HEADER_ID}
+          mobileTitle={this.renderMobileTitle()}
+          isOpenOnMobile={this.state.isSideNavOpenOnMobile}
+          toggleOpenOnMobile={this.toggleOpenOnMobile}
+          items={sectionsToItems(
+            this.props.getSections(),
+            this.props.legacySections,
+            this.props.selectedId
+          )}
+          className="mgtSideBarNav"
+        />
+      </>
+    );
+  }
+
+  private renderMobileTitle() {
+    return <FormattedMessage id="management.nav.menu" defaultMessage="Management menu" />;
+  }
+
+  private toggleOpenOnMobile = () => {
+    this.setState({
+      isSideNavOpenOnMobile: !this.state.isSideNavOpenOnMobile,
+    });
+  };
+}
diff --git a/src/plugins/management/public/index.ts b/src/plugins/management/public/index.ts
index ee3866c734f194..faec466dbd6714 100644
--- a/src/plugins/management/public/index.ts
+++ b/src/plugins/management/public/index.ts
@@ -24,4 +24,7 @@ export function plugin(initializerContext: PluginInitializerContext) {
   return new ManagementPlugin();
 }
 
-export { ManagementStart } from './types';
+export { ManagementSetup, ManagementStart, RegisterManagementApp } from './types';
+export { ManagementApp } from './management_app';
+export { ManagementSection } from './management_section';
+export { ManagementSidebarNav } from './components'; // for use in legacy management apps
diff --git a/src/plugins/management/public/legacy/index.js b/src/plugins/management/public/legacy/index.js
index 63b9d2c6b27d7e..f2e0ba89b7b597 100644
--- a/src/plugins/management/public/legacy/index.js
+++ b/src/plugins/management/public/legacy/index.js
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-export { management } from './sections_register';
+export { LegacyManagementAdapter } from './sections_register';
+export { LegacyManagementSection } from './section';
diff --git a/src/plugins/management/public/legacy/section.js b/src/plugins/management/public/legacy/section.js
index f269e3fe295b75..7d733b7b3173bf 100644
--- a/src/plugins/management/public/legacy/section.js
+++ b/src/plugins/management/public/legacy/section.js
@@ -22,7 +22,7 @@ import { IndexedArray } from '../../../../legacy/ui/public/indexed_array';
 
 const listeners = [];
 
-export class ManagementSection {
+export class LegacyManagementSection {
   /**
    * @param {string} id
    * @param {object} options
@@ -83,7 +83,11 @@ export class ManagementSection {
    */
 
   register(id, options = {}) {
-    const item = new ManagementSection(id, assign(options, { parent: this }), this.capabilities);
+    const item = new LegacyManagementSection(
+      id,
+      assign(options, { parent: this }),
+      this.capabilities
+    );
 
     if (this.hasItem(id)) {
       throw new Error(`'${id}' is already registered`);
diff --git a/src/plugins/management/public/legacy/section.test.js b/src/plugins/management/public/legacy/section.test.js
index 61bafd298afb32..45cc80ef80edd1 100644
--- a/src/plugins/management/public/legacy/section.test.js
+++ b/src/plugins/management/public/legacy/section.test.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ManagementSection } from './section';
+import { LegacyManagementSection } from './section';
 import { IndexedArray } from '../../../../legacy/ui/public/indexed_array';
 
 const capabilitiesMock = {
@@ -29,42 +29,42 @@ const capabilitiesMock = {
 describe('ManagementSection', () => {
   describe('constructor', () => {
     it('defaults display to id', () => {
-      const section = new ManagementSection('kibana', {}, capabilitiesMock);
+      const section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       expect(section.display).toBe('kibana');
     });
 
     it('defaults visible to true', () => {
-      const section = new ManagementSection('kibana', {}, capabilitiesMock);
+      const section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       expect(section.visible).toBe(true);
     });
 
     it('defaults disabled to false', () => {
-      const section = new ManagementSection('kibana', {}, capabilitiesMock);
+      const section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       expect(section.disabled).toBe(false);
     });
 
     it('defaults tooltip to empty string', () => {
-      const section = new ManagementSection('kibana', {}, capabilitiesMock);
+      const section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       expect(section.tooltip).toBe('');
     });
 
     it('defaults url to empty string', () => {
-      const section = new ManagementSection('kibana', {}, capabilitiesMock);
+      const section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       expect(section.url).toBe('');
     });
 
     it('exposes items', () => {
-      const section = new ManagementSection('kibana', {}, capabilitiesMock);
+      const section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       expect(section.items).toHaveLength(0);
     });
 
     it('exposes visibleItems', () => {
-      const section = new ManagementSection('kibana', {}, capabilitiesMock);
+      const section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       expect(section.visibleItems).toHaveLength(0);
     });
 
     it('assigns all options', () => {
-      const section = new ManagementSection(
+      const section = new LegacyManagementSection(
         'kibana',
         { description: 'test', url: 'foobar' },
         capabilitiesMock
@@ -78,11 +78,11 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana', {}, capabilitiesMock);
+      section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
     });
 
     it('returns a ManagementSection', () => {
-      expect(section.register('about')).toBeInstanceOf(ManagementSection);
+      expect(section.register('about')).toBeInstanceOf(LegacyManagementSection);
     });
 
     it('provides a reference to the parent', () => {
@@ -93,7 +93,7 @@ describe('ManagementSection', () => {
       section.register('about', { description: 'test' });
 
       expect(section.items).toHaveLength(1);
-      expect(section.items[0]).toBeInstanceOf(ManagementSection);
+      expect(section.items[0]).toBeInstanceOf(LegacyManagementSection);
       expect(section.items[0].id).toBe('about');
     });
 
@@ -126,7 +126,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana', {}, capabilitiesMock);
+      section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       section.register('about');
     });
 
@@ -157,12 +157,12 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana', {}, capabilitiesMock);
+      section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
       section.register('about');
     });
 
     it('returns registered section', () => {
-      expect(section.getSection('about')).toBeInstanceOf(ManagementSection);
+      expect(section.getSection('about')).toBeInstanceOf(LegacyManagementSection);
     });
 
     it('returns undefined if un-registered', () => {
@@ -171,7 +171,7 @@ describe('ManagementSection', () => {
 
     it('returns sub-sections specified via a /-separated path', () => {
       section.getSection('about').register('time');
-      expect(section.getSection('about/time')).toBeInstanceOf(ManagementSection);
+      expect(section.getSection('about/time')).toBeInstanceOf(LegacyManagementSection);
       expect(section.getSection('about/time')).toBe(section.getSection('about').getSection('time'));
     });
 
@@ -184,7 +184,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana', {}, capabilitiesMock);
+      section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
 
       section.register('three', { order: 3 });
       section.register('one', { order: 1 });
@@ -214,7 +214,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana', {}, capabilitiesMock);
+      section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
     });
 
     it('hide sets visible to false', () => {
@@ -233,7 +233,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana', {}, capabilitiesMock);
+      section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
     });
 
     it('disable sets disabled to true', () => {
@@ -251,7 +251,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana', {}, capabilitiesMock);
+      section = new LegacyManagementSection('kibana', {}, capabilitiesMock);
 
       section.register('three', { order: 3 });
       section.register('one', { order: 1 });
diff --git a/src/plugins/management/public/legacy/sections_register.js b/src/plugins/management/public/legacy/sections_register.js
index 888b2c5bc3aeb6..63d919377f89ea 100644
--- a/src/plugins/management/public/legacy/sections_register.js
+++ b/src/plugins/management/public/legacy/sections_register.js
@@ -17,44 +17,48 @@
  * under the License.
  */
 
-import { ManagementSection } from './section';
+import { LegacyManagementSection } from './section';
 import { i18n } from '@kbn/i18n';
 
-export const management = capabilities => {
-  const main = new ManagementSection(
-    'management',
-    {
-      display: i18n.translate('management.displayName', {
-        defaultMessage: 'Management',
-      }),
-    },
-    capabilities
-  );
+export class LegacyManagementAdapter {
+  main = undefined;
+  init = capabilities => {
+    this.main = new LegacyManagementSection(
+      'management',
+      {
+        display: i18n.translate('management.displayName', {
+          defaultMessage: 'Management',
+        }),
+      },
+      capabilities
+    );
 
-  main.register('data', {
-    display: i18n.translate('management.connectDataDisplayName', {
-      defaultMessage: 'Connect Data',
-    }),
-    order: 0,
-  });
+    this.main.register('data', {
+      display: i18n.translate('management.connectDataDisplayName', {
+        defaultMessage: 'Connect Data',
+      }),
+      order: 0,
+    });
 
-  main.register('elasticsearch', {
-    display: 'Elasticsearch',
-    order: 20,
-    icon: 'logoElasticsearch',
-  });
+    this.main.register('elasticsearch', {
+      display: 'Elasticsearch',
+      order: 20,
+      icon: 'logoElasticsearch',
+    });
 
-  main.register('kibana', {
-    display: 'Kibana',
-    order: 30,
-    icon: 'logoKibana',
-  });
+    this.main.register('kibana', {
+      display: 'Kibana',
+      order: 30,
+      icon: 'logoKibana',
+    });
 
-  main.register('logstash', {
-    display: 'Logstash',
-    order: 30,
-    icon: 'logoLogstash',
-  });
+    this.main.register('logstash', {
+      display: 'Logstash',
+      order: 30,
+      icon: 'logoLogstash',
+    });
 
-  return main;
-};
+    return this.main;
+  };
+  getManagement = () => this.main;
+}
diff --git a/src/plugins/management/public/management_app.test.tsx b/src/plugins/management/public/management_app.test.tsx
new file mode 100644
index 00000000000000..a76b234d95ef51
--- /dev/null
+++ b/src/plugins/management/public/management_app.test.tsx
@@ -0,0 +1,66 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { coreMock } from '../../../core/public/mocks';
+
+import { ManagementApp } from './management_app';
+// @ts-ignore
+import { LegacyManagementSection } from './legacy';
+
+function createTestApp() {
+  const legacySection = new LegacyManagementSection('legacy');
+  return new ManagementApp(
+    {
+      id: 'test-app',
+      title: 'Test App',
+      basePath: '',
+      mount(params) {
+        params.setBreadcrumbs([{ text: 'Test App' }]);
+        ReactDOM.render(<div>Test App - Hello world!</div>, params.element);
+
+        return () => {
+          ReactDOM.unmountComponentAtNode(params.element);
+        };
+      },
+    },
+    () => [],
+    jest.fn(),
+    () => legacySection,
+    coreMock.createSetup().getStartServices
+  );
+}
+
+test('Management app can mount and unmount', async () => {
+  const testApp = createTestApp();
+  const container = document.createElement('div');
+  document.body.appendChild(container);
+  const unmount = testApp.mount({ element: container, basePath: '', setBreadcrumbs: jest.fn() });
+  expect(container).toMatchSnapshot();
+  (await unmount)();
+  expect(container).toMatchSnapshot();
+});
+
+test('Enabled by default, can disable', () => {
+  const testApp = createTestApp();
+  expect(testApp.enabled).toBe(true);
+  testApp.disable();
+  expect(testApp.enabled).toBe(false);
+});
diff --git a/src/plugins/management/public/management_app.tsx b/src/plugins/management/public/management_app.tsx
new file mode 100644
index 00000000000000..f7e8dba4f82100
--- /dev/null
+++ b/src/plugins/management/public/management_app.tsx
@@ -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 * as React from 'react';
+import ReactDOM from 'react-dom';
+import { i18n } from '@kbn/i18n';
+import { CreateManagementApp, ManagementSectionMount, Unmount } from './types';
+import { KibanaLegacySetup } from '../../kibana_legacy/public';
+// @ts-ignore
+import { LegacyManagementSection } from './legacy';
+import { ManagementChrome } from './components';
+import { ManagementSection } from './management_section';
+import { ChromeBreadcrumb, CoreSetup } from '../../../core/public/';
+
+export class ManagementApp {
+  readonly id: string;
+  readonly title: string;
+  readonly basePath: string;
+  readonly order: number;
+  readonly mount: ManagementSectionMount;
+  protected enabledStatus: boolean = true;
+
+  constructor(
+    { id, title, basePath, order = 100, mount }: CreateManagementApp,
+    getSections: () => ManagementSection[],
+    registerLegacyApp: KibanaLegacySetup['registerLegacyApp'],
+    getLegacyManagementSections: () => LegacyManagementSection,
+    getStartServices: CoreSetup['getStartServices']
+  ) {
+    this.id = id;
+    this.title = title;
+    this.basePath = basePath;
+    this.order = order;
+    this.mount = mount;
+
+    registerLegacyApp({
+      id: basePath.substr(1), // get rid of initial slash
+      title,
+      mount: async ({}, params) => {
+        let appUnmount: Unmount;
+        async function setBreadcrumbs(crumbs: ChromeBreadcrumb[]) {
+          const [coreStart] = await getStartServices();
+          coreStart.chrome.setBreadcrumbs([
+            {
+              text: i18n.translate('management.breadcrumb', {
+                defaultMessage: 'Management',
+              }),
+              href: '#/management',
+            },
+            ...crumbs,
+          ]);
+        }
+
+        ReactDOM.render(
+          <ManagementChrome
+            getSections={getSections}
+            selectedId={id}
+            legacySections={getLegacyManagementSections().items}
+            onMounted={async element => {
+              appUnmount = await mount({
+                basePath,
+                element,
+                setBreadcrumbs,
+              });
+            }}
+          />,
+          params.element
+        );
+
+        return async () => {
+          appUnmount();
+          ReactDOM.unmountComponentAtNode(params.element);
+        };
+      },
+    });
+  }
+  public enable() {
+    this.enabledStatus = true;
+  }
+  public disable() {
+    this.enabledStatus = false;
+  }
+  public get enabled() {
+    return this.enabledStatus;
+  }
+}
diff --git a/src/plugins/management/public/management_section.test.ts b/src/plugins/management/public/management_section.test.ts
new file mode 100644
index 00000000000000..c68175ee0a678b
--- /dev/null
+++ b/src/plugins/management/public/management_section.test.ts
@@ -0,0 +1,65 @@
+/*
+ * 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 { ManagementSection } from './management_section';
+// @ts-ignore
+import { LegacyManagementSection } from './legacy';
+import { coreMock } from '../../../core/public/mocks';
+
+function createSection(registerLegacyApp: () => void) {
+  const legacySection = new LegacyManagementSection('legacy');
+  const getLegacySection = () => legacySection;
+  const getManagementSections: () => ManagementSection[] = () => [];
+
+  const testSectionConfig = { id: 'test-section', title: 'Test Section' };
+  return new ManagementSection(
+    testSectionConfig,
+    getManagementSections,
+    registerLegacyApp,
+    getLegacySection,
+    coreMock.createSetup().getStartServices
+  );
+}
+
+test('cannot register two apps with the same id', () => {
+  const registerLegacyApp = jest.fn();
+  const section = createSection(registerLegacyApp);
+
+  const testAppConfig = { id: 'test-app', title: 'Test App', mount: () => () => {} };
+
+  section.registerApp(testAppConfig);
+  expect(registerLegacyApp).toHaveBeenCalled();
+  expect(section.apps.length).toEqual(1);
+
+  expect(() => {
+    section.registerApp(testAppConfig);
+  }).toThrow();
+});
+
+test('can enable and disable apps', () => {
+  const registerLegacyApp = jest.fn();
+  const section = createSection(registerLegacyApp);
+
+  const testAppConfig = { id: 'test-app', title: 'Test App', mount: () => () => {} };
+
+  const app = section.registerApp(testAppConfig);
+  expect(section.getAppsEnabled().length).toEqual(1);
+  app.disable();
+  expect(section.getAppsEnabled().length).toEqual(0);
+});
diff --git a/src/plugins/management/public/management_section.ts b/src/plugins/management/public/management_section.ts
new file mode 100644
index 00000000000000..2f323c4b6a9cf3
--- /dev/null
+++ b/src/plugins/management/public/management_section.ts
@@ -0,0 +1,78 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CreateSection, RegisterManagementAppArgs } from './types';
+import { KibanaLegacySetup } from '../../kibana_legacy/public';
+import { CoreSetup } from '../../../core/public';
+// @ts-ignore
+import { LegacyManagementSection } from './legacy';
+import { ManagementApp } from './management_app';
+
+export class ManagementSection {
+  public readonly id: string = '';
+  public readonly title: string = '';
+  public readonly apps: ManagementApp[] = [];
+  public readonly order: number;
+  public readonly euiIconType?: string;
+  public readonly icon?: string;
+  private readonly getSections: () => ManagementSection[];
+  private readonly registerLegacyApp: KibanaLegacySetup['registerLegacyApp'];
+  private readonly getLegacyManagementSection: () => LegacyManagementSection;
+  private readonly getStartServices: CoreSetup['getStartServices'];
+
+  constructor(
+    { id, title, order = 100, euiIconType, icon }: CreateSection,
+    getSections: () => ManagementSection[],
+    registerLegacyApp: KibanaLegacySetup['registerLegacyApp'],
+    getLegacyManagementSection: () => ManagementSection,
+    getStartServices: CoreSetup['getStartServices']
+  ) {
+    this.id = id;
+    this.title = title;
+    this.order = order;
+    this.euiIconType = euiIconType;
+    this.icon = icon;
+    this.getSections = getSections;
+    this.registerLegacyApp = registerLegacyApp;
+    this.getLegacyManagementSection = getLegacyManagementSection;
+    this.getStartServices = getStartServices;
+  }
+
+  registerApp({ id, title, order, mount }: RegisterManagementAppArgs) {
+    if (this.getApp(id)) {
+      throw new Error(`Management app already registered - id: ${id}, title: ${title}`);
+    }
+
+    const app = new ManagementApp(
+      { id, title, order, mount, basePath: `/management/${this.id}/${id}` },
+      this.getSections,
+      this.registerLegacyApp,
+      this.getLegacyManagementSection,
+      this.getStartServices
+    );
+    this.apps.push(app);
+    return app;
+  }
+  getApp(id: ManagementApp['id']) {
+    return this.apps.find(app => app.id === id);
+  }
+  getAppsEnabled() {
+    return this.apps.filter(app => app.enabled).sort((a, b) => a.order - b.order);
+  }
+}
diff --git a/src/plugins/management/public/management_service.test.ts b/src/plugins/management/public/management_service.test.ts
new file mode 100644
index 00000000000000..854406a10335be
--- /dev/null
+++ b/src/plugins/management/public/management_service.test.ts
@@ -0,0 +1,55 @@
+/*
+ * 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 { ManagementService } from './management_service';
+import { coreMock } from '../../../core/public/mocks';
+
+const mockKibanaLegacy = { registerLegacyApp: () => {}, forwardApp: () => {} };
+
+test('Provides default sections', () => {
+  const service = new ManagementService().setup(
+    mockKibanaLegacy,
+    () => {},
+    coreMock.createSetup().getStartServices
+  );
+  expect(service.getAllSections().length).toEqual(3);
+  expect(service.getSection('kibana')).not.toBeUndefined();
+  expect(service.getSection('logstash')).not.toBeUndefined();
+  expect(service.getSection('elasticsearch')).not.toBeUndefined();
+});
+
+test('Register section, enable and disable', () => {
+  const service = new ManagementService().setup(
+    mockKibanaLegacy,
+    () => {},
+    coreMock.createSetup().getStartServices
+  );
+  const testSection = service.register({ id: 'test-section', title: 'Test Section' });
+  expect(service.getSection('test-section')).not.toBeUndefined();
+
+  const testApp = testSection.registerApp({
+    id: 'test-app',
+    title: 'Test App',
+    mount: () => () => {},
+  });
+  expect(testSection.getApp('test-app')).not.toBeUndefined();
+  expect(service.getSectionsEnabled().length).toEqual(1);
+  testApp.disable();
+  expect(service.getSectionsEnabled().length).toEqual(0);
+});
diff --git a/src/plugins/management/public/management_service.ts b/src/plugins/management/public/management_service.ts
new file mode 100644
index 00000000000000..4a900345b38436
--- /dev/null
+++ b/src/plugins/management/public/management_service.ts
@@ -0,0 +1,103 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ManagementSection } from './management_section';
+import { KibanaLegacySetup } from '../../kibana_legacy/public';
+// @ts-ignore
+import { LegacyManagementSection } from './legacy';
+import { CreateSection } from './types';
+import { CoreSetup, CoreStart } from '../../../core/public';
+
+export class ManagementService {
+  private sections: ManagementSection[] = [];
+
+  private register(
+    registerLegacyApp: KibanaLegacySetup['registerLegacyApp'],
+    getLegacyManagement: () => LegacyManagementSection,
+    getStartServices: CoreSetup['getStartServices']
+  ) {
+    return (section: CreateSection) => {
+      if (this.getSection(section.id)) {
+        throw Error(`ManagementSection '${section.id}' already registered`);
+      }
+
+      const newSection = new ManagementSection(
+        section,
+        this.getSectionsEnabled.bind(this),
+        registerLegacyApp,
+        getLegacyManagement,
+        getStartServices
+      );
+      this.sections.push(newSection);
+      return newSection;
+    };
+  }
+  private getSection(sectionId: ManagementSection['id']) {
+    return this.sections.find(section => section.id === sectionId);
+  }
+
+  private getAllSections() {
+    return this.sections;
+  }
+
+  private getSectionsEnabled() {
+    return this.sections
+      .filter(section => section.getAppsEnabled().length > 0)
+      .sort((a, b) => a.order - b.order);
+  }
+
+  private sharedInterface = {
+    getSection: this.getSection.bind(this),
+    getSectionsEnabled: this.getSectionsEnabled.bind(this),
+    getAllSections: this.getAllSections.bind(this),
+  };
+
+  public setup(
+    kibanaLegacy: KibanaLegacySetup,
+    getLegacyManagement: () => LegacyManagementSection,
+    getStartServices: CoreSetup['getStartServices']
+  ) {
+    const register = this.register.bind(this)(
+      kibanaLegacy.registerLegacyApp,
+      getLegacyManagement,
+      getStartServices
+    );
+
+    register({ id: 'kibana', title: 'Kibana', order: 30, euiIconType: 'logoKibana' });
+    register({ id: 'logstash', title: 'Logstash', order: 30, euiIconType: 'logoLogstash' });
+    register({
+      id: 'elasticsearch',
+      title: 'Elasticsearch',
+      order: 20,
+      euiIconType: 'logoElasticsearch',
+    });
+
+    return {
+      register,
+      ...this.sharedInterface,
+    };
+  }
+
+  public start(navigateToApp: CoreStart['application']['navigateToApp']) {
+    return {
+      navigateToApp, // apps are currently registered as top level apps but this may change in the future
+      ...this.sharedInterface,
+    };
+  }
+}
diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts
index c65dfd1dc7bb45..195d96c11d8d92 100644
--- a/src/plugins/management/public/plugin.ts
+++ b/src/plugins/management/public/plugin.ts
@@ -18,18 +18,30 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { ManagementStart } from './types';
+import { ManagementSetup, ManagementStart } from './types';
+import { ManagementService } from './management_service';
+import { KibanaLegacySetup } from '../../kibana_legacy/public';
 // @ts-ignore
-import { management } from './legacy';
+import { LegacyManagementAdapter } from './legacy';
 
-export class ManagementPlugin implements Plugin<{}, ManagementStart> {
-  public setup(core: CoreSetup) {
-    return {};
+export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart> {
+  private managementSections = new ManagementService();
+  private legacyManagement = new LegacyManagementAdapter();
+
+  public setup(core: CoreSetup, { kibana_legacy }: { kibana_legacy: KibanaLegacySetup }) {
+    return {
+      sections: this.managementSections.setup(
+        kibana_legacy,
+        this.legacyManagement.getManagement,
+        core.getStartServices
+      ),
+    };
   }
 
   public start(core: CoreStart) {
     return {
-      legacy: management(core.application.capabilities),
+      sections: this.managementSections.start(core.application.navigateToApp),
+      legacy: this.legacyManagement.init(core.application.capabilities),
     };
   }
 }
diff --git a/src/plugins/management/public/types.ts b/src/plugins/management/public/types.ts
index 6ca1faf338c39f..4dbea30ff062da 100644
--- a/src/plugins/management/public/types.ts
+++ b/src/plugins/management/public/types.ts
@@ -17,6 +17,82 @@
  * under the License.
  */
 
+import { IconType } from '@elastic/eui';
+import { ManagementApp } from './management_app';
+import { ManagementSection } from './management_section';
+import { ChromeBreadcrumb, ApplicationStart } from '../../../core/public/';
+
+export interface ManagementSetup {
+  sections: SectionsServiceSetup;
+}
+
 export interface ManagementStart {
+  sections: SectionsServiceStart;
   legacy: any;
 }
+
+interface SectionsServiceSetup {
+  getSection: (sectionId: ManagementSection['id']) => ManagementSection | undefined;
+  getAllSections: () => ManagementSection[];
+  register: RegisterSection;
+}
+
+interface SectionsServiceStart {
+  getSection: (sectionId: ManagementSection['id']) => ManagementSection | undefined;
+  getAllSections: () => ManagementSection[];
+  navigateToApp: ApplicationStart['navigateToApp'];
+}
+
+export interface CreateSection {
+  id: string;
+  title: string;
+  order?: number;
+  euiIconType?: string; // takes precedence over `icon` property.
+  icon?: string; // URL to image file; fallback if no `euiIconType`
+}
+
+export type RegisterSection = (section: CreateSection) => ManagementSection;
+
+export interface RegisterManagementAppArgs {
+  id: string;
+  title: string;
+  mount: ManagementSectionMount;
+  order?: number;
+}
+
+export type RegisterManagementApp = (managementApp: RegisterManagementAppArgs) => ManagementApp;
+
+export type Unmount = () => Promise<void> | void;
+
+interface ManagementAppMountParams {
+  basePath: string; // base path for setting up your router
+  element: HTMLElement; // element the section should render into
+  setBreadcrumbs: (crumbs: ChromeBreadcrumb[]) => void;
+}
+
+export type ManagementSectionMount = (
+  params: ManagementAppMountParams
+) => Unmount | Promise<Unmount>;
+
+export interface CreateManagementApp {
+  id: string;
+  title: string;
+  basePath: string;
+  order?: number;
+  mount: ManagementSectionMount;
+}
+
+export interface LegacySection extends LegacyApp {
+  visibleItems: LegacyApp[];
+}
+
+export interface LegacyApp {
+  disabled: boolean;
+  visible: boolean;
+  id: string;
+  display: string;
+  url?: string;
+  euiIconType?: IconType;
+  icon?: string;
+  order: number;
+}
diff --git a/test/plugin_functional/config.js b/test/plugin_functional/config.js
index 87026ce25d9aa3..e9a4f3bcc4b1a9 100644
--- a/test/plugin_functional/config.js
+++ b/test/plugin_functional/config.js
@@ -37,6 +37,7 @@ export default async function({ readConfigFile }) {
       require.resolve('./test_suites/panel_actions'),
       require.resolve('./test_suites/embeddable_explorer'),
       require.resolve('./test_suites/core_plugins'),
+      require.resolve('./test_suites/management'),
     ],
     services: {
       ...functionalConfig.get('services'),
diff --git a/test/plugin_functional/plugins/management_test_plugin/kibana.json b/test/plugin_functional/plugins/management_test_plugin/kibana.json
new file mode 100644
index 00000000000000..e52b60b3a4e313
--- /dev/null
+++ b/test/plugin_functional/plugins/management_test_plugin/kibana.json
@@ -0,0 +1,9 @@
+{
+  "id": "management_test_plugin",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": ["management_test_plugin"],
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["management"]
+}
diff --git a/test/plugin_functional/plugins/management_test_plugin/package.json b/test/plugin_functional/plugins/management_test_plugin/package.json
new file mode 100644
index 00000000000000..656d92e9eb1f78
--- /dev/null
+++ b/test/plugin_functional/plugins/management_test_plugin/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "management_test_plugin",
+  "version": "1.0.0",
+  "main": "target/test/plugin_functional/plugins/management_test_plugin",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "kbn": "node ../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.7.2"
+  }
+}
diff --git a/test/plugin_functional/plugins/management_test_plugin/public/index.ts b/test/plugin_functional/plugins/management_test_plugin/public/index.ts
new file mode 100644
index 00000000000000..1efcc6cd3bbd62
--- /dev/null
+++ b/test/plugin_functional/plugins/management_test_plugin/public/index.ts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializer } from 'kibana/public';
+import {
+  ManagementTestPlugin,
+  ManagementTestPluginSetup,
+  ManagementTestPluginStart,
+} from './plugin';
+
+export const plugin: PluginInitializer<ManagementTestPluginSetup, ManagementTestPluginStart> = () =>
+  new ManagementTestPlugin();
diff --git a/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx b/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
new file mode 100644
index 00000000000000..8b7cdd653ed8c3
--- /dev/null
+++ b/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
@@ -0,0 +1,73 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as React from 'react';
+import ReactDOM from 'react-dom';
+import { HashRouter as Router, Switch, Route, Link } from 'react-router-dom';
+import { CoreSetup, Plugin } from 'kibana/public';
+import { ManagementSetup } from '../../../../../src/plugins/management/public';
+
+export class ManagementTestPlugin
+  implements Plugin<ManagementTestPluginSetup, ManagementTestPluginStart> {
+  public setup(core: CoreSetup, { management }: { management: ManagementSetup }) {
+    const testSection = management.sections.register({
+      id: 'test-section',
+      title: 'Test Section',
+      euiIconType: 'logoKibana',
+      order: 25,
+    });
+
+    testSection!.registerApp({
+      id: 'test-management',
+      title: 'Management Test',
+      mount(params) {
+        params.setBreadcrumbs([{ text: 'Management Test' }]);
+        ReactDOM.render(
+          <Router>
+            <h1 data-test-subj="test-management-header">Hello from management test plugin</h1>
+            <Switch>
+              <Route exact path={`${params.basePath}`}>
+                <Link to={`${params.basePath}/one`} data-test-subj="test-management-link-one">
+                  Link to /one
+                </Link>
+              </Route>
+              <Route path={`${params.basePath}/one`}>
+                <Link to={`${params.basePath}`} data-test-subj="test-management-link-basepath">
+                  Link to basePath
+                </Link>
+              </Route>
+            </Switch>
+          </Router>,
+          params.element
+        );
+
+        return () => {
+          ReactDOM.unmountComponentAtNode(params.element);
+        };
+      },
+    });
+    return {};
+  }
+
+  public start() {}
+  public stop() {}
+}
+
+export type ManagementTestPluginSetup = ReturnType<ManagementTestPlugin['setup']>;
+export type ManagementTestPluginStart = ReturnType<ManagementTestPlugin['start']>;
diff --git a/test/plugin_functional/plugins/management_test_plugin/tsconfig.json b/test/plugin_functional/plugins/management_test_plugin/tsconfig.json
new file mode 100644
index 00000000000000..5fcaeafbb0d852
--- /dev/null
+++ b/test/plugin_functional/plugins/management_test_plugin/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": [
+    "index.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "../../../../typings/**/*",
+  ],
+  "exclude": []
+}
diff --git a/test/plugin_functional/test_suites/management/index.js b/test/plugin_functional/test_suites/management/index.js
new file mode 100644
index 00000000000000..2bfc05547b2922
--- /dev/null
+++ b/test/plugin_functional/test_suites/management/index.js
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export default function({ loadTestFile }) {
+  describe('management plugin', () => {
+    loadTestFile(require.resolve('./management_plugin'));
+  });
+}
diff --git a/test/plugin_functional/test_suites/management/management_plugin.js b/test/plugin_functional/test_suites/management/management_plugin.js
new file mode 100644
index 00000000000000..d65fb1dcd3a7e3
--- /dev/null
+++ b/test/plugin_functional/test_suites/management/management_plugin.js
@@ -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.
+ */
+
+export default function({ getService, getPageObjects }) {
+  const testSubjects = getService('testSubjects');
+  const PageObjects = getPageObjects(['common']);
+
+  describe('management plugin', function describeIndexTests() {
+    before(async () => {
+      await PageObjects.common.navigateToActualUrl('kibana', 'management');
+    });
+
+    it('should be able to navigate to management test app', async () => {
+      await testSubjects.click('test-management');
+      await testSubjects.existOrFail('test-management-header');
+    });
+
+    it('should be able to navigate within management test app', async () => {
+      await testSubjects.click('test-management-link-one');
+      await testSubjects.click('test-management-link-basepath');
+      await testSubjects.existOrFail('test-management-link-one');
+    });
+  });
+}
diff --git a/x-pack/legacy/plugins/infra/types/eui.d.ts b/x-pack/legacy/plugins/infra/types/eui.d.ts
index afcb445a66adb6..e73a73076923d4 100644
--- a/x-pack/legacy/plugins/infra/types/eui.d.ts
+++ b/x-pack/legacy/plugins/infra/types/eui.d.ts
@@ -34,7 +34,7 @@ declare module '@elastic/eui' {
       items: Array<{
         id: string;
         name: string;
-        onClick: () => void;
+        onClick?: () => void;
       }>;
     }>;
     mobileTitle?: React.ReactNode;
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
index fa8ae641686737..fbd39db6969bd4 100644
--- a/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts
@@ -6,6 +6,12 @@
 
 import { ManagementService } from '.';
 
+const mockSections = {
+  getSection: jest.fn(),
+  getAllSections: jest.fn(),
+  navigateToApp: jest.fn(),
+};
+
 describe('ManagementService', () => {
   describe('#start', () => {
     it('registers the spaces management page under the kibana section', () => {
@@ -18,6 +24,7 @@ describe('ManagementService', () => {
         legacy: {
           getSection: jest.fn().mockReturnValue(mockKibanaSection),
         },
+        sections: mockSections,
       };
 
       const deps = {
@@ -49,6 +56,7 @@ describe('ManagementService', () => {
         legacy: {
           getSection: jest.fn().mockReturnValue(mockKibanaSection),
         },
+        sections: mockSections,
       };
 
       const deps = {
@@ -66,6 +74,7 @@ describe('ManagementService', () => {
         legacy: {
           getSection: jest.fn().mockReturnValue(undefined),
         },
+        sections: mockSections,
       };
 
       const deps = {
@@ -94,6 +103,7 @@ describe('ManagementService', () => {
         legacy: {
           getSection: jest.fn().mockReturnValue(mockKibanaSection),
         },
+        sections: mockSections,
       };
 
       const deps = {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 09d71814e5bf09..545a4fc7c8f936 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -441,7 +441,9 @@
     "common.ui.flotCharts.tueLabel": "火",
     "common.ui.flotCharts.wedLabel": "水",
     "common.ui.management.breadcrumb": "管理",
-    "common.ui.management.nav.menu": "管理メニュー",
+    "management.connectDataDisplayName": "データに接続",
+    "management.displayName": "管理",
+    "management.nav.menu": "管理メニュー",
     "common.ui.modals.cancelButtonLabel": "キャンセル",
     "common.ui.notify.fatalError.errorStatusMessage": "エラー {errStatus} {errStatusText}: {errMessage}",
     "common.ui.notify.fatalError.unavailableServerErrorMessage": "HTTP リクエストが接続に失敗しました。Kibana サーバーが実行されていて、ご使用のブラウザの接続が正常に動作していることを確認するか、システム管理者にお問い合わせください。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index e221cba874bcdb..05251d20a66e41 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -441,7 +441,9 @@
     "common.ui.flotCharts.tueLabel": "周二",
     "common.ui.flotCharts.wedLabel": "周三",
     "common.ui.management.breadcrumb": "管理",
-    "common.ui.management.nav.menu": "管理菜单",
+    "management.connectDataDisplayName": "连接数据",
+    "management.displayName": "管理",
+    "management.nav.menu": "管理菜单",
     "common.ui.modals.cancelButtonLabel": "取消",
     "common.ui.notify.fatalError.errorStatusMessage": "错误 {errStatus} {errStatusText}：{errMessage}",
     "common.ui.notify.fatalError.unavailableServerErrorMessage": "HTTP 请求无法连接。请检查 Kibana 服务器是否正在运行以及您的浏览器是否具有有效的连接，或请联系您的系统管理员。",

From 404c42f9557ab774441389db955614d96923c3e0 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Wed, 8 Jan 2020 18:49:17 -0500
Subject: [PATCH 69/96] Filter scripted fields preview field list to source
 fields (#53826)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../components/scripting_help/test_script.js  | 52 +++++++++++++++----
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/legacy/ui/public/field_editor/components/scripting_help/test_script.js b/src/legacy/ui/public/field_editor/components/scripting_help/test_script.js
index 942f39fc98dec1..12bf5c1cce0043 100644
--- a/src/legacy/ui/public/field_editor/components/scripting_help/test_script.js
+++ b/src/legacy/ui/public/field_editor/components/scripting_help/test_script.js
@@ -30,6 +30,8 @@ import {
   EuiTitle,
   EuiCallOut,
 } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 
 import { npStart } from 'ui/new_platform';
 const { SearchBar } = npStart.plugins.data.ui;
@@ -116,7 +118,13 @@ export class TestScript extends Component {
 
     if (previewData.error) {
       return (
-        <EuiCallOut title="There's an error in your script" color="danger" iconType="cross">
+        <EuiCallOut
+          title={i18n.translate('common.ui.fieldEditor.testScript.errorMessage', {
+            defaultMessage: `There's an error in your script`,
+          })}
+          color="danger"
+          iconType="cross"
+        >
           <EuiCodeBlock
             language="json"
             className="scriptPreviewCodeBlock"
@@ -131,7 +139,12 @@ export class TestScript extends Component {
     return (
       <Fragment>
         <EuiTitle size="xs">
-          <p>First 10 results</p>
+          <p>
+            <FormattedMessage
+              id="common.ui.fieldEditor.testScript.resultsLabel"
+              defaultMessage="First 10 results"
+            />
+          </p>
         </EuiTitle>
         <EuiSpacer size="s" />
         <EuiCodeBlock
@@ -151,7 +164,8 @@ export class TestScript extends Component {
 
     this.props.indexPattern.fields
       .filter(field => {
-        return !field.name.startsWith('_');
+        const isMultiField = field.subType && field.subType.multi;
+        return !field.name.startsWith('_') && !isMultiField && !field.scripted;
       })
       .forEach(field => {
         if (fieldsByTypeMap.has(field.type)) {
@@ -180,9 +194,16 @@ export class TestScript extends Component {
 
     return (
       <Fragment>
-        <EuiFormRow label="Additional fields" fullWidth>
+        <EuiFormRow
+          label={i18n.translate('common.ui.fieldEditor.testScript.fieldsLabel', {
+            defaultMessage: 'Additional fields',
+          })}
+          fullWidth
+        >
           <EuiComboBox
-            placeholder="Select..."
+            placeholder={i18n.translate('common.ui.fieldEditor.testScript.fieldsPlaceholder', {
+              defaultMessage: 'Select...',
+            })}
             options={fields}
             selectedOptions={this.state.additionalFields}
             onChange={this.onAdditionalFieldsChange}
@@ -205,7 +226,10 @@ export class TestScript extends Component {
                 isLoading={this.state.isLoading}
                 data-test-subj="runScriptButton"
               >
-                Run script
+                <FormattedMessage
+                  id="common.ui.fieldEditor.testScript.submitButtonLabel"
+                  defaultMessage="Run script"
+                />
               </EuiButton>
             }
           />
@@ -219,11 +243,19 @@ export class TestScript extends Component {
       <Fragment>
         <EuiSpacer />
         <EuiText>
-          <h3>Preview results</h3>
+          <h3>
+            <FormattedMessage
+              id="common.ui.fieldEditor.testScript.resultsTitle"
+              defaultMessage="Preview results"
+            />
+          </h3>
           <p>
-            Run your script to preview the first 10 results. You can also select some additional
-            fields to include in your results to gain more context or add a query to filter on
-            specific documents.
+            <FormattedMessage
+              id="common.ui.fieldEditor.testScript.instructions"
+              defaultMessage="Run your script to preview the first 10 results. You can also select some additional
+              fields to include in your results to gain more context or add a query to filter on
+              specific documents."
+            />
           </p>
         </EuiText>
         <EuiSpacer />

From 1e2cbb3710c46eb4ba1bfd29565027c3dd2420da Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Wed, 8 Jan 2020 19:32:10 -0500
Subject: [PATCH 70/96] [SIEM] Detection engine timeline (#53783)

* change create to only have only one form to be open at the same time

* add tick to risk score

* remove compressed

* fix select in schedule

* fix bug to not  allow more than one step panel to be open at a time

* Add a color/health indicator to severity selector

* Move and reword tags placeholder to bottom helper text

* fix ux on the index patterns field

* Reorganize MITRE ATT&CK threat

* add url validation + some cleaning to prerp work for UT

* add feature to get back timeline + be able to disable action on timeline modal

* Add option to import the query from a saved timeline.

* wip

* Add timeline template selector

* fix few bugs from last commit

* review I

* fix unit test for timeline_title

* ui review

* fix truncation on timeline selectable
---
 .../static/forms/components/field.tsx         |   2 +
 .../static/forms/components/fields/index.ts   |   1 +
 .../components/fields/super_select_field.tsx  |  58 ++++
 .../static/forms/hook_form_lib/constants.ts   |   1 +
 .../components/open_timeline/helpers.ts       |   6 +-
 .../public/components/open_timeline/index.tsx |  20 +-
 .../open_timeline/open_timeline.test.tsx      |  16 +-
 .../open_timeline/open_timeline.tsx           |   7 +-
 .../open_timeline_modal/index.tsx             |  56 ++--
 .../open_timeline_modal_body.test.tsx         |  16 +-
 .../open_timeline_modal_body.tsx              | 101 ++++---
 .../timelines_table/actions_columns.test.tsx  |  76 ++++-
 .../timelines_table/actions_columns.tsx       |  20 +-
 .../timelines_table/common_columns.test.tsx   |  81 +++--
 .../timelines_table/common_columns.tsx        |   2 -
 .../timelines_table/extended_columns.test.tsx |   9 +-
 .../icon_header_columns.test.tsx              |  30 +-
 .../timelines_table/index.test.tsx            |  70 +++--
 .../open_timeline/timelines_table/index.tsx   |  31 +-
 .../public/components/open_timeline/types.ts  |   4 +
 .../timeline/search_super_select/index.tsx    | 276 ++++++++++++++++++
 .../search_super_select/translations.ts       |  25 ++
 .../detection_engine/rules/types.ts           |   4 +-
 .../public/pages/detection_engine/index.tsx   |   6 +-
 .../detection_engine/rules/all/actions.tsx    |   2 +-
 .../detection_engine/rules/all/helpers.ts     |   2 +-
 .../rules/components/add_item_form/index.tsx  |  53 +++-
 .../components/description_step/helpers.tsx   | 222 ++++++++++++++
 .../components/description_step/index.tsx     | 192 +++---------
 .../components/description_step/types.ts      |  33 +++
 .../rules/components/mitre/helpers.ts         |  18 ++
 .../rules/components/mitre/index.tsx          | 199 ++++++++-----
 .../rules/components/mitre/translations.ts    |   6 +-
 .../rules/components/pick_timeline/index.tsx  |  74 +++++
 .../rules/components/query_bar/index.tsx      | 126 +++++---
 .../components/query_bar/translations.tsx     |  14 +
 .../components/schedule_item_form/index.tsx   |  30 +-
 .../rules/components/status_icon/index.tsx    |   2 +-
 .../rules/components/step_about_rule/data.ts  |  28 --
 .../rules/components/step_about_rule/data.tsx |  43 +++
 .../step_about_rule/default_value.ts          |  20 +-
 .../components/step_about_rule/helpers.ts     |  16 +
 .../components/step_about_rule/index.tsx      |  62 ++--
 .../components/step_about_rule/schema.tsx     |  44 ++-
 .../step_about_rule/translations.ts           |   7 +
 .../components/step_define_rule/index.tsx     | 123 ++++----
 .../components/step_define_rule/schema.tsx    |  21 +-
 .../step_define_rule/translations.tsx         |  22 ++
 .../components/step_schedule_rule/index.tsx   |   2 -
 .../detection_engine/rules/create/helpers.ts  |  18 +-
 .../detection_engine/rules/create/index.tsx   | 106 ++++---
 .../rules/create/translations.ts              |   4 +
 .../detection_engine/rules/details/index.tsx  |   7 +-
 .../detection_engine/rules/edit/index.tsx     |   7 +-
 .../pages/detection_engine/rules/helpers.tsx  |   5 +-
 .../pages/detection_engine/rules/index.tsx    |  12 +-
 .../pages/detection_engine/rules/types.ts     |   5 +-
 .../routes/__mocks__/request_responses.ts     |   2 +
 .../routes/index/signals_mapping.json         |   3 +
 .../routes/rules/create_rules_bulk_route.ts   |   2 +
 .../routes/rules/create_rules_route.ts        |   2 +
 .../routes/rules/update_rules_bulk_route.ts   |   2 +
 .../routes/rules/update_rules_route.ts        |   2 +
 .../routes/rules/utils.test.ts                |  11 +
 .../detection_engine/routes/rules/utils.ts    |   1 +
 .../add_prepackaged_rules_schema.test.ts      | 130 ++++++++-
 .../schemas/add_prepackaged_rules_schema.ts   |   2 +
 .../schemas/create_rules_schema.test.ts       | 120 +++++++-
 .../routes/schemas/create_rules_schema.ts     |   2 +
 .../routes/schemas/schemas.ts                 |   5 +
 .../schemas/update_rules_schema.test.ts       |  96 +++++-
 .../routes/schemas/update_rules_schema.ts     |   2 +
 .../detection_engine/rules/create_rules.ts    |   2 +
 .../rules/install_prepacked_rules.ts          |   2 +
 .../detection_engine/rules/update_rules.ts    |   2 +
 .../rules/queries/query_timelineid.json       |   3 +-
 .../rules/queries/query_with_everything.json  |   1 +
 .../saved_query_with_everything.json          |   3 +-
 .../updates/update_query_everything.json      |   1 +
 .../rules/updates/update_timelineid.json      |   3 +-
 .../signals/__mocks__/es_results.ts           |   1 +
 .../detection_engine/signals/build_rule.ts    |   1 +
 .../signals/signal_rule_alert_type.ts         |   1 +
 .../siem/server/lib/detection_engine/types.ts |   3 +
 84 files changed, 2169 insertions(+), 679 deletions(-)
 create mode 100644 src/plugins/es_ui_shared/static/forms/components/fields/super_select_field.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/components/timeline/search_super_select/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/components/timeline/search_super_select/translations.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/types.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/translations.tsx
 delete mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/helpers.ts

diff --git a/src/plugins/es_ui_shared/static/forms/components/field.tsx b/src/plugins/es_ui_shared/static/forms/components/field.tsx
index 89dea53d75b38a..5b9a6dc9de002d 100644
--- a/src/plugins/es_ui_shared/static/forms/components/field.tsx
+++ b/src/plugins/es_ui_shared/static/forms/components/field.tsx
@@ -37,6 +37,7 @@ import {
   RadioGroupField,
   RangeField,
   SelectField,
+  SuperSelectField,
   ToggleField,
 } from './fields';
 
@@ -50,6 +51,7 @@ const mapTypeToFieldComponent = {
   [FIELD_TYPES.RADIO_GROUP]: RadioGroupField,
   [FIELD_TYPES.RANGE]: RangeField,
   [FIELD_TYPES.SELECT]: SelectField,
+  [FIELD_TYPES.SUPER_SELECT]: SuperSelectField,
   [FIELD_TYPES.TOGGLE]: ToggleField,
 };
 
diff --git a/src/plugins/es_ui_shared/static/forms/components/fields/index.ts b/src/plugins/es_ui_shared/static/forms/components/fields/index.ts
index f973bb7b04d346..35635d0e8530c9 100644
--- a/src/plugins/es_ui_shared/static/forms/components/fields/index.ts
+++ b/src/plugins/es_ui_shared/static/forms/components/fields/index.ts
@@ -25,5 +25,6 @@ export * from './multi_select_field';
 export * from './radio_group_field';
 export * from './range_field';
 export * from './select_field';
+export * from './super_select_field';
 export * from './toggle_field';
 export * from './text_area_field';
diff --git a/src/plugins/es_ui_shared/static/forms/components/fields/super_select_field.tsx b/src/plugins/es_ui_shared/static/forms/components/fields/super_select_field.tsx
new file mode 100644
index 00000000000000..9b29d75230d7a6
--- /dev/null
+++ b/src/plugins/es_ui_shared/static/forms/components/fields/super_select_field.tsx
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { EuiFormRow, EuiSuperSelect } from '@elastic/eui';
+
+import { FieldHook, getFieldValidityAndErrorMessage } from '../../hook_form_lib';
+
+interface Props {
+  field: FieldHook;
+  euiFieldProps?: Record<string, any>;
+  idAria?: string;
+  [key: string]: any;
+}
+
+export const SuperSelectField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
+  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
+
+  return (
+    <EuiFormRow
+      label={field.label}
+      helpText={field.helpText}
+      error={errorMessage}
+      isInvalid={isInvalid}
+      fullWidth
+      data-test-subj={rest['data-test-subj']}
+      describedByIds={rest.idAria ? [rest.idAria] : undefined}
+    >
+      <EuiSuperSelect
+        fullWidth
+        valueOfSelected={field.value as string}
+        onChange={value => {
+          field.setValue(value);
+        }}
+        options={[]}
+        isInvalid={isInvalid}
+        data-test-subj="select"
+        {...euiFieldProps}
+      />
+    </EuiFormRow>
+  );
+};
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/constants.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/constants.ts
index df2807e59ab465..4056947483107c 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/constants.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/constants.ts
@@ -28,6 +28,7 @@ export const FIELD_TYPES = {
   RADIO_GROUP: 'radioGroup',
   RANGE: 'range',
   SELECT: 'select',
+  SUPER_SELECT: 'superSelect',
   MULTI_SELECT: 'multiSelect',
 };
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/helpers.ts b/x-pack/legacy/plugins/siem/public/components/open_timeline/helpers.ts
index 91480f20d8b004..41e13408c1e01d 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/helpers.ts
@@ -181,6 +181,7 @@ export interface QueryTimelineById<TCache> {
   apolloClient: ApolloClient<TCache> | ApolloClient<{}> | undefined;
   duplicate: boolean;
   timelineId: string;
+  onOpenTimeline?: (timeline: TimelineModel) => void;
   openTimeline?: boolean;
   updateIsLoading: ActionCreator<{ id: string; isLoading: boolean }>;
   updateTimeline: DispatchUpdateTimeline;
@@ -190,6 +191,7 @@ export const queryTimelineById = <TCache>({
   apolloClient,
   duplicate = false,
   timelineId,
+  onOpenTimeline,
   openTimeline = true,
   updateIsLoading,
   updateTimeline,
@@ -209,7 +211,9 @@ export const queryTimelineById = <TCache>({
         );
 
         const { timeline, notes } = formatTimelineResultToModel(timelineToOpen, duplicate);
-        if (updateTimeline) {
+        if (onOpenTimeline != null) {
+          onOpenTimeline(timeline);
+        } else if (updateTimeline) {
           updateTimeline({
             duplicate,
             from: getOr(getDefaultFromValue(), 'dateRange.start', timeline),
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
index c22c5fdbcfbc59..a97cfefaf0393f 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
@@ -12,18 +12,20 @@ import { Dispatch } from 'redux';
 import { defaultHeaders } from '../../components/timeline/body/column_headers/default_headers';
 import { deleteTimelineMutation } from '../../containers/timeline/delete/persist.gql_query';
 import { AllTimelinesVariables, AllTimelinesQuery } from '../../containers/timeline/all';
-
 import { allTimelinesQuery } from '../../containers/timeline/all/index.gql_query';
 import { DeleteTimelineMutation, SortFieldTimeline, Direction } from '../../graphql/types';
 import { State, timelineSelectors } from '../../store';
+import { timelineDefaults, TimelineModel } from '../../store/timeline/model';
 import {
   createTimeline as dispatchCreateNewTimeline,
   updateIsLoading as dispatchUpdateIsLoading,
 } from '../../store/timeline/actions';
+import { ColumnHeader } from '../timeline/body/column_headers/column_header';
 import { OpenTimeline } from './open_timeline';
 import { OPEN_TIMELINE_CLASS_NAME, queryTimelineById, dispatchUpdateTimeline } from './helpers';
 import { OpenTimelineModalBody } from './open_timeline_modal/open_timeline_modal_body';
 import {
+  ActionTimelineToShow,
   DeleteTimelines,
   EuiSearchBarQuery,
   OnDeleteSelected,
@@ -41,14 +43,14 @@ import {
   OpenTimelineReduxProps,
 } from './types';
 import { DEFAULT_SORT_FIELD, DEFAULT_SORT_DIRECTION } from './constants';
-import { ColumnHeader } from '../timeline/body/column_headers/column_header';
-import { timelineDefaults } from '../../store/timeline/model';
 
 interface OwnProps<TCache = object> {
   apolloClient: ApolloClient<TCache>;
   /** Displays open timeline in modal */
   isModal: boolean;
   closeModalTimeline?: () => void;
+  hideActions?: ActionTimelineToShow[];
+  onOpenTimeline?: (timeline: TimelineModel) => void;
 }
 
 export type OpenTimelineOwnProps = OwnProps &
@@ -69,15 +71,17 @@ export const getSelectedTimelineIds = (selectedItems: OpenTimelineResult[]): str
 /** Manages the state (e.g table selection) of the (pure) `OpenTimeline` component */
 export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
   ({
+    apolloClient,
+    closeModalTimeline,
+    createNewTimeline,
     defaultPageSize,
+    hideActions = [],
     isModal = false,
+    onOpenTimeline,
+    timeline,
     title,
-    apolloClient,
-    closeModalTimeline,
     updateTimeline,
     updateIsLoading,
-    timeline,
-    createNewTimeline,
   }) => {
     /** Required by EuiTable for expandable rows: a map of `TimelineResult.savedObjectId` to rendered notes */
     const [itemIdToExpandedNotesRowMap, setItemIdToExpandedNotesRowMap] = useState<
@@ -212,6 +216,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
         queryTimelineById({
           apolloClient,
           duplicate,
+          onOpenTimeline,
           timelineId,
           updateIsLoading,
           updateTimeline,
@@ -286,6 +291,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
               data-test-subj={'open-timeline-modal'}
               deleteTimelines={onDeleteOneTimeline}
               defaultPageSize={defaultPageSize}
+              hideActions={hideActions}
               isLoading={loading}
               itemIdToExpandedNotesRowMap={itemIdToExpandedNotesRowMap}
               onAddTimelinesToFavorites={undefined}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
index 1ed08eee633aba..a1ca7812bba340 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
@@ -143,7 +143,7 @@ describe('OpenTimeline', () => {
     ).toBe(true);
   });
 
-  test('it shows extended columns and actions when onDeleteSelected and deleteTimelines are specified', () => {
+  test('it shows the delete action columns when onDeleteSelected and deleteTimelines are specified', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <OpenTimeline
@@ -178,10 +178,10 @@ describe('OpenTimeline', () => {
       .first()
       .props() as TimelinesTableProps;
 
-    expect(props.showExtendedColumnsAndActions).toBe(true);
+    expect(props.actionTimelineToShow).toContain('delete');
   });
 
-  test('it does NOT show extended columns and actions when is onDeleteSelected undefined and deleteTimelines is specified', () => {
+  test('it does NOT show the delete action columns when is onDeleteSelected undefined and deleteTimelines is specified', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <OpenTimeline
@@ -215,10 +215,10 @@ describe('OpenTimeline', () => {
       .first()
       .props() as TimelinesTableProps;
 
-    expect(props.showExtendedColumnsAndActions).toBe(false);
+    expect(props.actionTimelineToShow).not.toContain('delete');
   });
 
-  test('it does NOT show extended columns and actions when is onDeleteSelected provided and deleteTimelines is undefined', () => {
+  test('it does NOT show the delete action columns when is onDeleteSelected provided and deleteTimelines is undefined', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <OpenTimeline
@@ -252,10 +252,10 @@ describe('OpenTimeline', () => {
       .first()
       .props() as TimelinesTableProps;
 
-    expect(props.showExtendedColumnsAndActions).toBe(false);
+    expect(props.actionTimelineToShow).not.toContain('delete');
   });
 
-  test('it does NOT show extended columns and actions when both onDeleteSelected and deleteTimelines are undefined', () => {
+  test('it does NOT show the delete action when both onDeleteSelected and deleteTimelines are undefined', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <OpenTimeline
@@ -288,6 +288,6 @@ describe('OpenTimeline', () => {
       .first()
       .props() as TimelinesTableProps;
 
-    expect(props.showExtendedColumnsAndActions).toBe(false);
+    expect(props.actionTimelineToShow).not.toContain('delete');
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
index 59ccfc8b250aa5..8aab02b495392f 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
@@ -57,6 +57,11 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
       />
 
       <TimelinesTable
+        actionTimelineToShow={
+          onDeleteSelected != null && deleteTimelines != null
+            ? ['delete', 'duplicate', 'selectable']
+            : ['duplicate', 'selectable']
+        }
         data-test-subj="timelines-table"
         deleteTimelines={deleteTimelines}
         defaultPageSize={defaultPageSize}
@@ -69,7 +74,7 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
         pageIndex={pageIndex}
         pageSize={pageSize}
         searchResults={searchResults}
-        showExtendedColumnsAndActions={onDeleteSelected != null && deleteTimelines != null}
+        showExtendedColumns={true}
         sortDirection={sortDirection}
         sortField={sortField}
         totalSearchResultsCount={totalSearchResultsCount}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx
index cd89eb8aad6f43..c530929a3c96ee 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx
@@ -7,39 +7,49 @@
 import { EuiModal, EuiOverlayMask } from '@elastic/eui';
 import React from 'react';
 
+import { TimelineModel } from '../../../store/timeline/model';
 import { useApolloClient } from '../../../utils/apollo_context';
+
 import * as i18n from '../translations';
+import { ActionTimelineToShow } from '../types';
 import { StatefulOpenTimeline } from '..';
 
 export interface OpenTimelineModalProps {
   onClose: () => void;
+  hideActions?: ActionTimelineToShow[];
+  modalTitle?: string;
+  onOpen?: (timeline: TimelineModel) => void;
 }
 
 const DEFAULT_SEARCH_RESULTS_PER_PAGE = 10;
 const OPEN_TIMELINE_MODAL_WIDTH = 1000; // px
 
-export const OpenTimelineModal = React.memo<OpenTimelineModalProps>(({ onClose }) => {
-  const apolloClient = useApolloClient();
-
-  if (!apolloClient) return null;
-
-  return (
-    <EuiOverlayMask>
-      <EuiModal
-        data-test-subj="open-timeline-modal"
-        maxWidth={OPEN_TIMELINE_MODAL_WIDTH}
-        onClose={onClose}
-      >
-        <StatefulOpenTimeline
-          apolloClient={apolloClient}
-          closeModalTimeline={onClose}
-          isModal={true}
-          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          title={i18n.OPEN_TIMELINE_TITLE}
-        />
-      </EuiModal>
-    </EuiOverlayMask>
-  );
-});
+export const OpenTimelineModal = React.memo<OpenTimelineModalProps>(
+  ({ hideActions = [], modalTitle, onClose, onOpen }) => {
+    const apolloClient = useApolloClient();
+
+    if (!apolloClient) return null;
+
+    return (
+      <EuiOverlayMask>
+        <EuiModal
+          data-test-subj="open-timeline-modal"
+          maxWidth={OPEN_TIMELINE_MODAL_WIDTH}
+          onClose={onClose}
+        >
+          <StatefulOpenTimeline
+            apolloClient={apolloClient}
+            closeModalTimeline={onClose}
+            hideActions={hideActions}
+            isModal={true}
+            defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+            onOpenTimeline={onOpen}
+            title={modalTitle ?? i18n.OPEN_TIMELINE_TITLE}
+          />
+        </EuiModal>
+      </EuiOverlayMask>
+    );
+  }
+);
 
 OpenTimelineModal.displayName = 'OpenTimelineModal';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
index 1010504c0acace..2c3adb138b7acf 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
@@ -143,7 +143,7 @@ describe('OpenTimelineModal', () => {
     ).toBe(true);
   });
 
-  test('it shows extended columns and actions when onDeleteSelected and deleteTimelines are specified', () => {
+  test('it shows the delete action when onDeleteSelected and deleteTimelines are specified', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <OpenTimelineModalBody
@@ -178,10 +178,10 @@ describe('OpenTimelineModal', () => {
       .first()
       .props() as TimelinesTableProps;
 
-    expect(props.showExtendedColumnsAndActions).toBe(true);
+    expect(props.actionTimelineToShow).toContain('delete');
   });
 
-  test('it does NOT show extended columns and actions when is onDeleteSelected undefined and deleteTimelines is specified', () => {
+  test('it does NOT show the delete when is onDeleteSelected undefined and deleteTimelines is specified', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <OpenTimelineModalBody
@@ -215,10 +215,10 @@ describe('OpenTimelineModal', () => {
       .first()
       .props() as TimelinesTableProps;
 
-    expect(props.showExtendedColumnsAndActions).toBe(false);
+    expect(props.actionTimelineToShow).not.toContain('delete');
   });
 
-  test('it does NOT show extended columns and actions when is onDeleteSelected provided and deleteTimelines is undefined', () => {
+  test('it does NOT show the delete action when is onDeleteSelected provided and deleteTimelines is undefined', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <OpenTimelineModalBody
@@ -252,10 +252,10 @@ describe('OpenTimelineModal', () => {
       .first()
       .props() as TimelinesTableProps;
 
-    expect(props.showExtendedColumnsAndActions).toBe(false);
+    expect(props.actionTimelineToShow).not.toContain('delete');
   });
 
-  test('it does NOT show extended columns and actions when both onDeleteSelected and deleteTimelines are undefined', () => {
+  test('it does NOT show extended columns when both onDeleteSelected and deleteTimelines are undefined', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <OpenTimelineModalBody
@@ -288,6 +288,6 @@ describe('OpenTimelineModal', () => {
       .first()
       .props() as TimelinesTableProps;
 
-    expect(props.showExtendedColumnsAndActions).toBe(false);
+    expect(props.actionTimelineToShow).not.toContain('delete');
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
index e28725973aff2f..dcd0b377705830 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
@@ -5,10 +5,10 @@
  */
 
 import { EuiModalBody, EuiModalHeader } from '@elastic/eui';
-import React from 'react';
+import React, { memo, useMemo } from 'react';
 import styled from 'styled-components';
 
-import { OpenTimelineProps } from '../types';
+import { OpenTimelineProps, ActionTimelineToShow } from '../types';
 import { SearchRow } from '../search_row';
 import { TimelinesTable } from '../timelines_table';
 import { TitleRow } from '../title_row';
@@ -19,10 +19,11 @@ export const HeaderContainer = styled.div`
 
 HeaderContainer.displayName = 'HeaderContainer';
 
-export const OpenTimelineModalBody = React.memo<OpenTimelineProps>(
+export const OpenTimelineModalBody = memo<OpenTimelineProps>(
   ({
     deleteTimelines,
     defaultPageSize,
+    hideActions = [],
     isLoading,
     itemIdToExpandedNotesRowMap,
     onAddTimelinesToFavorites,
@@ -43,51 +44,61 @@ export const OpenTimelineModalBody = React.memo<OpenTimelineProps>(
     sortField,
     title,
     totalSearchResultsCount,
-  }) => (
-    <>
-      <EuiModalHeader>
-        <HeaderContainer>
-          <TitleRow
-            data-test-subj="title-row"
-            onDeleteSelected={onDeleteSelected}
-            onAddTimelinesToFavorites={onAddTimelinesToFavorites}
-            selectedTimelinesCount={selectedItems.length}
-            title={title}
-          />
+  }) => {
+    const actionsToShow = useMemo(() => {
+      const actions: ActionTimelineToShow[] =
+        onDeleteSelected != null && deleteTimelines != null
+          ? ['delete', 'duplicate']
+          : ['duplicate'];
+      return actions.filter(action => !hideActions.includes(action));
+    }, [onDeleteSelected, deleteTimelines, hideActions]);
+    return (
+      <>
+        <EuiModalHeader>
+          <HeaderContainer>
+            <TitleRow
+              data-test-subj="title-row"
+              onDeleteSelected={onDeleteSelected}
+              onAddTimelinesToFavorites={onAddTimelinesToFavorites}
+              selectedTimelinesCount={selectedItems.length}
+              title={title}
+            />
+
+            <SearchRow
+              data-test-subj="search-row"
+              onlyFavorites={onlyFavorites}
+              onQueryChange={onQueryChange}
+              onToggleOnlyFavorites={onToggleOnlyFavorites}
+              query={query}
+              totalSearchResultsCount={totalSearchResultsCount}
+            />
+          </HeaderContainer>
+        </EuiModalHeader>
 
-          <SearchRow
-            data-test-subj="search-row"
-            onlyFavorites={onlyFavorites}
-            onQueryChange={onQueryChange}
-            onToggleOnlyFavorites={onToggleOnlyFavorites}
-            query={query}
+        <EuiModalBody>
+          <TimelinesTable
+            actionTimelineToShow={actionsToShow}
+            data-test-subj="timelines-table"
+            deleteTimelines={deleteTimelines}
+            defaultPageSize={defaultPageSize}
+            loading={isLoading}
+            itemIdToExpandedNotesRowMap={itemIdToExpandedNotesRowMap}
+            onOpenTimeline={onOpenTimeline}
+            onSelectionChange={onSelectionChange}
+            onTableChange={onTableChange}
+            onToggleShowNotes={onToggleShowNotes}
+            pageIndex={pageIndex}
+            pageSize={pageSize}
+            searchResults={searchResults}
+            showExtendedColumns={false}
+            sortDirection={sortDirection}
+            sortField={sortField}
             totalSearchResultsCount={totalSearchResultsCount}
           />
-        </HeaderContainer>
-      </EuiModalHeader>
-
-      <EuiModalBody>
-        <TimelinesTable
-          data-test-subj="timelines-table"
-          deleteTimelines={deleteTimelines}
-          defaultPageSize={defaultPageSize}
-          loading={isLoading}
-          itemIdToExpandedNotesRowMap={itemIdToExpandedNotesRowMap}
-          onOpenTimeline={onOpenTimeline}
-          onSelectionChange={onSelectionChange}
-          onTableChange={onTableChange}
-          onToggleShowNotes={onToggleShowNotes}
-          pageIndex={pageIndex}
-          pageSize={pageSize}
-          searchResults={searchResults}
-          showExtendedColumnsAndActions={onDeleteSelected != null && deleteTimelines != null}
-          sortDirection={sortDirection}
-          sortField={sortField}
-          totalSearchResultsCount={totalSearchResultsCount}
-        />
-      </EuiModalBody>
-    </>
-  )
+        </EuiModalBody>
+      </>
+    );
+  }
 );
 
 OpenTimelineModalBody.displayName = 'OpenTimelineModalBody';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
index 89d6b4befa787c..eec11f571328f5 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
@@ -27,10 +27,11 @@ describe('#getActionsColumns', () => {
     mockResults = cloneDeep(mockTimelineResults);
   });
 
-  test('it renders the delete timeline (trash icon) when showDeleteAction is true (because showExtendedColumnsAndActions is true)', () => {
+  test('it renders the delete timeline (trash icon) when actionTimelineToShow is including the action delete', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -42,7 +43,7 @@ describe('#getActionsColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -53,10 +54,11 @@ describe('#getActionsColumns', () => {
     expect(wrapper.find('[data-test-subj="delete-timeline"]').exists()).toBe(true);
   });
 
-  test('it does NOT render the delete timeline (trash icon) when showDeleteAction is false (because showExtendedColumnsAndActions is false)', () => {
+  test('it does NOT render the delete timeline (trash icon) when actionTimelineToShow is NOT including the action delete', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={[]}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -68,7 +70,7 @@ describe('#getActionsColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={false}
+          showExtendedColumns={false}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -79,10 +81,65 @@ describe('#getActionsColumns', () => {
     expect(wrapper.find('[data-test-subj="delete-timeline"]').exists()).toBe(false);
   });
 
+  test('it renders the duplicate icon timeline when actionTimelineToShow is including the action duplicate', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <TimelinesTable
+          actionTimelineToShow={['duplicate']}
+          deleteTimelines={jest.fn()}
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          loading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onOpenTimeline={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          searchResults={mockResults}
+          showExtendedColumns={true}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    expect(wrapper.find('[data-test-subj="open-duplicate"]').exists()).toBe(true);
+  });
+
+  test('it does NOT render the duplicate timeline when actionTimelineToShow is NOT including the action duplicate)', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <TimelinesTable
+          actionTimelineToShow={[]}
+          deleteTimelines={jest.fn()}
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          loading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onOpenTimeline={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          searchResults={mockResults}
+          showExtendedColumns={false}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    expect(wrapper.find('[data-test-subj="open-duplicate"]').exists()).toBe(false);
+  });
+
   test('it does NOT render the delete timeline (trash icon) when deleteTimelines is not provided', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete']}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
           itemIdToExpandedNotesRowMap={{}}
@@ -93,7 +150,7 @@ describe('#getActionsColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -111,6 +168,7 @@ describe('#getActionsColumns', () => {
 
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -122,7 +180,7 @@ describe('#getActionsColumns', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={missingSavedObjectId}
-        showExtendedColumnsAndActions={true}
+        showExtendedColumns={true}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={missingSavedObjectId.length}
@@ -141,6 +199,7 @@ describe('#getActionsColumns', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -152,7 +211,7 @@ describe('#getActionsColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={false}
+          showExtendedColumns={false}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -174,6 +233,7 @@ describe('#getActionsColumns', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -185,7 +245,7 @@ describe('#getActionsColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={false}
+          showExtendedColumns={false}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
index 51dba21ac225c2..2b8bd3339cca24 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
@@ -12,19 +12,24 @@ import React from 'react';
 import { ACTION_COLUMN_WIDTH } from './common_styles';
 import { DeleteTimelineModalButton } from '../delete_timeline_modal';
 import * as i18n from '../translations';
-import { DeleteTimelines, OnOpenTimeline, OpenTimelineResult } from '../types';
+import {
+  ActionTimelineToShow,
+  DeleteTimelines,
+  OnOpenTimeline,
+  OpenTimelineResult,
+} from '../types';
 
 /**
  * Returns the action columns (e.g. delete, open duplicate timeline)
  */
 export const getActionsColumns = ({
+  actionTimelineToShow,
   onOpenTimeline,
   deleteTimelines,
-  showDeleteAction,
 }: {
+  actionTimelineToShow: ActionTimelineToShow[];
   deleteTimelines?: DeleteTimelines;
   onOpenTimeline: OnOpenTimeline;
-  showDeleteAction: boolean;
 }) => {
   const openAsDuplicateColumn = {
     align: 'center',
@@ -67,7 +72,10 @@ export const getActionsColumns = ({
     width: ACTION_COLUMN_WIDTH,
   };
 
-  return showDeleteAction && deleteTimelines != null
-    ? [openAsDuplicateColumn, deleteTimelineColumn]
-    : [openAsDuplicateColumn];
+  return [
+    actionTimelineToShow.includes('duplicate') ? openAsDuplicateColumn : null,
+    actionTimelineToShow.includes('delete') && deleteTimelines != null
+      ? deleteTimelineColumn
+      : null,
+  ].filter(action => action != null);
 };
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
index 559ee4a7bb4946..0f2cda9d79f0b1 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
@@ -37,6 +37,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -48,7 +49,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={hasNotes}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={hasNotes.length}
@@ -63,6 +64,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -74,7 +76,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={missingNotes}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={missingNotes.length}
@@ -89,6 +91,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -100,7 +103,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={nullNotes}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={nullNotes.length}
@@ -115,6 +118,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -126,7 +130,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={emptylNotes}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={emptylNotes.length}
@@ -143,6 +147,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -154,7 +159,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={missingSavedObjectId}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={missingSavedObjectId.length}
@@ -169,6 +174,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -180,7 +186,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={nullSavedObjectId}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={nullSavedObjectId.length}
@@ -195,6 +201,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -206,7 +213,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={hasNotes}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={hasNotes.length}
@@ -231,6 +238,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -242,7 +250,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={hasNotes}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={hasNotes.length}
@@ -269,6 +277,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -280,7 +289,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={hasNotes}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={hasNotes.length}
@@ -311,6 +320,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -322,7 +332,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={hasNotes}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={hasNotes.length}
@@ -346,6 +356,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -357,7 +368,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -377,6 +388,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -388,7 +400,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -411,6 +423,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -422,7 +435,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={missingSavedObjectId}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={missingSavedObjectId.length}
@@ -442,6 +455,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -453,7 +467,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={missingTitle}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={missingTitle.length}
@@ -475,6 +489,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -486,7 +501,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={withMissingSavedObjectIdAndTitle}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={withMissingSavedObjectIdAndTitle.length}
@@ -508,6 +523,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -519,7 +535,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={withJustWhitespaceTitle}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={withJustWhitespaceTitle.length}
@@ -541,6 +557,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -552,7 +569,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={withMissingSavedObjectId}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={withMissingSavedObjectId.length}
@@ -571,6 +588,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -582,7 +600,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -605,6 +623,7 @@ describe('#getCommonColumns', () => {
 
       const wrapper = mountWithIntl(
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -616,7 +635,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={missingSavedObjectId}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={missingSavedObjectId.length}
@@ -637,6 +656,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -648,7 +668,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -673,6 +693,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -684,7 +705,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -704,6 +725,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -715,7 +737,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -737,6 +759,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -748,7 +771,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={missingDescription}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={missingDescription.length}
@@ -771,6 +794,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -782,7 +806,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={justWhitespaceDescription}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={justWhitespaceDescription.length}
@@ -803,6 +827,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -814,7 +839,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -834,6 +859,7 @@ describe('#getCommonColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -845,7 +871,7 @@ describe('#getCommonColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -868,6 +894,7 @@ describe('#getCommonColumns', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -879,7 +906,7 @@ describe('#getCommonColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={missingUpdated}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={missingUpdated.length}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
index 0b51bd78283c5a..0d3a73a389050d 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
@@ -27,11 +27,9 @@ export const getCommonColumns = ({
   itemIdToExpandedNotesRowMap,
   onOpenTimeline,
   onToggleShowNotes,
-  showExtendedColumnsAndActions,
 }: {
   onOpenTimeline: OnOpenTimeline;
   onToggleShowNotes: OnToggleShowNotes;
-  showExtendedColumnsAndActions: boolean;
   itemIdToExpandedNotesRowMap: Record<string, JSX.Element>;
 }) => [
   {
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
index bc88603721e8a2..4cbe1e45c473b9 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
@@ -35,6 +35,7 @@ describe('#getExtendedColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -46,7 +47,7 @@ describe('#getExtendedColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -66,6 +67,7 @@ describe('#getExtendedColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -77,7 +79,7 @@ describe('#getExtendedColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={mockResults}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={mockResults.length}
@@ -99,6 +101,7 @@ describe('#getExtendedColumns', () => {
       const wrapper = mountWithIntl(
         <ThemeProvider theme={theme}>
           <TimelinesTable
+            actionTimelineToShow={['delete', 'duplicate', 'selectable']}
             deleteTimelines={jest.fn()}
             defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             loading={false}
@@ -110,7 +113,7 @@ describe('#getExtendedColumns', () => {
             pageIndex={0}
             pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
             searchResults={missingUpdatedBy}
-            showExtendedColumnsAndActions={true}
+            showExtendedColumns={true}
             sortDirection={DEFAULT_SORT_DIRECTION}
             sortField={DEFAULT_SORT_FIELD}
             totalSearchResultsCount={missingUpdatedBy.length}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
index 26836787efab10..31377d176acac9 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
@@ -30,6 +30,7 @@ describe('#getActionsColumns', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -41,7 +42,7 @@ describe('#getActionsColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -57,6 +58,7 @@ describe('#getActionsColumns', () => {
 
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -68,7 +70,7 @@ describe('#getActionsColumns', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={with6Events}
-        showExtendedColumnsAndActions={true}
+        showExtendedColumns={true}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={with6Events.length}
@@ -82,6 +84,7 @@ describe('#getActionsColumns', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -93,7 +96,7 @@ describe('#getActionsColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -109,6 +112,7 @@ describe('#getActionsColumns', () => {
 
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -120,7 +124,7 @@ describe('#getActionsColumns', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={with4Notes}
-        showExtendedColumnsAndActions={true}
+        showExtendedColumns={true}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={with4Notes.length}
@@ -134,6 +138,7 @@ describe('#getActionsColumns', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -145,7 +150,7 @@ describe('#getActionsColumns', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -161,6 +166,7 @@ describe('#getActionsColumns', () => {
 
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -172,7 +178,7 @@ describe('#getActionsColumns', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={undefinedFavorite}
-        showExtendedColumnsAndActions={true}
+        showExtendedColumns={true}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={undefinedFavorite.length}
@@ -187,6 +193,7 @@ describe('#getActionsColumns', () => {
 
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -198,7 +205,7 @@ describe('#getActionsColumns', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={nullFavorite}
-        showExtendedColumnsAndActions={true}
+        showExtendedColumns={true}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={nullFavorite.length}
@@ -213,6 +220,7 @@ describe('#getActionsColumns', () => {
 
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -224,7 +232,7 @@ describe('#getActionsColumns', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={emptyFavorite}
-        showExtendedColumnsAndActions={true}
+        showExtendedColumns={true}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={emptyFavorite.length}
@@ -249,6 +257,7 @@ describe('#getActionsColumns', () => {
 
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -260,7 +269,7 @@ describe('#getActionsColumns', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={emptyFavorite}
-        showExtendedColumnsAndActions={true}
+        showExtendedColumns={true}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={emptyFavorite.length}
@@ -289,6 +298,7 @@ describe('#getActionsColumns', () => {
 
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -300,7 +310,7 @@ describe('#getActionsColumns', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={emptyFavorite}
-        showExtendedColumnsAndActions={true}
+        showExtendedColumns={true}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={emptyFavorite.length}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
index 7d947cb28e9ece..26d9607a91fcdb 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
@@ -28,10 +28,11 @@ describe('TimelinesTable', () => {
     mockResults = cloneDeep(mockTimelineResults);
   });
 
-  test('it renders the select all timelines header checkbox when showExtendedColumnsAndActions is true', () => {
+  test('it renders the select all timelines header checkbox when actionTimelineToShow has the action selectable', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -43,7 +44,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -59,10 +60,11 @@ describe('TimelinesTable', () => {
     ).toBe(true);
   });
 
-  test('it does NOT render the select all timelines header checkbox when showExtendedColumnsAndActions is false', () => {
+  test('it does NOT render the select all timelines header checkbox when actionTimelineToShow has not the action selectable', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -74,7 +76,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={false}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -90,10 +92,11 @@ describe('TimelinesTable', () => {
     ).toBe(false);
   });
 
-  test('it renders the Modified By column when showExtendedColumnsAndActions is true ', () => {
+  test('it renders the Modified By column when showExtendedColumns is true ', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -105,7 +108,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -121,10 +124,11 @@ describe('TimelinesTable', () => {
     ).toContain(i18n.MODIFIED_BY);
   });
 
-  test('it renders the notes column in the position of the Modified By column when showExtendedColumnsAndActions is false', () => {
+  test('it renders the notes column in the position of the Modified By column when showExtendedColumns is false', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -136,7 +140,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={false}
+          showExtendedColumns={false}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -148,16 +152,17 @@ describe('TimelinesTable', () => {
       wrapper
         .find('thead tr th')
         .at(5)
-        .find('[data-test-subj="notes-count-header-icon"]')
+        .find('svg[data-test-subj="notes-count-header-icon"]')
         .first()
         .exists()
     ).toBe(true);
   });
 
-  test('it renders the delete timeline (trash icon) when showExtendedColumnsAndActions is true', () => {
+  test('it renders the delete timeline (trash icon) when actionTimelineToShow has the delete action', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -169,7 +174,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={false}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -185,10 +190,11 @@ describe('TimelinesTable', () => {
     ).toBe(true);
   });
 
-  test('it does NOT render the delete timeline (trash icon) when showExtendedColumnsAndActions is false', () => {
+  test('it does NOT render the delete timeline (trash icon) when actionTimelineToShow has NOT the delete action', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -200,7 +206,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={false}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -216,10 +222,11 @@ describe('TimelinesTable', () => {
     ).toBe(false);
   });
 
-  test('it renders the rows per page selector when showExtendedColumnsAndActions is true', () => {
+  test('it renders the rows per page selector when showExtendedColumns is true', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -231,7 +238,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -247,10 +254,11 @@ describe('TimelinesTable', () => {
     ).toBe(true);
   });
 
-  test('it does NOT render the rows per page selector when showExtendedColumnsAndActions is false', () => {
+  test('it does NOT render the rows per page selector when showExtendedColumns is false', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -262,7 +270,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={false}
+          showExtendedColumns={false}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -284,6 +292,7 @@ describe('TimelinesTable', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={defaultPageSize}
           loading={false}
@@ -295,7 +304,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={defaultPageSize}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -311,10 +320,11 @@ describe('TimelinesTable', () => {
     ).toEqual('Rows per page: 123');
   });
 
-  test('it sorts the Last Modified column in descending order when showExtendedColumnsAndActions is true ', () => {
+  test('it sorts the Last Modified column in descending order when showExtendedColumns is true ', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -326,7 +336,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -342,10 +352,11 @@ describe('TimelinesTable', () => {
     ).toContain(i18n.LAST_MODIFIED);
   });
 
-  test('it sorts the Last Modified column in descending order when showExtendedColumnsAndActions is false ', () => {
+  test('it sorts the Last Modified column in descending order when showExtendedColumns is false ', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -357,7 +368,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={false}
+          showExtendedColumns={false}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -376,6 +387,7 @@ describe('TimelinesTable', () => {
   test('it displays the expected message when no search results are found', () => {
     const wrapper = mountWithIntl(
       <TimelinesTable
+        actionTimelineToShow={['delete', 'duplicate', 'selectable']}
         deleteTimelines={jest.fn()}
         defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         loading={false}
@@ -387,7 +399,7 @@ describe('TimelinesTable', () => {
         pageIndex={0}
         pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
         searchResults={[]}
-        showExtendedColumnsAndActions={false}
+        showExtendedColumns={false}
         sortDirection={DEFAULT_SORT_DIRECTION}
         sortField={DEFAULT_SORT_FIELD}
         totalSearchResultsCount={0}
@@ -408,6 +420,7 @@ describe('TimelinesTable', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -419,7 +432,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -446,6 +459,7 @@ describe('TimelinesTable', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -457,7 +471,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -479,6 +493,7 @@ describe('TimelinesTable', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={true}
@@ -490,7 +505,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
@@ -510,6 +525,7 @@ describe('TimelinesTable', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
         <TimelinesTable
+          actionTimelineToShow={['delete', 'duplicate', 'selectable']}
           deleteTimelines={jest.fn()}
           defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           loading={false}
@@ -521,7 +537,7 @@ describe('TimelinesTable', () => {
           pageIndex={0}
           pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
           searchResults={mockResults}
-          showExtendedColumnsAndActions={true}
+          showExtendedColumns={true}
           sortDirection={DEFAULT_SORT_DIRECTION}
           sortField={DEFAULT_SORT_FIELD}
           totalSearchResultsCount={mockResults.length}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
index ce88ade01d2ef3..f09a9f6af048b5 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
@@ -10,6 +10,7 @@ import styled from 'styled-components';
 
 import * as i18n from '../translations';
 import {
+  ActionTimelineToShow,
   DeleteTimelines,
   OnOpenTimeline,
   OnSelectionChange,
@@ -36,8 +37,8 @@ const BasicTable = styled(EuiBasicTable)`
 `;
 BasicTable.displayName = 'BasicTable';
 
-const getExtendedColumnsIfEnabled = (showExtendedColumnsAndActions: boolean) =>
-  showExtendedColumnsAndActions ? [...getExtendedColumns()] : [];
+const getExtendedColumnsIfEnabled = (showExtendedColumns: boolean) =>
+  showExtendedColumns ? [...getExtendedColumns()] : [];
 
 /**
  * Returns the column definitions (passed as the `columns` prop to
@@ -46,34 +47,36 @@ const getExtendedColumnsIfEnabled = (showExtendedColumnsAndActions: boolean) =>
  * `Timelines` page
  */
 const getTimelinesTableColumns = ({
+  actionTimelineToShow,
   deleteTimelines,
   itemIdToExpandedNotesRowMap,
   onOpenTimeline,
   onToggleShowNotes,
-  showExtendedColumnsAndActions,
+  showExtendedColumns,
 }: {
+  actionTimelineToShow: ActionTimelineToShow[];
   deleteTimelines?: DeleteTimelines;
   itemIdToExpandedNotesRowMap: Record<string, JSX.Element>;
   onOpenTimeline: OnOpenTimeline;
   onToggleShowNotes: OnToggleShowNotes;
-  showExtendedColumnsAndActions: boolean;
+  showExtendedColumns: boolean;
 }) => [
   ...getCommonColumns({
     itemIdToExpandedNotesRowMap,
     onOpenTimeline,
     onToggleShowNotes,
-    showExtendedColumnsAndActions,
   }),
-  ...getExtendedColumnsIfEnabled(showExtendedColumnsAndActions),
+  ...getExtendedColumnsIfEnabled(showExtendedColumns),
   ...getIconHeaderColumns(),
   ...getActionsColumns({
     deleteTimelines,
     onOpenTimeline,
-    showDeleteAction: showExtendedColumnsAndActions,
+    actionTimelineToShow,
   }),
 ];
 
 export interface TimelinesTableProps {
+  actionTimelineToShow: ActionTimelineToShow[];
   deleteTimelines?: DeleteTimelines;
   defaultPageSize: number;
   loading: boolean;
@@ -85,7 +88,7 @@ export interface TimelinesTableProps {
   pageIndex: number;
   pageSize: number;
   searchResults: OpenTimelineResult[];
-  showExtendedColumnsAndActions: boolean;
+  showExtendedColumns: boolean;
   sortDirection: 'asc' | 'desc';
   sortField: string;
   totalSearchResultsCount: number;
@@ -97,6 +100,7 @@ export interface TimelinesTableProps {
  */
 export const TimelinesTable = React.memo<TimelinesTableProps>(
   ({
+    actionTimelineToShow,
     deleteTimelines,
     defaultPageSize,
     loading: isLoading,
@@ -108,13 +112,13 @@ export const TimelinesTable = React.memo<TimelinesTableProps>(
     pageIndex,
     pageSize,
     searchResults,
-    showExtendedColumnsAndActions,
+    showExtendedColumns,
     sortField,
     sortDirection,
     totalSearchResultsCount,
   }) => {
     const pagination = {
-      hidePerPageOptions: !showExtendedColumnsAndActions,
+      hidePerPageOptions: !showExtendedColumns,
       pageIndex,
       pageSize,
       pageSizeOptions: [
@@ -142,16 +146,17 @@ export const TimelinesTable = React.memo<TimelinesTableProps>(
     return (
       <BasicTable
         columns={getTimelinesTableColumns({
+          actionTimelineToShow,
           deleteTimelines,
           itemIdToExpandedNotesRowMap,
           onOpenTimeline,
           onToggleShowNotes,
-          showExtendedColumnsAndActions,
+          showExtendedColumns,
         })}
         compressed
         data-test-subj="timelines-table"
         isExpandable={true}
-        isSelectable={showExtendedColumnsAndActions}
+        isSelectable={actionTimelineToShow.includes('selectable')}
         itemId="savedObjectId"
         itemIdToExpandedRowMap={itemIdToExpandedNotesRowMap}
         items={searchResults}
@@ -159,7 +164,7 @@ export const TimelinesTable = React.memo<TimelinesTableProps>(
         noItemsMessage={i18n.ZERO_TIMELINES_MATCH}
         onChange={onTableChange}
         pagination={pagination}
-        selection={showExtendedColumnsAndActions ? selection : undefined}
+        selection={actionTimelineToShow.includes('selectable') ? selection : undefined}
         sorting={sorting}
       />
     );
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/types.ts b/x-pack/legacy/plugins/siem/public/components/open_timeline/types.ts
index 7bbefb9efa99e1..e5e85ccf0954a2 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/types.ts
@@ -95,6 +95,8 @@ export interface OnTableChangeParams {
 /** Invoked by the EUI table implementation when the user interacts with the table */
 export type OnTableChange = (tableChange: OnTableChangeParams) => void;
 
+export type ActionTimelineToShow = 'duplicate' | 'delete' | 'selectable';
+
 export interface OpenTimelineProps {
   /** Invoked when the user clicks the delete (trash) icon on an individual timeline */
   deleteTimelines?: DeleteTimelines;
@@ -140,6 +142,8 @@ export interface OpenTimelineProps {
   title: string;
   /** The total (server-side) count of the search results */
   totalSearchResultsCount: number;
+  /** Hide action on timeline if needed it */
+  hideActions?: ActionTimelineToShow[];
 }
 
 export interface UpdateTimeline {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_super_select/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/search_super_select/index.tsx
new file mode 100644
index 00000000000000..ac47b352a6276e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_super_select/index.tsx
@@ -0,0 +1,276 @@
+/*
+ * 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 {
+  EuiHighlight,
+  EuiInputPopover,
+  EuiSuperSelect,
+  EuiSelectable,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiTextColor,
+  EuiFilterButton,
+  EuiFilterGroup,
+  EuiSpacer,
+} from '@elastic/eui';
+import { Option } from '@elastic/eui/src/components/selectable/types';
+import { isEmpty } from 'lodash/fp';
+import React, { memo, useCallback, useMemo, useState } from 'react';
+import { ListProps } from 'react-virtualized';
+import styled, { createGlobalStyle } from 'styled-components';
+
+import { AllTimelinesQuery } from '../../../containers/timeline/all';
+import { getEmptyTagValue } from '../../empty_value';
+import { isUntitled } from '../../../components/open_timeline/helpers';
+import * as i18nTimeline from '../../../components/open_timeline/translations';
+import { SortFieldTimeline, Direction } from '../../../graphql/types';
+import * as i18n from './translations';
+
+const SearchTimelineSuperSelectGlobalStyle = createGlobalStyle`
+  .euiPopover__panel.euiPopover__panel-isOpen.timeline-search-super-select-popover__popoverPanel {
+    visibility: hidden;
+    z-index: 0;
+  }
+`;
+
+const MyEuiHighlight = styled(EuiHighlight)<{ selected: boolean }>`
+  padding-left: ${({ selected }) => (selected ? '3px' : '0px')};
+`;
+
+const MyEuiTextColor = styled(EuiTextColor)<{ selected: boolean }>`
+  padding-left: ${({ selected }) => (selected ? '20px' : '0px')};
+`;
+
+interface SearchTimelineSuperSelectProps {
+  isDisabled: boolean;
+  timelineId: string | null;
+  timelineTitle: string | null;
+  onTimelineChange: (timelineTitle: string, timelineId: string | null) => void;
+}
+
+const basicSuperSelectOptions = [
+  {
+    value: '-1',
+    inputDisplay: i18n.DEFAULT_TIMELINE_TITLE,
+  },
+];
+
+const getBasicSelectableOptions = (timelineId: string) => [
+  {
+    description: i18n.DEFAULT_TIMELINE_DESCRIPTION,
+    label: i18n.DEFAULT_TIMELINE_TITLE,
+    id: null,
+    title: i18n.DEFAULT_TIMELINE_TITLE,
+    checked: timelineId === '-1' ? 'on' : undefined,
+  } as Option,
+];
+
+const ORIGINAL_PAGE_SIZE = 50;
+const POPOVER_HEIGHT = 260;
+const TIMELINE_ITEM_HEIGHT = 50;
+const SearchTimelineSuperSelectComponent: React.FC<SearchTimelineSuperSelectProps> = ({
+  isDisabled,
+  timelineId,
+  timelineTitle,
+  onTimelineChange,
+}) => {
+  const [pageSize, setPageSize] = useState(ORIGINAL_PAGE_SIZE);
+  const [heightTrigger, setHeightTrigger] = useState(0);
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+  const [searchTimelineValue, setSearchTimelineValue] = useState('');
+  const [onlyFavorites, setOnlyFavorites] = useState(false);
+
+  const onSearchTimeline = useCallback(val => {
+    setSearchTimelineValue(val);
+  }, []);
+
+  const handleClosePopover = useCallback(() => {
+    setIsPopoverOpen(false);
+  }, []);
+
+  const handleOpenPopover = useCallback(() => {
+    setIsPopoverOpen(true);
+  }, []);
+
+  const handleOnToggleOnlyFavorites = useCallback(() => {
+    setOnlyFavorites(!onlyFavorites);
+  }, [onlyFavorites]);
+
+  const renderTimelineOption = useCallback((option, searchValue) => {
+    return (
+      <>
+        {option.checked === 'on' && <EuiIcon type="check" color="primary" />}
+        <MyEuiHighlight search={searchValue} selected={option.checked === 'on'}>
+          {isUntitled(option) ? i18nTimeline.UNTITLED_TIMELINE : option.title}
+        </MyEuiHighlight>
+        <br />
+        <MyEuiTextColor color="subdued" component="span" selected={option.checked === 'on'}>
+          <small>
+            {option.description != null && option.description.trim().length > 0
+              ? option.description
+              : getEmptyTagValue()}
+          </small>
+        </MyEuiTextColor>
+      </>
+    );
+  }, []);
+
+  const handleTimelineChange = useCallback(options => {
+    const selectedTimeline = options.filter(
+      (option: { checked: string }) => option.checked === 'on'
+    );
+    if (selectedTimeline != null && selectedTimeline.length > 0 && onTimelineChange != null) {
+      onTimelineChange(
+        isEmpty(selectedTimeline[0].title)
+          ? i18nTimeline.UNTITLED_TIMELINE
+          : selectedTimeline[0].title,
+        selectedTimeline[0].id
+      );
+    }
+    setIsPopoverOpen(false);
+  }, []);
+
+  const handleOnScroll = useCallback(
+    (
+      totalTimelines: number,
+      totalCount: number,
+      {
+        clientHeight,
+        scrollHeight,
+        scrollTop,
+      }: {
+        clientHeight: number;
+        scrollHeight: number;
+        scrollTop: number;
+      }
+    ) => {
+      if (totalTimelines < totalCount) {
+        const clientHeightTrigger = clientHeight * 1.2;
+        if (
+          scrollTop > 10 &&
+          scrollHeight - scrollTop < clientHeightTrigger &&
+          scrollHeight > heightTrigger
+        ) {
+          setHeightTrigger(scrollHeight);
+          setPageSize(pageSize + ORIGINAL_PAGE_SIZE);
+        }
+      }
+    },
+    [heightTrigger, pageSize]
+  );
+
+  const superSelect = useMemo(
+    () => (
+      <EuiSuperSelect
+        disabled={isDisabled}
+        onFocus={handleOpenPopover}
+        options={
+          timelineId == null
+            ? basicSuperSelectOptions
+            : [
+                {
+                  value: timelineId,
+                  inputDisplay: timelineTitle,
+                },
+              ]
+        }
+        valueOfSelected={timelineId == null ? '-1' : timelineId}
+        itemLayoutAlign="top"
+        hasDividers={false}
+        popoverClassName="timeline-search-super-select-popover"
+      />
+    ),
+    [handleOpenPopover, isDisabled, timelineId, timelineTitle]
+  );
+
+  return (
+    <EuiInputPopover
+      id="searchTimelinePopover"
+      input={superSelect}
+      isOpen={isPopoverOpen}
+      closePopover={handleClosePopover}
+    >
+      <AllTimelinesQuery
+        pageInfo={{
+          pageIndex: 1,
+          pageSize,
+        }}
+        search={searchTimelineValue}
+        sort={{ sortField: SortFieldTimeline.updated, sortOrder: Direction.desc }}
+        onlyUserFavorite={onlyFavorites}
+      >
+        {({ timelines, loading, totalCount }) => (
+          <>
+            <EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
+              <EuiFlexItem grow={false}>
+                <EuiFilterGroup>
+                  <EuiFilterButton
+                    size="xs"
+                    data-test-subj="only-favorites-toggle"
+                    hasActiveFilters={onlyFavorites}
+                    onClick={handleOnToggleOnlyFavorites}
+                  >
+                    {i18nTimeline.ONLY_FAVORITES}
+                  </EuiFilterButton>
+                </EuiFilterGroup>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+            <EuiSpacer size="xs" />
+            <EuiSelectable
+              height={POPOVER_HEIGHT}
+              isLoading={loading && timelines.length === 0}
+              listProps={{
+                rowHeight: TIMELINE_ITEM_HEIGHT,
+                showIcons: false,
+                virtualizedProps: ({
+                  onScroll: handleOnScroll.bind(null, timelines.length, totalCount),
+                } as unknown) as ListProps,
+              }}
+              renderOption={renderTimelineOption}
+              onChange={handleTimelineChange}
+              searchable
+              searchProps={{
+                'data-test-subj': 'timeline-super-select-search-box',
+                isLoading: loading,
+                placeholder: i18n.SEARCH_BOX_TIMELINE_PLACEHOLDER,
+                onSearch: onSearchTimeline,
+                incremental: false,
+              }}
+              singleSelection={true}
+              options={[
+                ...(!onlyFavorites && searchTimelineValue === ''
+                  ? getBasicSelectableOptions(timelineId == null ? '-1' : timelineId)
+                  : []),
+                ...timelines.map(
+                  (t, index) =>
+                    ({
+                      description: t.description,
+                      label: t.title,
+                      id: t.savedObjectId,
+                      key: `${t.title}-${index}`,
+                      title: t.title,
+                      checked: t.savedObjectId === timelineId ? 'on' : undefined,
+                    } as Option)
+                ),
+              ]}
+            >
+              {(list, search) => (
+                <>
+                  {search}
+                  {list}
+                </>
+              )}
+            </EuiSelectable>
+          </>
+        )}
+      </AllTimelinesQuery>
+      <SearchTimelineSuperSelectGlobalStyle />
+    </EuiInputPopover>
+  );
+};
+
+export const SearchTimelineSuperSelect = memo(SearchTimelineSuperSelectComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_super_select/translations.ts b/x-pack/legacy/plugins/siem/public/components/timeline/search_super_select/translations.ts
new file mode 100644
index 00000000000000..bffee407bc9995
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_super_select/translations.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const DEFAULT_TIMELINE_TITLE = i18n.translate('xpack.siem.timeline.defaultTimelineTitle', {
+  defaultMessage: 'Default blank timeline',
+});
+
+export const DEFAULT_TIMELINE_DESCRIPTION = i18n.translate(
+  'xpack.siem.timeline.defaultTimelineDescription',
+  {
+    defaultMessage: 'Timeline offered by default when creating new timeline.',
+  }
+);
+
+export const SEARCH_BOX_TIMELINE_PLACEHOLDER = i18n.translate(
+  'xpack.siem.timeline.searchBoxPlaceholder',
+  {
+    defaultMessage: 'e.g. timeline name or description',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
index 9f3cba7189fb19..655299c4a2a34b 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
@@ -70,8 +70,8 @@ export const RuleSchema = t.intersection([
     risk_score: t.number,
     rule_id: t.string,
     severity: t.string,
-    type: t.string,
     tags: t.array(t.string),
+    type: t.string,
     to: t.string,
     threats: t.array(t.unknown),
     updated_at: t.string,
@@ -79,6 +79,8 @@ export const RuleSchema = t.intersection([
   }),
   t.partial({
     saved_id: t.string,
+    timeline_id: t.string,
+    timeline_title: t.string,
   }),
 ]);
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/index.tsx
index e8a2c98a94a562..9c95c74cd62a54 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/index.tsx
@@ -56,13 +56,13 @@ export const DetectionEngineContainer = React.memo<Props>(() => {
           <Route exact path={`${detectionEnginePath}/rules`}>
             <RulesComponent />
           </Route>
-          <Route path={`${detectionEnginePath}/rules/create`}>
+          <Route exact path={`${detectionEnginePath}/rules/create`}>
             <CreateRuleComponent />
           </Route>
-          <Route exact path={`${detectionEnginePath}/rules/:ruleId`}>
+          <Route exact path={`${detectionEnginePath}/rules/id/:ruleId`}>
             <RuleDetailsComponent signalsIndex={signalIndexName} />
           </Route>
-          <Route path={`${detectionEnginePath}/rules/:ruleId/edit`}>
+          <Route exact path={`${detectionEnginePath}/rules/id/:ruleId/edit`}>
             <EditRuleComponent />
           </Route>
         </>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx
index f176109b1d7a53..469745262d9446 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx
@@ -17,7 +17,7 @@ import {
 import { Action } from './reducer';
 
 export const editRuleAction = (rule: Rule, history: H.History) => {
-  history.push(`/${DETECTION_ENGINE_PAGE_NAME}/rules/${rule.id}/edit`);
+  history.push(`/${DETECTION_ENGINE_PAGE_NAME}/rules/id/${rule.id}/edit`);
 };
 
 export const runRuleAction = () => {};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts
index 1909b75a85835e..f5d39553142429 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts
@@ -13,7 +13,7 @@ export const formatRules = (rules: Rule[], selectedIds?: string[]): TableData[]
     id: rule.id,
     rule_id: rule.rule_id,
     rule: {
-      href: `#/detection-engine/rules/${encodeURIComponent(rule.id)}`,
+      href: `#/detection-engine/rules/id/${encodeURIComponent(rule.id)}`,
       name: rule.name,
       status: 'Status Placeholder',
     },
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx
index f090f6d97eaf9d..725c7eeeedcfe4 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx
@@ -4,9 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiButtonEmpty, EuiButtonIcon, EuiFormRow, EuiFieldText, EuiSpacer } from '@elastic/eui';
+import {
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiFieldText,
+  EuiSpacer,
+} from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
 import React, { ChangeEvent, useCallback, useEffect, useState, useRef } from 'react';
+import styled from 'styled-components';
 
 import * as RuleI18n from '../../translations';
 import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
@@ -17,11 +26,26 @@ interface AddItemProps {
   dataTestSubj: string;
   idAria: string;
   isDisabled: boolean;
+  validate?: (args: unknown) => boolean;
 }
 
-export const AddItem = ({ addText, dataTestSubj, field, idAria, isDisabled }: AddItemProps) => {
+const MyEuiFormRow = styled(EuiFormRow)`
+  .euiFormRow__labelWrapper {
+    .euiText {
+      padding-right: 32px;
+    }
+  }
+`;
+
+export const AddItem = ({
+  addText,
+  dataTestSubj,
+  field,
+  idAria,
+  isDisabled,
+  validate,
+}: AddItemProps) => {
   const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
-  // const [items, setItems] = useState(['']);
   const [haveBeenKeyboardDeleted, setHaveBeenKeyboardDeleted] = useState(-1);
 
   const inputsRef = useRef<HTMLInputElement[]>([]);
@@ -104,7 +128,7 @@ export const AddItem = ({ addText, dataTestSubj, field, idAria, isDisabled }: Ad
 
   const values = field.value as string[];
   return (
-    <EuiFormRow
+    <MyEuiFormRow
       label={field.label}
       labelAppend={field.labelAppend}
       error={errorMessage}
@@ -124,11 +148,15 @@ export const AddItem = ({ addText, dataTestSubj, field, idAria, isDisabled }: Ad
             inputsRef.current[index] == null
               ? { value: item }
               : {}),
+            isInvalid: validate == null ? false : validate(item),
           };
           return (
             <div key={index}>
-              <EuiFieldText
-                append={
+              <EuiFlexGroup gutterSize="s" alignItems="center">
+                <EuiFlexItem grow>
+                  <EuiFieldText onChange={e => updateItem(e, index)} fullWidth {...euiFieldProps} />
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
                   <EuiButtonIcon
                     color="danger"
                     iconType="trash"
@@ -136,21 +164,18 @@ export const AddItem = ({ addText, dataTestSubj, field, idAria, isDisabled }: Ad
                     onClick={() => removeItem(index)}
                     aria-label={RuleI18n.DELETE}
                   />
-                }
-                onChange={e => updateItem(e, index)}
-                compressed
-                fullWidth
-                {...euiFieldProps}
-              />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+
               {values.length - 1 !== index && <EuiSpacer size="s" />}
             </div>
           );
         })}
 
-        <EuiButtonEmpty size="xs" onClick={addItem} isDisabled={isDisabled}>
+        <EuiButtonEmpty size="xs" onClick={addItem} isDisabled={isDisabled} iconType="plusInCircle">
           {addText}
         </EuiButtonEmpty>
       </>
-    </EuiFormRow>
+    </MyEuiFormRow>
   );
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
new file mode 100644
index 00000000000000..09d0c1131ea10d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
@@ -0,0 +1,222 @@
+/*
+ * 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,
+  EuiLoadingSpinner,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHealth,
+  EuiLink,
+  EuiText,
+  EuiListGroup,
+} from '@elastic/eui';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+
+import { isEmpty } from 'lodash/fp';
+import React from 'react';
+import styled from 'styled-components';
+
+import { esFilters } from '../../../../../../../../../../src/plugins/data/public';
+
+import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
+
+import { FilterLabel } from './filter_label';
+import * as i18n from './translations';
+import { BuildQueryBarDescription, BuildThreatsDescription, ListItems } from './types';
+
+const EuiBadgeWrap = styled(EuiBadge)`
+  .euiBadge__text {
+    white-space: pre-wrap !important;
+  }
+`;
+
+export const buildQueryBarDescription = ({
+  field,
+  filters,
+  filterManager,
+  query,
+  savedId,
+  indexPatterns,
+}: BuildQueryBarDescription): ListItems[] => {
+  let items: ListItems[] = [];
+  if (!isEmpty(filters)) {
+    filterManager.setFilters(filters);
+    items = [
+      ...items,
+      {
+        title: <>{i18n.FILTERS_LABEL} </>,
+        description: (
+          <EuiFlexGroup wrap responsive={false} gutterSize="xs">
+            {filterManager.getFilters().map((filter, index) => (
+              <EuiFlexItem grow={false} key={`${field}-filter-${index}`}>
+                <EuiBadgeWrap color="hollow">
+                  {indexPatterns != null ? (
+                    <FilterLabel
+                      filter={filter}
+                      valueLabel={esFilters.getDisplayValueFromFilter(filter, [indexPatterns])}
+                    />
+                  ) : (
+                    <EuiLoadingSpinner size="m" />
+                  )}
+                </EuiBadgeWrap>
+              </EuiFlexItem>
+            ))}
+          </EuiFlexGroup>
+        ),
+      },
+    ];
+  }
+  if (!isEmpty(query.query)) {
+    items = [
+      ...items,
+      {
+        title: <>{i18n.QUERY_LABEL} </>,
+        description: <>{query.query} </>,
+      },
+    ];
+  }
+  if (!isEmpty(savedId)) {
+    items = [
+      ...items,
+      {
+        title: <>{i18n.SAVED_ID_LABEL} </>,
+        description: <>{savedId} </>,
+      },
+    ];
+  }
+  return items;
+};
+
+const ThreatsEuiFlexGroup = styled(EuiFlexGroup)`
+  .euiFlexItem {
+    margin-bottom: 0px;
+  }
+`;
+
+const MyEuiListGroup = styled(EuiListGroup)`
+  padding: 0px;
+  .euiListGroupItem__button {
+    padding: 0px;
+  }
+`;
+
+export const buildThreatsDescription = ({
+  label,
+  threats,
+}: BuildThreatsDescription): ListItems[] => {
+  if (threats.length > 0) {
+    return [
+      {
+        title: label,
+        description: (
+          <ThreatsEuiFlexGroup direction="column">
+            {threats.map((threat, index) => {
+              const tactic = tacticsOptions.find(t => t.name === threat.tactic.name);
+              return (
+                <EuiFlexItem key={`${threat.tactic.name}-${index}`}>
+                  <EuiText grow={false} size="s">
+                    <h5>
+                      <EuiLink href={threat.tactic.reference} target="_blank">
+                        {tactic != null ? tactic.text : ''}
+                      </EuiLink>
+                    </h5>
+                    <MyEuiListGroup
+                      flush={false}
+                      bordered={false}
+                      listItems={threat.techniques.map(technique => {
+                        const myTechnique = techniquesOptions.find(t => t.name === technique.name);
+                        return {
+                          label: myTechnique != null ? myTechnique.label : '',
+                          href: technique.reference,
+                          target: '_blank',
+                        };
+                      })}
+                    />
+                  </EuiText>
+                </EuiFlexItem>
+              );
+            })}
+          </ThreatsEuiFlexGroup>
+        ),
+      },
+    ];
+  }
+  return [];
+};
+
+export const buildStringArrayDescription = (
+  label: string,
+  field: string,
+  values: string[]
+): ListItems[] => {
+  if (!isEmpty(values) && values.filter(val => !isEmpty(val)).length > 0) {
+    return [
+      {
+        title: label,
+        description: (
+          <EuiFlexGroup responsive={false} gutterSize="xs" wrap>
+            {values.map((val: string) =>
+              isEmpty(val) ? null : (
+                <EuiFlexItem grow={false} key={`${field}-${val}`}>
+                  <EuiBadgeWrap color="hollow">{val}</EuiBadgeWrap>
+                </EuiFlexItem>
+              )
+            )}
+          </EuiFlexGroup>
+        ),
+      },
+    ];
+  }
+  return [];
+};
+
+export const buildSeverityDescription = (label: string, value: string): ListItems[] => {
+  return [
+    {
+      title: label,
+      description: (
+        <EuiHealth
+          color={
+            value === 'low'
+              ? euiLightVars.euiColorVis0
+              : value === 'medium'
+              ? euiLightVars.euiColorVis5
+              : value === 'high'
+              ? euiLightVars.euiColorVis7
+              : euiLightVars.euiColorVis9
+          }
+        >
+          {value}
+        </EuiHealth>
+      ),
+    },
+  ];
+};
+
+export const buildUrlsDescription = (label: string, values: string[]): ListItems[] => {
+  if (!isEmpty(values) && values.filter(val => !isEmpty(val)).length > 0) {
+    return [
+      {
+        title: label,
+        description: (
+          <EuiListGroup
+            flush={true}
+            bordered={false}
+            listItems={values.map((val: string) => ({
+              label: val,
+              href: val,
+              iconType: 'link',
+              size: 'xs',
+              target: '_blank',
+            }))}
+          />
+        ),
+      },
+    ];
+  }
+  return [];
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
index a05f43579e6694..198756fc2336bc 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
@@ -4,19 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiBadge,
-  EuiDescriptionList,
-  EuiLoadingSpinner,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiTextArea,
-  EuiLink,
-  EuiText,
-  EuiListGroup,
-} from '@elastic/eui';
+import { EuiDescriptionList, EuiFlexGroup, EuiFlexItem, EuiTextArea } from '@elastic/eui';
 import { isEmpty, chunk, get, pick } from 'lodash/fp';
-import React, { memo, ReactNode, useState } from 'react';
+import React, { memo, useState } from 'react';
 import styled from 'styled-components';
 
 import {
@@ -25,13 +15,19 @@ import {
   FilterManager,
   Query,
 } from '../../../../../../../../../../src/plugins/data/public';
+import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/search_super_select/translations';
 import { useKibana } from '../../../../../lib/kibana';
-import { FilterLabel } from './filter_label';
-import { FormSchema } from '../shared_imports';
-import * as I18n from './translations';
-
 import { IMitreEnterpriseAttack } from '../../types';
-import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
+import { FieldValueTimeline } from '../pick_timeline';
+import { FormSchema } from '../shared_imports';
+import { ListItems } from './types';
+import {
+  buildQueryBarDescription,
+  buildSeverityDescription,
+  buildStringArrayDescription,
+  buildThreatsDescription,
+  buildUrlsDescription,
+} from './helpers';
 
 interface StepRuleDescriptionProps {
   direction?: 'row' | 'column';
@@ -40,29 +36,10 @@ interface StepRuleDescriptionProps {
   schema: FormSchema;
 }
 
-const EuiBadgeWrap = styled(EuiBadge)`
-  .euiBadge__text {
-    white-space: pre-wrap !important;
-  }
-`;
-
 const EuiFlexItemWidth = styled(EuiFlexItem)<{ direction: string }>`
   ${props => (props.direction === 'row' ? 'width : 50%;' : 'width: 100%;')};
 `;
 
-const MyEuiListGroup = styled(EuiListGroup)`
-  padding: 0px;
-  .euiListGroupItem__button {
-    padding: 0px;
-  }
-`;
-
-const ThreatsEuiFlexGroup = styled(EuiFlexGroup)`
-  .euiFlexItem {
-    margin-bottom: 0px;
-  }
-`;
-
 const MyEuiTextArea = styled(EuiTextArea)`
   max-width: 100%;
   height: 80px;
@@ -87,9 +64,9 @@ const StepRuleDescriptionComponent: React.FC<StepRuleDescriptionProps> = ({
   );
   return (
     <EuiFlexGroup gutterSize="none" direction={direction} justifyContent="spaceAround">
-      {chunk(Math.ceil(listItems.length / 2), listItems).map((chunckListItems, index) => (
+      {chunk(Math.ceil(listItems.length / 2), listItems).map((chunkListItems, index) => (
         <EuiFlexItemWidth direction={direction} key={`description-step-rule-${index}`} grow={false}>
-          <EuiDescriptionList listItems={chunckListItems} compressed />
+          <EuiDescriptionList listItems={chunkListItems} />
         </EuiFlexItemWidth>
       ))}
     </EuiFlexGroup>
@@ -98,11 +75,6 @@ const StepRuleDescriptionComponent: React.FC<StepRuleDescriptionProps> = ({
 
 export const StepRuleDescription = memo(StepRuleDescriptionComponent);
 
-interface ListItems {
-  title: NonNullable<ReactNode>;
-  description: NonNullable<ReactNode>;
-}
-
 const buildListItems = (
   data: unknown,
   schema: FormSchema,
@@ -130,103 +102,23 @@ const getDescriptionItem = (
   filterManager: FilterManager,
   indexPatterns?: IIndexPattern
 ): ListItems[] => {
-  if (field === 'useIndicesConfig') {
-    return [];
-  } else if (field === 'queryBar') {
+  if (field === 'queryBar') {
     const filters = get('queryBar.filters', value) as esFilters.Filter[];
     const query = get('queryBar.query', value) as Query;
     const savedId = get('queryBar.saved_id', value);
-    let items: ListItems[] = [];
-    if (!isEmpty(filters)) {
-      filterManager.setFilters(filters);
-      items = [
-        ...items,
-        {
-          title: <>{I18n.FILTERS_LABEL}</>,
-          description: (
-            <EuiFlexGroup wrap responsive={false} gutterSize="xs">
-              {filterManager.getFilters().map((filter, index) => (
-                <EuiFlexItem grow={false} key={`${field}-filter-${index}`}>
-                  <EuiBadgeWrap color="hollow">
-                    {indexPatterns != null ? (
-                      <FilterLabel
-                        filter={filter}
-                        valueLabel={esFilters.getDisplayValueFromFilter(filter, [indexPatterns])}
-                      />
-                    ) : (
-                      <EuiLoadingSpinner size="m" />
-                    )}
-                  </EuiBadgeWrap>
-                </EuiFlexItem>
-              ))}
-            </EuiFlexGroup>
-          ),
-        },
-      ];
-    }
-    if (!isEmpty(query.query)) {
-      items = [
-        ...items,
-        {
-          title: <>{I18n.QUERY_LABEL}</>,
-          description: <>{query.query}</>,
-        },
-      ];
-    }
-    if (!isEmpty(savedId)) {
-      items = [
-        ...items,
-        {
-          title: <>{I18n.SAVED_ID_LABEL}</>,
-          description: <>{savedId}</>,
-        },
-      ];
-    }
-    return items;
+    return buildQueryBarDescription({
+      field,
+      filters,
+      filterManager,
+      query,
+      savedId,
+      indexPatterns,
+    });
   } else if (field === 'threats') {
     const threats: IMitreEnterpriseAttack[] = get(field, value).filter(
       (threat: IMitreEnterpriseAttack) => threat.tactic.name !== 'none'
     );
-    if (threats.length > 0) {
-      return [
-        {
-          title: label,
-          description: (
-            <ThreatsEuiFlexGroup direction="column">
-              {threats.map((threat, index) => {
-                const tactic = tacticsOptions.find(t => t.name === threat.tactic.name);
-                return (
-                  <EuiFlexItem key={`${threat.tactic.name}-${index}`}>
-                    <EuiText grow={false} size="s">
-                      <h5>
-                        <EuiLink href={threat.tactic.reference} target="_blank">
-                          {tactic != null ? tactic.text : ''}
-                        </EuiLink>
-                      </h5>
-                      <MyEuiListGroup
-                        flush={false}
-                        bordered={false}
-                        listItems={threat.techniques.map(technique => {
-                          const myTechnique = techniquesOptions.find(
-                            t => t.name === technique.name
-                          );
-                          return {
-                            label: myTechnique != null ? myTechnique.label : '',
-                            href: technique.reference,
-                            target: '_blank',
-                          };
-                        })}
-                      />
-                    </EuiText>
-                  </EuiFlexItem>
-                );
-              })}
-            </ThreatsEuiFlexGroup>
-          ),
-        },
-      ];
-    }
-    return [];
+    return buildThreatsDescription({ label, threats });
   } else if (field === 'description') {
     return [
       {
@@ -234,27 +126,23 @@ const getDescriptionItem = (
         description: <MyEuiTextArea value={get(field, value)} readOnly={true} />,
       },
     ];
+  } else if (field === 'references') {
+    const urls: string[] = get(field, value);
+    return buildUrlsDescription(label, urls);
   } else if (Array.isArray(get(field, value))) {
     const values: string[] = get(field, value);
-    if (!isEmpty(values) && values.filter(val => !isEmpty(val)).length > 0) {
-      return [
-        {
-          title: label,
-          description: (
-            <EuiFlexGroup responsive={false} gutterSize="xs" wrap>
-              {values.map((val: string) =>
-                isEmpty(val) ? null : (
-                  <EuiFlexItem grow={false} key={`${field}-${val}`}>
-                    <EuiBadgeWrap color="hollow">{val}</EuiBadgeWrap>
-                  </EuiFlexItem>
-                )
-              )}
-            </EuiFlexGroup>
-          ),
-        },
-      ];
-    }
-    return [];
+    return buildStringArrayDescription(label, field, values);
+  } else if (field === 'severity') {
+    const val: string = get(field, value);
+    return buildSeverityDescription(label, val);
+  } else if (field === 'timeline') {
+    const timeline = get(field, value) as FieldValueTimeline;
+    return [
+      {
+        title: label,
+        description: timeline.title ?? DEFAULT_TIMELINE_TITLE,
+      },
+    ];
   }
   const description: string = get(field, value);
   if (!isEmpty(description)) {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/types.ts
new file mode 100644
index 00000000000000..d32fbcd725d12f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/types.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { ReactNode } from 'react';
+
+import {
+  IIndexPattern,
+  esFilters,
+  FilterManager,
+  Query,
+} from '../../../../../../../../../../src/plugins/data/public';
+import { IMitreEnterpriseAttack } from '../../types';
+
+export interface ListItems {
+  title: NonNullable<ReactNode>;
+  description: NonNullable<ReactNode>;
+}
+
+export interface BuildQueryBarDescription {
+  field: string;
+  filters: esFilters.Filter[];
+  filterManager: FilterManager;
+  query: Query;
+  savedId: string;
+  indexPatterns?: IIndexPattern;
+}
+
+export interface BuildThreatsDescription {
+  label: string;
+  threats: IMitreEnterpriseAttack[];
+}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.ts
new file mode 100644
index 00000000000000..1202fe54ad194f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { isEmpty } from 'lodash/fp';
+
+import { IMitreAttack } from '../../types';
+
+export const isMitreAttackInvalid = (
+  tacticName: string | null | undefined,
+  techniques: IMitreAttack[] | null | undefined
+) => {
+  if (isEmpty(tacticName) || (tacticName !== 'none' && isEmpty(techniques))) {
+    return true;
+  }
+  return false;
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx
index a777506ee12ae5..97c4c2fdd050aa 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx
@@ -8,27 +8,30 @@ import {
   EuiButtonEmpty,
   EuiButtonIcon,
   EuiFormRow,
-  EuiSelect,
+  EuiSuperSelect,
   EuiSpacer,
   EuiFlexGroup,
   EuiFlexItem,
   EuiComboBox,
-  EuiFormControlLayout,
+  EuiText,
 } from '@elastic/eui';
 import { isEmpty, kebabCase, camelCase } from 'lodash/fp';
-import React, { ChangeEvent, useCallback } from 'react';
+import React, { useCallback } from 'react';
 import styled from 'styled-components';
 
 import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
-import * as RuleI18n from '../../translations';
+import * as Rulei18n from '../../translations';
 import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
-import * as I18n from './translations';
+import { threatsDefault } from '../step_about_rule/default_value';
 import { IMitreEnterpriseAttack } from '../../types';
+import { isMitreAttackInvalid } from './helpers';
+import * as i18n from './translations';
 
-const MyEuiFormControlLayout = styled(EuiFormControlLayout)`
-  &.euiFormControlLayout--compressed {
-    height: fit-content !important;
-  }
+const MitreContainer = styled.div`
+  margin-top: 16px;
+`;
+const MyEuiSuperSelect = styled(EuiSuperSelect)`
+  width: 280px;
 `;
 interface AddItemProps {
   field: FieldHook;
@@ -43,7 +46,12 @@ export const AddMitreThreat = ({ dataTestSubj, field, idAria, isDisabled }: AddI
   const removeItem = useCallback(
     (index: number) => {
       const values = field.value as string[];
-      field.setValue([...values.slice(0, index), ...values.slice(index + 1)]);
+      const newValues = [...values.slice(0, index), ...values.slice(index + 1)];
+      if (isEmpty(newValues)) {
+        field.setValue(threatsDefault);
+      } else {
+        field.setValue(newValues);
+      }
     },
     [field]
   );
@@ -61,9 +69,9 @@ export const AddMitreThreat = ({ dataTestSubj, field, idAria, isDisabled }: AddI
   }, [field]);
 
   const updateTactic = useCallback(
-    (index: number, event: ChangeEvent<HTMLSelectElement>) => {
+    (index: number, value: string) => {
       const values = field.value as IMitreEnterpriseAttack[];
-      const { id, reference, name } = tacticsOptions.find(t => t.value === event.target.value) || {
+      const { id, reference, name } = tacticsOptions.find(t => t.value === value) || {
         id: '',
         name: '',
         reference: '',
@@ -97,75 +105,104 @@ export const AddMitreThreat = ({ dataTestSubj, field, idAria, isDisabled }: AddI
 
   const values = field.value as IMitreEnterpriseAttack[];
 
+  const getSelectTactic = (tacticName: string, index: number, disabled: boolean) => (
+    <MyEuiSuperSelect
+      id="selectDocExample"
+      options={[
+        ...(tacticName === 'none'
+          ? [
+              {
+                inputDisplay: <>{i18n.TACTIC_PLACEHOLDER}</>,
+                value: 'none',
+                disabled,
+              },
+            ]
+          : []),
+        ...tacticsOptions.map(t => ({
+          inputDisplay: <>{t.text}</>,
+          value: t.value,
+          disabled,
+        })),
+      ]}
+      aria-label=""
+      onChange={updateTactic.bind(null, index)}
+      fullWidth={false}
+      valueOfSelected={camelCase(tacticName)}
+    />
+  );
+
+  const getSelectTechniques = (item: IMitreEnterpriseAttack, index: number, disabled: boolean) => {
+    const invalid = isMitreAttackInvalid(item.tactic.name, item.techniques);
+    return (
+      <EuiFlexGroup gutterSize="s" alignItems="center">
+        <EuiFlexItem grow>
+          <EuiComboBox
+            placeholder={i18n.TECHNIQUES_PLACEHOLDER}
+            options={techniquesOptions.filter(t => t.tactics.includes(kebabCase(item.tactic.name)))}
+            selectedOptions={item.techniques}
+            onChange={updateTechniques.bind(null, index)}
+            isDisabled={disabled}
+            fullWidth={true}
+            isInvalid={invalid}
+          />
+          {invalid && (
+            <EuiText color="danger" size="xs">
+              <p>{errorMessage}</p>
+            </EuiText>
+          )}
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButtonIcon
+            color="danger"
+            iconType="trash"
+            isDisabled={disabled}
+            onClick={() => removeItem(index)}
+            aria-label={Rulei18n.DELETE}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  };
+
   return (
-    <EuiFormRow
-      label={field.label}
-      labelAppend={field.labelAppend}
-      error={errorMessage}
-      isInvalid={isInvalid}
-      fullWidth
-      data-test-subj={dataTestSubj}
-      describedByIds={idAria ? [idAria] : undefined}
-    >
-      <>
-        {values.map((item, index) => {
-          const euiSelectFieldProps = {
-            disabled: isDisabled,
-          };
-          return (
-            <div key={index}>
-              <EuiFlexGroup gutterSize="xs" justifyContent="spaceBetween" alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <EuiSelect
-                    id="selectDocExample"
-                    options={[
-                      ...(item.tactic.name === 'none'
-                        ? [{ text: I18n.TACTIC_PLACEHOLDER, value: 'none' }]
-                        : []),
-                      ...tacticsOptions.map(t => ({ text: t.text, value: t.value })),
-                    ]}
-                    aria-label=""
-                    onChange={updateTactic.bind(null, index)}
-                    prepend={I18n.TACTIC}
-                    compressed
-                    fullWidth={false}
-                    value={camelCase(item.tactic.name)}
-                    {...euiSelectFieldProps}
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={true}>
-                  <MyEuiFormControlLayout compressed fullWidth prepend={I18n.TECHNIQUES}>
-                    <EuiComboBox
-                      compressed
-                      placeholder={I18n.TECHNIQUES_PLACEHOLDER}
-                      options={techniquesOptions.filter(t =>
-                        t.tactics.includes(kebabCase(item.tactic.name))
-                      )}
-                      selectedOptions={item.techniques}
-                      onChange={updateTechniques.bind(null, index)}
-                      isDisabled={isDisabled}
-                      fullWidth={true}
-                    />
-                  </MyEuiFormControlLayout>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiButtonIcon
-                    color="danger"
-                    iconType="trash"
-                    isDisabled={isDisabled}
-                    onClick={() => removeItem(index)}
-                    aria-label={RuleI18n.DELETE}
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-              {values.length - 1 !== index && <EuiSpacer size="s" />}
-            </div>
-          );
-        })}
-        <EuiButtonEmpty size="xs" onClick={addItem} isDisabled={isDisabled}>
-          {I18n.ADD_MITRE_ATTACK}
-        </EuiButtonEmpty>
-      </>
-    </EuiFormRow>
+    <MitreContainer>
+      {values.map((item, index) => (
+        <div key={index}>
+          <EuiFlexGroup gutterSize="s" justifyContent="spaceBetween" alignItems="flexStart">
+            <EuiFlexItem grow={false}>
+              {index === 0 ? (
+                <EuiFormRow
+                  label={`${field.label} ${i18n.TACTIC}`}
+                  labelAppend={field.labelAppend}
+                  describedByIds={idAria ? [`${idAria} ${i18n.TACTIC}`] : undefined}
+                >
+                  <>{getSelectTactic(item.tactic.name, index, isDisabled)}</>
+                </EuiFormRow>
+              ) : (
+                getSelectTactic(item.tactic.name, index, isDisabled)
+              )}
+            </EuiFlexItem>
+            <EuiFlexItem grow>
+              {index === 0 ? (
+                <EuiFormRow
+                  label={`${field.label} ${i18n.TECHNIQUE}`}
+                  isInvalid={isInvalid}
+                  fullWidth
+                  describedByIds={idAria ? [`${idAria} ${i18n.TECHNIQUE}`] : undefined}
+                >
+                  <>{getSelectTechniques(item, index, isDisabled)}</>
+                </EuiFormRow>
+              ) : (
+                getSelectTechniques(item, index, isDisabled)
+              )}
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          {values.length - 1 !== index && <EuiSpacer size="s" />}
+        </div>
+      ))}
+      <EuiButtonEmpty size="xs" onClick={addItem} isDisabled={isDisabled} iconType="plusInCircle">
+        {i18n.ADD_MITRE_ATTACK}
+      </EuiButtonEmpty>
+    </MitreContainer>
   );
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/translations.ts
index 22ee6cc3ef911f..dd4c55c1503ec4 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/translations.ts
@@ -7,13 +7,13 @@
 import { i18n } from '@kbn/i18n';
 
 export const TACTIC = i18n.translate('xpack.siem.detectionEngine.mitreAttack.tacticsDescription', {
-  defaultMessage: 'Tactic',
+  defaultMessage: 'tactic',
 });
 
-export const TECHNIQUES = i18n.translate(
+export const TECHNIQUE = i18n.translate(
   'xpack.siem.detectionEngine.mitreAttack.techniquesDescription',
   {
-    defaultMessage: 'Techniques',
+    defaultMessage: 'technique',
   }
 );
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx
new file mode 100644
index 00000000000000..873e0c2184c61d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx
@@ -0,0 +1,74 @@
+/*
+ * 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 { EuiFormRow } from '@elastic/eui';
+import React, { useCallback, useEffect, useState } from 'react';
+
+import { SearchTimelineSuperSelect } from '../../../../../components/timeline/search_super_select';
+import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
+
+export interface FieldValueTimeline {
+  id: string | null;
+  title: string | null;
+}
+
+interface QueryBarDefineRuleProps {
+  dataTestSubj: string;
+  field: FieldHook;
+  idAria: string;
+  isDisabled: boolean;
+}
+
+export const PickTimeline = ({
+  dataTestSubj,
+  field,
+  idAria,
+  isDisabled = false,
+}: QueryBarDefineRuleProps) => {
+  const [timelineId, setTimelineId] = useState<string | null>(null);
+  const [timelineTitle, setTimelineTitle] = useState<string | null>(null);
+
+  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
+
+  useEffect(() => {
+    const { id, title } = field.value as FieldValueTimeline;
+    if (timelineTitle !== title && timelineId !== id) {
+      setTimelineId(id);
+      setTimelineTitle(title);
+    }
+  }, [field.value]);
+
+  const handleOnTimelineChange = useCallback(
+    (title: string, id: string | null) => {
+      if (id === null) {
+        field.setValue({ id, title: null });
+      } else if (timelineTitle !== title && timelineId !== id) {
+        field.setValue({ id, title });
+      }
+    },
+    [field]
+  );
+
+  return (
+    <EuiFormRow
+      label={field.label}
+      labelAppend={field.labelAppend}
+      helpText={field.helpText}
+      error={errorMessage}
+      isInvalid={isInvalid}
+      fullWidth
+      data-test-subj={dataTestSubj}
+      describedByIds={idAria ? [idAria] : undefined}
+    >
+      <SearchTimelineSuperSelect
+        isDisabled={isDisabled}
+        timelineId={timelineId}
+        timelineTitle={timelineTitle}
+        onTimelineChange={handleOnTimelineChange}
+      />
+    </EuiFormRow>
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx
index c294ec24c4cb70..3e39beb6e61b78 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFormRow, EuiMutationObserver } from '@elastic/eui';
 import { isEqual } from 'lodash/fp';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Subscription } from 'rxjs';
 import styled from 'styled-components';
 
@@ -19,11 +19,18 @@ import {
   SavedQueryTimeFilter,
 } from '../../../../../../../../../../src/plugins/data/public';
 
+import { BrowserFields } from '../../../../../containers/source';
+import { OpenTimelineModal } from '../../../../../components/open_timeline/open_timeline_modal';
+import { ActionTimelineToShow } from '../../../../../components/open_timeline/types';
 import { QueryBar } from '../../../../../components/query_bar';
+import { buildGlobalQuery } from '../../../../../components/timeline/helpers';
+import { getDataProviderFilter } from '../../../../../components/timeline/query_bar';
+import { convertKueryToElasticSearchQuery } from '../../../../../lib/keury';
 import { useKibana } from '../../../../../lib/kibana';
+import { TimelineModel } from '../../../../../store/timeline/model';
 import { useSavedQueryServices } from '../../../../../utils/saved_query_services';
-
 import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
+import * as i18n from './translations';
 
 export interface FieldValueQueryBar {
   filters: esFilters.Filter[];
@@ -31,11 +38,14 @@ export interface FieldValueQueryBar {
   saved_id: string | null;
 }
 interface QueryBarDefineRuleProps {
+  browserFields: BrowserFields;
   dataTestSubj: string;
   field: FieldHook;
   idAria: string;
   isLoading: boolean;
   indexPattern: IIndexPattern;
+  onCloseTimelineSearch: () => void;
+  openTimelineSearch: boolean;
   resizeParentContainer?: (height: number) => void;
 }
 
@@ -56,14 +66,18 @@ const StyledEuiFormRow = styled(EuiFormRow)`
 // TODO need to add disabled in the SearchBar
 
 export const QueryBarDefineRule = ({
+  browserFields,
   dataTestSubj,
   field,
   idAria,
   indexPattern,
   isLoading = false,
+  onCloseTimelineSearch,
+  openTimelineSearch = false,
   resizeParentContainer,
 }: QueryBarDefineRuleProps) => {
   const [originalHeight, setOriginalHeight] = useState(-1);
+  const [loadingTimeline, setLoadingTimeline] = useState(false);
   const [savedQuery, setSavedQuery] = useState<SavedQuery | null>(null);
   const [queryDraft, setQueryDraft] = useState<Query>({ query: '', language: 'kuery' });
   const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
@@ -168,6 +182,38 @@ export const QueryBarDefineRule = ({
     [field.value]
   );
 
+  const onCloseTimelineModal = useCallback(() => {
+    setLoadingTimeline(true);
+    onCloseTimelineSearch();
+  }, [onCloseTimelineSearch]);
+
+  const onOpenTimeline = useCallback(
+    (timeline: TimelineModel) => {
+      setLoadingTimeline(false);
+      const newQuery = {
+        query: timeline.kqlQuery.filterQuery?.kuery?.expression ?? '',
+        language: timeline.kqlQuery.filterQuery?.kuery?.kind ?? 'kuery',
+      };
+      const dataProvidersDsl =
+        timeline.dataProviders != null && timeline.dataProviders.length > 0
+          ? convertKueryToElasticSearchQuery(
+              buildGlobalQuery(timeline.dataProviders, browserFields),
+              indexPattern
+            )
+          : '';
+      const newFilters = timeline.filters ?? [];
+      field.setValue({
+        filters:
+          dataProvidersDsl !== ''
+            ? [...newFilters, getDataProviderFilter(dataProvidersDsl)]
+            : newFilters,
+        query: newQuery,
+        saved_id: '',
+      });
+    },
+    [browserFields, field, indexPattern]
+  );
+
   const onMutation = (event: unknown, observer: unknown) => {
     if (resizeParentContainer != null) {
       const suggestionContainer = document.getElementById('kbnTypeahead__items');
@@ -189,39 +235,51 @@ export const QueryBarDefineRule = ({
     }
   };
 
+  const actionTimelineToHide = useMemo<ActionTimelineToShow[]>(() => ['duplicate'], []);
+
   return (
-    <StyledEuiFormRow
-      label={field.label}
-      labelAppend={field.labelAppend}
-      helpText={field.helpText}
-      error={errorMessage}
-      isInvalid={isInvalid}
-      fullWidth
-      data-test-subj={dataTestSubj}
-      describedByIds={idAria ? [idAria] : undefined}
-    >
-      <EuiMutationObserver
-        observerOptions={{ subtree: true, attributes: true, childList: true }}
-        onMutation={onMutation}
+    <>
+      <StyledEuiFormRow
+        label={field.label}
+        labelAppend={field.labelAppend}
+        helpText={field.helpText}
+        error={errorMessage}
+        isInvalid={isInvalid}
+        fullWidth
+        data-test-subj={dataTestSubj}
+        describedByIds={idAria ? [idAria] : undefined}
       >
-        {mutationRef => (
-          <div ref={mutationRef}>
-            <QueryBar
-              indexPattern={indexPattern}
-              isLoading={isLoading}
-              isRefreshPaused={false}
-              filterQuery={queryDraft}
-              filterManager={filterManager}
-              filters={filterManager.getFilters() || []}
-              onChangedQuery={onChangedQuery}
-              onSubmitQuery={onSubmitQuery}
-              savedQuery={savedQuery}
-              onSavedQuery={onSavedQuery}
-              hideSavedQuery={false}
-            />
-          </div>
-        )}
-      </EuiMutationObserver>
-    </StyledEuiFormRow>
+        <EuiMutationObserver
+          observerOptions={{ subtree: true, attributes: true, childList: true }}
+          onMutation={onMutation}
+        >
+          {mutationRef => (
+            <div ref={mutationRef}>
+              <QueryBar
+                indexPattern={indexPattern}
+                isLoading={isLoading || loadingTimeline}
+                isRefreshPaused={false}
+                filterQuery={queryDraft}
+                filterManager={filterManager}
+                filters={filterManager.getFilters() || []}
+                onChangedQuery={onChangedQuery}
+                onSubmitQuery={onSubmitQuery}
+                savedQuery={savedQuery}
+                onSavedQuery={onSavedQuery}
+                hideSavedQuery={false}
+              />
+            </div>
+          )}
+        </EuiMutationObserver>
+      </StyledEuiFormRow>
+      {openTimelineSearch ? (
+        <OpenTimelineModal
+          hideActions={actionTimelineToHide}
+          modalTitle={i18n.IMPORT_TIMELINE_MODAL}
+          onClose={onCloseTimelineModal}
+          onOpen={onOpenTimeline}
+        />
+      ) : null}
+    </>
   );
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/translations.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/translations.tsx
new file mode 100644
index 00000000000000..9b14e4f8599dac
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/translations.tsx
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const IMPORT_TIMELINE_MODAL = i18n.translate(
+  'xpack.siem.detectionEngine.createRule.stepDefineRule.importTimelineModalTitle',
+  {
+    defaultMessage: 'Import query from saved timeline',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx
index 2e57ff8ba2c4f0..8097c27cddfe8b 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiFieldNumber, EuiFormRow, EuiSelect } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiFieldNumber, EuiFormRow, EuiSelect } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
 
 import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
@@ -32,6 +32,10 @@ const StyledEuiFormRow = styled(EuiFormRow)`
   }
 `;
 
+const MyEuiSelect = styled(EuiSelect)`
+  width: auto;
+`;
+
 export const ScheduleItem = ({ dataTestSubj, field, idAria, isDisabled }: ScheduleItemProps) => {
   const [timeType, setTimeType] = useState('s');
   const [timeVal, setTimeVal] = useState<number>(0);
@@ -79,22 +83,33 @@ export const ScheduleItem = ({ dataTestSubj, field, idAria, isDisabled }: Schedu
 
   // EUI missing some props
   const rest = { disabled: isDisabled };
+  const label = useMemo(
+    () => (
+      <EuiFlexGroup gutterSize="s" justifyContent="flexStart" alignItems="center">
+        <EuiFlexItem grow={false} component="span">
+          {field.label}
+        </EuiFlexItem>
+        <EuiFlexItem grow={false} component="span">
+          {field.labelAppend}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    ),
+    [field.label, field.labelAppend]
+  );
 
   return (
     <StyledEuiFormRow
-      label={field.label}
-      labelAppend={field.labelAppend}
+      label={label}
       helpText={field.helpText}
       error={errorMessage}
       isInvalid={isInvalid}
-      fullWidth
+      fullWidth={false}
       data-test-subj={dataTestSubj}
       describedByIds={idAria ? [idAria] : undefined}
     >
       <EuiFieldNumber
         append={
-          <EuiSelect
-            compressed={true}
+          <MyEuiSelect
             fullWidth={false}
             options={timeTypeOptions}
             onChange={onChangeTimeType}
@@ -102,7 +117,6 @@ export const ScheduleItem = ({ dataTestSubj, field, idAria, isDisabled }: Schedu
             {...rest}
           />
         }
-        compressed
         fullWidth
         min={0}
         onChange={onChangeTimeVal}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx
index 48ff0d80d0398f..3ec5bf1a12eb0f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx
@@ -27,7 +27,7 @@ const RuleStatusIconStyled = styled.div`
 
 const RuleStatusIconComponent: React.FC<RuleStatusIconProps> = ({ name, type }) => {
   const theme = useEuiTheme();
-  const color = type === 'passive' ? theme.euiColorLightestShade : theme.euiColorDarkestShade;
+  const color = type === 'passive' ? theme.euiColorLightestShade : theme.euiColorPrimary;
   return (
     <RuleStatusIconStyled>
       <EuiAvatar color={color} name={type === 'valid' ? '' : name} size="l" />
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.ts
deleted file mode 100644
index 7d6e434bcc8c6c..00000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.ts
+++ /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 * as I18n from './translations';
-
-export type SeverityValue = 'low' | 'medium' | 'high' | 'critical';
-
-interface SeverityOptionItem {
-  value: SeverityValue;
-  text: string;
-}
-
-export const severityOptions: SeverityOptionItem[] = [
-  { value: 'low', text: I18n.LOW },
-  { value: 'medium', text: I18n.MEDIUM },
-  { value: 'high', text: I18n.HIGH },
-  { value: 'critical', text: I18n.CRITICAL },
-];
-
-export const defaultRiskScoreBySeverity: Record<SeverityValue, number> = {
-  low: 21,
-  medium: 47,
-  high: 73,
-  critical: 99,
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.tsx
new file mode 100644
index 00000000000000..9fb64189ebd1af
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiHealth } from '@elastic/eui';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import React from 'react';
+import * as I18n from './translations';
+
+export type SeverityValue = 'low' | 'medium' | 'high' | 'critical';
+
+interface SeverityOptionItem {
+  value: SeverityValue;
+  inputDisplay: React.ReactElement;
+}
+
+export const severityOptions: SeverityOptionItem[] = [
+  {
+    value: 'low',
+    inputDisplay: <EuiHealth color={euiLightVars.euiColorVis0}>{I18n.LOW}</EuiHealth>,
+  },
+  {
+    value: 'medium',
+    inputDisplay: <EuiHealth color={euiLightVars.euiColorVis5}>{I18n.MEDIUM} </EuiHealth>,
+  },
+  {
+    value: 'high',
+    inputDisplay: <EuiHealth color={euiLightVars.euiColorVis7}>{I18n.HIGH} </EuiHealth>,
+  },
+  {
+    value: 'critical',
+    inputDisplay: <EuiHealth color={euiLightVars.euiColorVis9}>{I18n.CRITICAL} </EuiHealth>,
+  },
+];
+
+export const defaultRiskScoreBySeverity: Record<SeverityValue, number> = {
+  low: 21,
+  medium: 47,
+  high: 73,
+  critical: 99,
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
index c0c5ae77a1960e..328c4a0f960667 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
@@ -6,6 +6,14 @@
 
 import { AboutStepRule } from '../../types';
 
+export const threatsDefault = [
+  {
+    framework: 'MITRE ATT&CK',
+    tactic: { id: 'none', name: 'none', reference: 'none' },
+    techniques: [],
+  },
+];
+
 export const stepAboutDefaultValue: AboutStepRule = {
   name: '',
   description: '',
@@ -15,11 +23,9 @@ export const stepAboutDefaultValue: AboutStepRule = {
   references: [''],
   falsePositives: [''],
   tags: [],
-  threats: [
-    {
-      framework: 'MITRE ATT&CK',
-      tactic: { id: 'none', name: 'none', reference: 'none' },
-      techniques: [],
-    },
-  ],
+  timeline: {
+    id: null,
+    title: null,
+  },
+  threats: threatsDefault,
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/helpers.ts
new file mode 100644
index 00000000000000..99b01c8b22974c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/helpers.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEmpty } from 'lodash/fp';
+
+const urlExpression = /(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})/gi;
+
+export const isUrlInvalid = (url: string | null | undefined) => {
+  if (!isEmpty(url) && url != null && url.match(urlExpression) == null) {
+    return true;
+  }
+  return false;
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
index e266c0b9ab47d6..8956776dcd3b21 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
@@ -7,17 +7,21 @@
 import { EuiButton, EuiHorizontalRule, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { isEqual, get } from 'lodash/fp';
 import React, { memo, useCallback, useEffect, useState } from 'react';
+import styled from 'styled-components';
 
 import { RuleStepProps, RuleStep, AboutStepRule } from '../../types';
 import * as RuleI18n from '../../translations';
-import { Field, Form, FormDataProvider, getUseField, UseField, useForm } from '../shared_imports';
 import { AddItem } from '../add_item_form';
+import { StepRuleDescription } from '../description_step';
+import { AddMitreThreat } from '../mitre';
+import { Field, Form, FormDataProvider, getUseField, UseField, useForm } from '../shared_imports';
+
 import { defaultRiskScoreBySeverity, severityOptions, SeverityValue } from './data';
 import { stepAboutDefaultValue } from './default_value';
+import { isUrlInvalid } from './helpers';
 import { schema } from './schema';
 import * as I18n from './translations';
-import { StepRuleDescription } from '../description_step';
-import { AddMitreThreat } from '../mitre';
+import { PickTimeline } from '../pick_timeline';
 
 const CommonUseField = getUseField({ component: Field });
 
@@ -25,6 +29,10 @@ interface StepAboutRuleProps extends RuleStepProps {
   defaultValues?: AboutStepRule | null;
 }
 
+const TagContainer = styled.div`
+  margin-top: 16px;
+`;
+
 export const StepAboutRule = memo<StepAboutRuleProps>(
   ({
     defaultValues,
@@ -90,7 +98,6 @@ export const StepAboutRule = memo<StepAboutRuleProps>(
               idAria: 'detectionEngineStepAboutRuleName',
               'data-test-subj': 'detectionEngineStepAboutRuleName',
               euiFieldProps: {
-                compressed: true,
                 fullWidth: false,
                 disabled: isLoading,
               },
@@ -99,11 +106,9 @@ export const StepAboutRule = memo<StepAboutRuleProps>(
           <CommonUseField
             path="description"
             componentProps={{
-              compressed: true,
               idAria: 'detectionEngineStepAboutRuleDescription',
               'data-test-subj': 'detectionEngineStepAboutRuleDescription',
               euiFieldProps: {
-                compressed: true,
                 disabled: isLoading,
               },
             }}
@@ -114,7 +119,6 @@ export const StepAboutRule = memo<StepAboutRuleProps>(
               idAria: 'detectionEngineStepAboutRuleSeverity',
               'data-test-subj': 'detectionEngineStepAboutRuleSeverity',
               euiFieldProps: {
-                compressed: true,
                 fullWidth: false,
                 disabled: isLoading,
                 options: severityOptions,
@@ -129,29 +133,38 @@ export const StepAboutRule = memo<StepAboutRuleProps>(
               euiFieldProps: {
                 max: 100,
                 min: 0,
-                compressed: true,
                 fullWidth: false,
                 disabled: isLoading,
                 options: severityOptions,
+                showTicks: true,
+                tickInterval: 25,
               },
             }}
           />
+          <UseField
+            path="timeline"
+            component={PickTimeline}
+            componentProps={{
+              idAria: 'detectionEngineStepAboutRuleTimeline',
+              isDisabled: isLoading,
+              dataTestSubj: 'detectionEngineStepAboutRuleTimeline',
+            }}
+          />
           <UseField
             path="references"
             component={AddItem}
             componentProps={{
-              compressed: true,
               addText: I18n.ADD_REFERENCE,
               idAria: 'detectionEngineStepAboutRuleReferenceUrls',
               isDisabled: isLoading,
               dataTestSubj: 'detectionEngineStepAboutRuleReferenceUrls',
+              validate: isUrlInvalid,
             }}
           />
           <UseField
             path="falsePositives"
             component={AddItem}
             componentProps={{
-              compressed: true,
               addText: I18n.ADD_FALSE_POSITIVE,
               idAria: 'detectionEngineStepAboutRuleFalsePositives',
               isDisabled: isLoading,
@@ -162,24 +175,25 @@ export const StepAboutRule = memo<StepAboutRuleProps>(
             path="threats"
             component={AddMitreThreat}
             componentProps={{
-              compressed: true,
               idAria: 'detectionEngineStepAboutRuleMitreThreats',
               isDisabled: isLoading,
               dataTestSubj: 'detectionEngineStepAboutRuleMitreThreats',
             }}
           />
-          <CommonUseField
-            path="tags"
-            componentProps={{
-              idAria: 'detectionEngineStepAboutRuleTags',
-              'data-test-subj': 'detectionEngineStepAboutRuleTags',
-              euiFieldProps: {
-                compressed: true,
-                fullWidth: true,
-                isDisabled: isLoading,
-              },
-            }}
-          />
+          <TagContainer>
+            <CommonUseField
+              path="tags"
+              componentProps={{
+                idAria: 'detectionEngineStepAboutRuleTags',
+                'data-test-subj': 'detectionEngineStepAboutRuleTags',
+                euiFieldProps: {
+                  fullWidth: true,
+                  isDisabled: isLoading,
+                  placeholder: '',
+                },
+              }}
+            />
+          </TagContainer>
           <FormDataProvider pathsToWatch="severity">
             {({ severity }) => {
               const newRiskScore = defaultRiskScoreBySeverity[severity as SeverityValue];
@@ -202,7 +216,7 @@ export const StepAboutRule = memo<StepAboutRuleProps>(
             >
               <EuiFlexItem grow={false}>
                 <EuiButton fill onClick={onSubmit} isDisabled={isLoading}>
-                  {myStepData.isNew ? RuleI18n.CONTINUE : RuleI18n.UPDATE}
+                  {RuleI18n.CONTINUE}
                 </EuiButton>
               </EuiFlexItem>
             </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx
index c72312bb908361..9355f1c8bfefa0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx
@@ -6,7 +6,6 @@
 
 import { EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { isEmpty } from 'lodash/fp';
 import React from 'react';
 
 import * as RuleI18n from '../../translations';
@@ -18,6 +17,8 @@ import {
   ValidationFunc,
   ERROR_CODE,
 } from '../shared_imports';
+import { isMitreAttackInvalid } from '../mitre/helpers';
+import { isUrlInvalid } from './helpers';
 import * as I18n from './translations';
 
 const { emptyField } = fieldValidators;
@@ -63,7 +64,7 @@ export const schema: FormSchema = {
     ],
   },
   severity: {
-    type: FIELD_TYPES.SELECT,
+    type: FIELD_TYPES.SUPER_SELECT,
     label: i18n.translate(
       'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldSeverityLabel',
       {
@@ -92,6 +93,14 @@ export const schema: FormSchema = {
       }
     ),
   },
+  timeline: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTimelineTemplateLabel',
+      {
+        defaultMessage: 'Timeline template',
+      }
+    ),
+  },
   references: {
     label: i18n.translate(
       'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldReferenceUrlsLabel',
@@ -100,6 +109,28 @@ export const schema: FormSchema = {
       }
     ),
     labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
+    validations: [
+      {
+        validator: (
+          ...args: Parameters<ValidationFunc>
+        ): ReturnType<ValidationFunc<{}, ERROR_CODE>> | undefined => {
+          const [{ value, path }] = args;
+          let hasError = false;
+          (value as string[]).forEach(url => {
+            if (isUrlInvalid(url)) {
+              hasError = true;
+            }
+          });
+          return hasError
+            ? {
+                code: 'ERR_FIELD_FORMAT',
+                path,
+                message: I18n.URL_FORMAT_INVALID,
+              }
+            : undefined;
+        },
+      },
+    ],
   },
   falsePositives: {
     label: i18n.translate(
@@ -126,7 +157,7 @@ export const schema: FormSchema = {
           const [{ value, path }] = args;
           let hasError = false;
           (value as IMitreEnterpriseAttack[]).forEach(v => {
-            if (isEmpty(v.tactic.name) || (v.tactic.name !== 'none' && isEmpty(v.techniques))) {
+            if (isMitreAttackInvalid(v.tactic.name, v.techniques)) {
               hasError = true;
             }
           });
@@ -146,6 +177,13 @@ export const schema: FormSchema = {
     label: i18n.translate('xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTagsLabel', {
       defaultMessage: 'Tags',
     }),
+    helpText: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTagsHelpText',
+      {
+        defaultMessage:
+          'Type one or more custom identifying tags for this rule. Press enter after each tag to begin a new one.',
+      }
+    ),
     labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
   },
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/translations.ts
index 017d4fe6fdf49e..052986480e9abf 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/translations.ts
@@ -54,3 +54,10 @@ export const CUSTOM_MITRE_ATTACK_TECHNIQUES_REQUIRED = i18n.translate(
     defaultMessage: 'At least one Technique is required with a Tactic.',
   }
 );
+
+export const URL_FORMAT_INVALID = i18n.translate(
+  'xpack.siem.detectionEngine.createRule.stepDefineRule.referencesUrlInvalidError',
+  {
+    defaultMessage: 'Url is invalid format',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
index cc4e959cc9c78b..ecd2ce442238fa 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
@@ -4,8 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
-import { isEqual, get } from 'lodash/fp';
+import {
+  EuiButtonEmpty,
+  EuiHorizontalRule,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButton,
+} from '@elastic/eui';
+import { isEmpty, isEqual, get } from 'lodash/fp';
 import React, { memo, useCallback, useState, useEffect } from 'react';
 
 import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/public';
@@ -18,7 +24,7 @@ import { StepRuleDescription } from '../description_step';
 import { QueryBarDefineRule } from '../query_bar';
 import { Field, Form, FormDataProvider, getUseField, UseField, useForm } from '../shared_imports';
 import { schema } from './schema';
-import * as I18n from './translations';
+import * as i18n from './translations';
 
 const CommonUseField = getUseField({ component: Field });
 
@@ -34,7 +40,6 @@ const stepDefineDefaultValue = {
     filters: [],
     saved_id: null,
   },
-  useIndicesConfig: 'true',
 };
 
 const getStepDefaultValue = (
@@ -45,7 +50,6 @@ const getStepDefaultValue = (
     return {
       ...defaultValues,
       isNew: false,
-      useIndicesConfig: `${isEqual(defaultValues.index, indicesConfig)}`,
     };
   } else {
     return {
@@ -66,13 +70,22 @@ export const StepDefineRule = memo<StepDefineRuleProps>(
     setForm,
     setStepData,
   }) => {
-    const [localUseIndicesConfig, setLocalUseIndicesConfig] = useState('');
+    const [openTimelineSearch, setOpenTimelineSearch] = useState(false);
+    const [localUseIndicesConfig, setLocalUseIndicesConfig] = useState(false);
     const [indicesConfig] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
+    const [mylocalIndicesConfig, setMyLocalIndicesConfig] = useState(
+      defaultValues != null ? defaultValues.index : indicesConfig ?? []
+    );
     const [
-      { indexPatterns: indexPatternQueryBar, isLoading: indexPatternLoadingQueryBar },
-      setIndices,
-    ] = useFetchIndexPatterns(defaultValues != null ? defaultValues.index : indicesConfig ?? []);
-    const [myStepData, setMyStepData] = useState<DefineStepRule>(stepDefineDefaultValue);
+      {
+        browserFields,
+        indexPatterns: indexPatternQueryBar,
+        isLoading: indexPatternLoadingQueryBar,
+      },
+    ] = useFetchIndexPatterns(mylocalIndicesConfig);
+    const [myStepData, setMyStepData] = useState<DefineStepRule>(
+      getStepDefaultValue(indicesConfig, null)
+    );
 
     const { form } = useForm({
       defaultValue: myStepData,
@@ -96,7 +109,7 @@ export const StepDefineRule = memo<StepDefineRuleProps>(
         const myDefaultValues = getStepDefaultValue(indicesConfig, defaultValues);
         if (!isEqual(myDefaultValues, myStepData)) {
           setMyStepData(myDefaultValues);
-          setLocalUseIndicesConfig(myDefaultValues.useIndicesConfig);
+          setLocalUseIndicesConfig(isEqual(myDefaultValues.index, indicesConfig));
           if (!isReadOnlyView) {
             Object.keys(schema).forEach(key => {
               const val = get(key, myDefaultValues);
@@ -115,6 +128,19 @@ export const StepDefineRule = memo<StepDefineRuleProps>(
       }
     }, [form]);
 
+    const handleResetIndices = useCallback(() => {
+      const indexField = form.getFields().index;
+      indexField.setValue(indicesConfig);
+    }, [form, indicesConfig]);
+
+    const handleOpenTimelineSearch = useCallback(() => {
+      setOpenTimelineSearch(true);
+    }, []);
+
+    const handleCloseTimelineSearch = useCallback(() => {
+      setOpenTimelineSearch(false);
+    }, []);
+
     return isReadOnlyView && myStepData != null ? (
       <StepRuleDescription
         direction={descriptionDirection}
@@ -125,74 +151,63 @@ export const StepDefineRule = memo<StepDefineRuleProps>(
     ) : (
       <>
         <Form form={form} data-test-subj="stepDefineRule">
-          <CommonUseField
-            path="useIndicesConfig"
-            componentProps={{
-              idAria: 'detectionEngineStepDefineRuleUseIndicesConfig',
-              'data-test-subj': 'detectionEngineStepDefineRuleUseIndicesConfig',
-              euiFieldProps: {
-                disabled: isLoading,
-                options: [
-                  {
-                    id: 'true',
-                    label: I18n.CONFIG_INDICES,
-                  },
-                  {
-                    id: 'false',
-                    label: I18n.CUSTOM_INDICES,
-                  },
-                ],
-              },
-            }}
-          />
           <CommonUseField
             path="index"
+            config={{
+              ...schema.index,
+              labelAppend: !localUseIndicesConfig ? (
+                <EuiButtonEmpty size="xs" onClick={handleResetIndices}>
+                  <small>{i18n.RESET_DEFAULT_INDEX}</small>
+                </EuiButtonEmpty>
+              ) : null,
+            }}
             componentProps={{
               idAria: 'detectionEngineStepDefineRuleIndices',
               'data-test-subj': 'detectionEngineStepDefineRuleIndices',
               euiFieldProps: {
-                compressed: true,
                 fullWidth: true,
                 isDisabled: isLoading,
+                placeholder: '',
               },
             }}
           />
           <UseField
             path="queryBar"
+            config={{
+              ...schema.queryBar,
+              labelAppend: (
+                <EuiButtonEmpty size="xs" onClick={handleOpenTimelineSearch}>
+                  <small>{i18n.IMPORT_TIMELINE_QUERY}</small>
+                </EuiButtonEmpty>
+              ),
+            }}
             component={QueryBarDefineRule}
             componentProps={{
-              compressed: true,
+              browserFields,
               loading: indexPatternLoadingQueryBar,
               idAria: 'detectionEngineStepDefineRuleQueryBar',
               indexPattern: indexPatternQueryBar,
               isDisabled: isLoading,
               isLoading: indexPatternLoadingQueryBar,
               dataTestSubj: 'detectionEngineStepDefineRuleQueryBar',
+              openTimelineSearch,
+              onCloseTimelineSearch: handleCloseTimelineSearch,
               resizeParentContainer,
             }}
           />
-          <FormDataProvider pathsToWatch="useIndicesConfig">
-            {({ useIndicesConfig }) => {
-              if (localUseIndicesConfig !== useIndicesConfig) {
-                const indexField = form.getFields().index;
-                if (
-                  indexField != null &&
-                  useIndicesConfig === 'true' &&
-                  !isEqual(indexField.value, indicesConfig)
-                ) {
-                  indexField.setValue(indicesConfig);
-                  setIndices(indicesConfig);
-                } else if (
-                  indexField != null &&
-                  useIndicesConfig === 'false' &&
-                  isEqual(indexField.value, indicesConfig)
-                ) {
-                  indexField.setValue([]);
-                  setIndices([]);
+          <FormDataProvider pathsToWatch="index">
+            {({ index }) => {
+              if (index != null) {
+                if (isEqual(index, indicesConfig) && !localUseIndicesConfig) {
+                  setLocalUseIndicesConfig(true);
+                }
+                if (!isEqual(index, indicesConfig) && localUseIndicesConfig) {
+                  setLocalUseIndicesConfig(false);
+                }
+                if (index != null && !isEmpty(index) && !isEqual(index, mylocalIndicesConfig)) {
+                  setMyLocalIndicesConfig(index);
                 }
-                setLocalUseIndicesConfig(useIndicesConfig);
               }
-
               return null;
             }}
           </FormDataProvider>
@@ -208,7 +223,7 @@ export const StepDefineRule = memo<StepDefineRuleProps>(
             >
               <EuiFlexItem grow={false}>
                 <EuiButton fill onClick={onSubmit} isDisabled={isLoading}>
-                  {myStepData.isNew ? RuleI18n.CONTINUE : RuleI18n.UPDATE}
+                  {RuleI18n.CONTINUE}
                 </EuiButton>
               </EuiFlexItem>
             </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
index 9b54ada8227c61..dbd7e3b3f96aab 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
@@ -10,7 +10,6 @@ import { isEmpty } from 'lodash/fp';
 import React from 'react';
 
 import { esKuery } from '../../../../../../../../../../src/plugins/data/public';
-import * as RuleI18n from '../../translations';
 import { FieldValueQueryBar } from '../query_bar';
 import {
   ERROR_CODE,
@@ -19,33 +18,27 @@ import {
   FormSchema,
   ValidationFunc,
 } from '../shared_imports';
-import { CUSTOM_QUERY_REQUIRED, INVALID_CUSTOM_QUERY } from './translations';
+import { CUSTOM_QUERY_REQUIRED, INVALID_CUSTOM_QUERY, INDEX_HELPER_TEXT } from './translations';
 
 const { emptyField } = fieldValidators;
 
 export const schema: FormSchema = {
-  useIndicesConfig: {
-    type: FIELD_TYPES.RADIO_GROUP,
+  index: {
+    type: FIELD_TYPES.COMBO_BOX,
     label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepDefineRule.fieldIndicesTypeLabel',
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fiedIndexPatternsLabel',
       {
-        defaultMessage: 'Indices type',
+        defaultMessage: 'Index patterns',
       }
     ),
-  },
-  index: {
-    type: FIELD_TYPES.COMBO_BOX,
-    label: i18n.translate('xpack.siem.detectionEngine.createRule.stepAboutRule.fiedIndicesLabel', {
-      defaultMessage: 'Indices',
-    }),
-    labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
+    helpText: <EuiText size="xs">{INDEX_HELPER_TEXT}</EuiText>,
     validations: [
       {
         validator: emptyField(
           i18n.translate(
             'xpack.siem.detectionEngine.createRule.stepDefineRule.outputIndiceNameFieldRequiredError',
             {
-              defaultMessage: 'An output indice name for signals is required.',
+              defaultMessage: 'Index patterns for signals is required.',
             }
           )
         ),
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx
index 0050c59a4a2c8b..8394f090e346cd 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx
@@ -33,3 +33,25 @@ export const CUSTOM_INDICES = i18n.translate(
     defaultMessage: 'Provide custom list of indices',
   }
 );
+
+export const INDEX_HELPER_TEXT = i18n.translate(
+  'xpack.siem.detectionEngine.createRule.stepDefineRule.indicesHelperDescription',
+  {
+    defaultMessage:
+      'Enter the pattern of Elasticsearch indices where you would like this rule to run. By default, these will include index patterns defined in SIEM advanced settings.',
+  }
+);
+
+export const RESET_DEFAULT_INDEX = i18n.translate(
+  'xpack.siem.detectionEngine.createRule.stepDefineRule.resetDefaultIndicesButton',
+  {
+    defaultMessage: 'Reset to default index patterns',
+  }
+);
+
+export const IMPORT_TIMELINE_QUERY = i18n.translate(
+  'xpack.siem.detectionEngine.createRule.stepDefineRule.importTimelineQueryButton',
+  {
+    defaultMessage: 'Import query from saved timeline',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx
index 6f7e49bc8ab9a9..35b8ca6650bf6d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx
@@ -92,7 +92,6 @@ export const StepScheduleRule = memo<StepScheduleRuleProps>(
             path="interval"
             component={ScheduleItem}
             componentProps={{
-              compressed: true,
               idAria: 'detectionEngineStepScheduleRuleInterval',
               isDisabled: isLoading,
               dataTestSubj: 'detectionEngineStepScheduleRuleInterval',
@@ -102,7 +101,6 @@ export const StepScheduleRule = memo<StepScheduleRuleProps>(
             path="from"
             component={ScheduleItem}
             componentProps={{
-              compressed: true,
               idAria: 'detectionEngineStepScheduleRuleFrom',
               isDisabled: isLoading,
               dataTestSubj: 'detectionEngineStepScheduleRuleFrom',
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
index a25ccce569dd43..12bbdbdfff3e92 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
@@ -40,14 +40,14 @@ const getTimeTypeValue = (time: string): { unit: string; value: number } => {
 };
 
 const formatDefineStepData = (defineStepData: DefineStepRule): DefineStepRuleJson => {
-  const { queryBar, useIndicesConfig, isNew, ...rest } = defineStepData;
+  const { queryBar, isNew, ...rest } = defineStepData;
   const { filters, query, saved_id: savedId } = queryBar;
   return {
     ...rest,
     language: query.language,
     filters,
     query: query.query as string,
-    ...(savedId != null ? { saved_id: savedId } : {}),
+    ...(savedId != null && savedId !== '' ? { saved_id: savedId } : {}),
   };
 };
 
@@ -72,11 +72,21 @@ const formatScheduleStepData = (scheduleData: ScheduleStepRule): ScheduleStepRul
 };
 
 const formatAboutStepData = (aboutStepData: AboutStepRule): AboutStepRuleJson => {
-  const { falsePositives, references, riskScore, threats, isNew, ...rest } = aboutStepData;
+  const {
+    falsePositives,
+    references,
+    riskScore,
+    threats,
+    timeline,
+    isNew,
+    ...rest
+  } = aboutStepData;
   return {
     false_positives: falsePositives.filter(item => !isEmpty(item)),
     references: references.filter(item => !isEmpty(item)),
     risk_score: riskScore,
+    timeline_id: timeline.id,
+    timeline_title: timeline.title,
     threats: threats
       .filter(threat => threat.tactic.name !== 'none')
       .map(threat => ({
@@ -97,7 +107,7 @@ export const formatRule = (
   scheduleData: ScheduleStepRule,
   ruleId?: string
 ): NewRule => {
-  const type: FormatRuleType = defineStepData.queryBar.saved_id != null ? 'saved_query' : 'query';
+  const type: FormatRuleType = !isEmpty(defineStepData.queryBar.saved_id) ? 'saved_query' : 'query';
   const persistData = {
     type,
     ...formatDefineStepData(defineStepData),
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx
index 3e8dbeba895461..848b17aadbff4d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx
@@ -12,12 +12,13 @@ import styled from 'styled-components';
 import { HeaderPage } from '../../../../components/header_page';
 import { DETECTION_ENGINE_PAGE_NAME } from '../../../../components/link_to/redirect_to_detection_engine';
 import { WrapperPage } from '../../../../components/wrapper_page';
+import { usePersistRule } from '../../../../containers/detection_engine/rules';
+import { SpyRoute } from '../../../../utils/route/spy_routes';
 import { AccordionTitle } from '../components/accordion_title';
+import { FormData, FormHook } from '../components/shared_imports';
 import { StepAboutRule } from '../components/step_about_rule';
 import { StepDefineRule } from '../components/step_define_rule';
 import { StepScheduleRule } from '../components/step_schedule_rule';
-import { usePersistRule } from '../../../../containers/detection_engine/rules';
-import { SpyRoute } from '../../../../utils/route/spy_routes';
 import * as RuleI18n from '../translations';
 import { AboutStepRule, DefineStepRule, RuleStep, RuleStepData, ScheduleStepRule } from '../types';
 import { formatRule } from './helpers';
@@ -28,17 +29,43 @@ const stepsRuleOrder = [RuleStep.defineRule, RuleStep.aboutRule, RuleStep.schedu
 const ResizeEuiPanel = styled(EuiPanel)<{
   height?: number;
 }>`
+  .euiAccordion__iconWrapper {
+    display: none;
+  }
   .euiAccordion__childWrapper {
     height: ${props => (props.height !== -1 ? `${props.height}px !important` : 'auto')};
   }
+  .euiAccordion__button {
+    cursor: default !important;
+    &:hover {
+      text-decoration: none !important;
+    }
+  }
+`;
+
+const MyEuiPanel = styled(EuiPanel)`
+  .euiAccordion__iconWrapper {
+    display: none;
+  }
+  .euiAccordion__button {
+    cursor: default !important;
+    &:hover {
+      text-decoration: none !important;
+    }
+  }
 `;
 
 export const CreateRuleComponent = React.memo(() => {
   const [heightAccordion, setHeightAccordion] = useState(-1);
-  const [openAccordionId, setOpenAccordionId] = useState<RuleStep | null>(RuleStep.defineRule);
+  const [openAccordionId, setOpenAccordionId] = useState<RuleStep>(RuleStep.defineRule);
   const defineRuleRef = useRef<EuiAccordion | null>(null);
   const aboutRuleRef = useRef<EuiAccordion | null>(null);
   const scheduleRuleRef = useRef<EuiAccordion | null>(null);
+  const stepsForm = useRef<Record<RuleStep, FormHook<FormData> | null>>({
+    [RuleStep.defineRule]: null,
+    [RuleStep.aboutRule]: null,
+    [RuleStep.scheduleRule]: null,
+  });
   const stepsData = useRef<Record<RuleStep, RuleStepData>>({
     [RuleStep.defineRule]: { isValid: false, data: {} },
     [RuleStep.aboutRule]: { isValid: false, data: {} },
@@ -57,11 +84,17 @@ export const CreateRuleComponent = React.memo(() => {
       if (isValid) {
         const stepRuleIdx = stepsRuleOrder.findIndex(item => step === item);
         if ([0, 1].includes(stepRuleIdx)) {
-          setIsStepRuleInEditView({
-            ...isStepRuleInReadOnlyView,
-            [step]: true,
-          });
-          if (openAccordionId !== stepsRuleOrder[stepRuleIdx + 1]) {
+          if (isStepRuleInReadOnlyView[stepsRuleOrder[stepRuleIdx + 1]]) {
+            setIsStepRuleInEditView({
+              ...isStepRuleInReadOnlyView,
+              [step]: true,
+              [stepsRuleOrder[stepRuleIdx + 1]]: false,
+            });
+          } else if (openAccordionId !== stepsRuleOrder[stepRuleIdx + 1]) {
+            setIsStepRuleInEditView({
+              ...isStepRuleInReadOnlyView,
+              [step]: true,
+            });
             openCloseAccordion(stepsRuleOrder[stepRuleIdx + 1]);
             setOpenAccordionId(stepsRuleOrder[stepRuleIdx + 1]);
           }
@@ -80,9 +113,13 @@ export const CreateRuleComponent = React.memo(() => {
         }
       }
     },
-    [openAccordionId, stepsData.current, setRule]
+    [isStepRuleInReadOnlyView, openAccordionId, stepsData.current, setRule]
   );
 
+  const setStepsForm = useCallback((step: RuleStep, form: FormHook<FormData>) => {
+    stepsForm.current[step] = form;
+  }, []);
+
   const getAccordionType = useCallback(
     (accordionId: RuleStep) => {
       if (accordionId === openAccordionId) {
@@ -135,42 +172,38 @@ export const CreateRuleComponent = React.memo(() => {
     (id: RuleStep, isOpen: boolean) => {
       const activeRuleIdx = stepsRuleOrder.findIndex(step => step === openAccordionId);
       const stepRuleIdx = stepsRuleOrder.findIndex(step => step === id);
-      const isLatestStepsRuleValid =
-        stepRuleIdx === 0
-          ? true
-          : stepsRuleOrder
-              .filter((stepRule, index) => index < stepRuleIdx)
-              .every(stepRule => stepsData.current[stepRule].isValid);
 
-      if (stepRuleIdx < activeRuleIdx && !isOpen) {
+      if ((id === openAccordionId || stepRuleIdx < activeRuleIdx) && !isOpen) {
         openCloseAccordion(id);
       } else if (stepRuleIdx >= activeRuleIdx) {
         if (
-          openAccordionId != null &&
           openAccordionId !== id &&
           !stepsData.current[openAccordionId].isValid &&
           !isStepRuleInReadOnlyView[id] &&
           isOpen
         ) {
           openCloseAccordion(id);
-        } else if (!isLatestStepsRuleValid && isOpen) {
-          openCloseAccordion(id);
-        } else if (id !== openAccordionId && isOpen) {
-          setOpenAccordionId(id);
         }
       }
     },
-    [isStepRuleInReadOnlyView, openAccordionId]
+    [isStepRuleInReadOnlyView, openAccordionId, stepsData]
   );
 
   const manageIsEditable = useCallback(
-    (id: RuleStep) => {
-      setIsStepRuleInEditView({
-        ...isStepRuleInReadOnlyView,
-        [id]: false,
-      });
+    async (id: RuleStep) => {
+      const activeForm = await stepsForm.current[openAccordionId]?.submit();
+      if (activeForm != null && activeForm?.isValid) {
+        setOpenAccordionId(id);
+        openCloseAccordion(openAccordionId);
+
+        setIsStepRuleInEditView({
+          ...isStepRuleInReadOnlyView,
+          [openAccordionId]: openAccordionId === RuleStep.scheduleRule ? false : true,
+          [id]: false,
+        });
+      }
     },
-    [isStepRuleInReadOnlyView]
+    [isStepRuleInReadOnlyView, openAccordionId]
   );
 
   if (isSaved) {
@@ -201,7 +234,7 @@ export const CreateRuleComponent = React.memo(() => {
                   size="xs"
                   onClick={manageIsEditable.bind(null, RuleStep.defineRule)}
                 >
-                  {`Edit`}
+                  {i18n.EDIT_RULE}
                 </EuiButtonEmpty>
               )
             }
@@ -210,13 +243,14 @@ export const CreateRuleComponent = React.memo(() => {
             <StepDefineRule
               isReadOnlyView={isStepRuleInReadOnlyView[RuleStep.defineRule]}
               isLoading={isLoading}
+              setForm={setStepsForm}
               setStepData={setStepData}
               resizeParentContainer={height => setHeightAccordion(height)}
             />
           </EuiAccordion>
         </ResizeEuiPanel>
         <EuiSpacer size="s" />
-        <EuiPanel>
+        <MyEuiPanel>
           <EuiAccordion
             initialIsOpen={false}
             id={RuleStep.aboutRule}
@@ -231,7 +265,7 @@ export const CreateRuleComponent = React.memo(() => {
                   size="xs"
                   onClick={manageIsEditable.bind(null, RuleStep.aboutRule)}
                 >
-                  {`Edit`}
+                  {i18n.EDIT_RULE}
                 </EuiButtonEmpty>
               )
             }
@@ -240,12 +274,13 @@ export const CreateRuleComponent = React.memo(() => {
             <StepAboutRule
               isReadOnlyView={isStepRuleInReadOnlyView[RuleStep.aboutRule]}
               isLoading={isLoading}
+              setForm={setStepsForm}
               setStepData={setStepData}
             />
           </EuiAccordion>
-        </EuiPanel>
+        </MyEuiPanel>
         <EuiSpacer size="s" />
-        <EuiPanel>
+        <MyEuiPanel>
           <EuiAccordion
             initialIsOpen={false}
             id={RuleStep.scheduleRule}
@@ -260,7 +295,7 @@ export const CreateRuleComponent = React.memo(() => {
                   size="xs"
                   onClick={manageIsEditable.bind(null, RuleStep.scheduleRule)}
                 >
-                  {`Edit`}
+                  {i18n.EDIT_RULE}
                 </EuiButtonEmpty>
               )
             }
@@ -269,10 +304,11 @@ export const CreateRuleComponent = React.memo(() => {
             <StepScheduleRule
               isReadOnlyView={isStepRuleInReadOnlyView[RuleStep.scheduleRule]}
               isLoading={isLoading}
+              setForm={setStepsForm}
               setStepData={setStepData}
             />
           </EuiAccordion>
-        </EuiPanel>
+        </MyEuiPanel>
       </WrapperPage>
 
       <SpyRoute />
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/translations.ts
index 884f3f3741228a..329bcc286fb70c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/translations.ts
@@ -9,3 +9,7 @@ import { i18n } from '@kbn/i18n';
 export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.createRule.pageTitle', {
   defaultMessage: 'Create new rule',
 });
+
+export const EDIT_RULE = i18n.translate('xpack.siem.detectionEngine.createRule.editRuleButton', {
+  defaultMessage: 'Edit',
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx
index 1bc2bc24517e3c..4d887c7cb5b6ec 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx
@@ -113,7 +113,10 @@ export const RuleDetailsComponent = memo<RuleDetailsComponentProps>(({ signalsIn
 
                   <WrapperPage>
                     <HeaderPage
-                      backOptions={{ href: '#detection-engine/rules', text: i18n.BACK_TO_RULES }}
+                      backOptions={{
+                        href: `#${DETECTION_ENGINE_PAGE_NAME}/rules`,
+                        text: i18n.BACK_TO_RULES,
+                      }}
                       badgeOptions={{ text: i18n.EXPERIMENTAL }}
                       border
                       subtitle={subTitle}
@@ -142,7 +145,7 @@ export const RuleDetailsComponent = memo<RuleDetailsComponentProps>(({ signalsIn
                           <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
                             <EuiFlexItem grow={false}>
                               <EuiButton
-                                href={`#${DETECTION_ENGINE_PAGE_NAME}/rules/${ruleId}/edit`}
+                                href={`#${DETECTION_ENGINE_PAGE_NAME}/rules/id/${ruleId}/edit`}
                                 iconType="visControls"
                                 isDisabled={rule?.immutable ?? true}
                               >
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx
index 8e32f82dff0b1c..10b7f0e832f192 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx
@@ -49,6 +49,7 @@ interface ScheduleStepRuleForm extends StepRuleForm {
 export const EditRuleComponent = memo(() => {
   const { ruleId } = useParams();
   const [loading, rule] = useRule(ruleId);
+
   const [initForm, setInitForm] = useState(false);
   const [myAboutRuleForm, setMyAboutRuleForm] = useState<AboutStepRuleForm>({
     data: null,
@@ -249,7 +250,7 @@ export const EditRuleComponent = memo(() => {
   }, []);
 
   if (isSaved || (rule != null && rule.immutable)) {
-    return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules/${ruleId}`} />;
+    return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules/id/${ruleId}`} />;
   }
 
   return (
@@ -257,7 +258,7 @@ export const EditRuleComponent = memo(() => {
       <WrapperPage restrictWidth>
         <HeaderPage
           backOptions={{
-            href: `#/${DETECTION_ENGINE_PAGE_NAME}/rules/${ruleId}`,
+            href: `#/${DETECTION_ENGINE_PAGE_NAME}/rules/id/${ruleId}`,
             text: `${i18n.BACK_TO} ${rule?.name ?? ''}`,
           }}
           isLoading={isLoading}
@@ -303,7 +304,7 @@ export const EditRuleComponent = memo(() => {
           responsive={false}
         >
           <EuiFlexItem grow={false}>
-            <EuiButton iconType="cross" href={`#/${DETECTION_ENGINE_PAGE_NAME}/rules/${ruleId}`}>
+            <EuiButton iconType="cross" href={`#/${DETECTION_ENGINE_PAGE_NAME}/rules/id/${ruleId}`}>
               {i18n.CANCEL}
             </EuiButton>
           </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
index 46301ae808919d..47b5c1051bcfca 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
@@ -33,7 +33,6 @@ export const getStepsData = ({
             filters: rule.filters as esFilters.Filter[],
             saved_id: rule.saved_id ?? null,
           },
-          useIndicesConfig: 'true',
         }
       : null;
   const aboutRuleData: AboutStepRule | null =
@@ -45,6 +44,10 @@ export const getStepsData = ({
           threats: rule.threats as IMitreEnterpriseAttack[],
           falsePositives: rule.false_positives,
           riskScore: rule.risk_score,
+          timeline: {
+            id: rule.timeline_id ?? null,
+            title: rule.timeline_title ?? null,
+          },
         }
       : null;
   const scheduleRuleData: ScheduleStepRule | null =
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
index 8b4cc2a213589b..ef67f0a7d22c66 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
@@ -8,6 +8,7 @@ import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import React, { useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 
+import { DETECTION_ENGINE_PAGE_NAME } from '../../../components/link_to/redirect_to_detection_engine';
 import { FormattedRelativePreferenceDate } from '../../../components/formatted_date';
 import { getEmptyTagValue } from '../../../components/empty_value';
 import { HeaderPage } from '../../../components/header_page';
@@ -32,7 +33,10 @@ export const RulesComponent = React.memo(() => {
       />
       <WrapperPage>
         <HeaderPage
-          backOptions={{ href: '#detection-engine', text: i18n.BACK_TO_DETECTION_ENGINE }}
+          backOptions={{
+            href: `#${DETECTION_ENGINE_PAGE_NAME}`,
+            text: i18n.BACK_TO_DETECTION_ENGINE,
+          }}
           subtitle={
             lastCompletedRun ? (
               <FormattedMessage
@@ -61,7 +65,11 @@ export const RulesComponent = React.memo(() => {
             </EuiFlexItem>
 
             <EuiFlexItem grow={false}>
-              <EuiButton fill href="#/detection-engine/rules/create" iconType="plusInCircle">
+              <EuiButton
+                fill
+                href={`#${DETECTION_ENGINE_PAGE_NAME}/rules/create`}
+                iconType="plusInCircle"
+              >
                 {i18n.ADD_NEW_RULE}
               </EuiButton>
             </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
index 9b535034810bd5..ec4206623bad90 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
@@ -8,6 +8,7 @@ import { esFilters } from '../../../../../../../../src/plugins/data/common';
 import { Rule } from '../../../containers/detection_engine/rules';
 import { FieldValueQueryBar } from './components/query_bar';
 import { FormData, FormHook } from './components/shared_imports';
+import { FieldValueTimeline } from './components/pick_timeline';
 
 export interface EuiBasicTableSortTypes {
   field: string;
@@ -76,11 +77,11 @@ export interface AboutStepRule extends StepRuleData {
   references: string[];
   falsePositives: string[];
   tags: string[];
+  timeline: FieldValueTimeline;
   threats: IMitreEnterpriseAttack[];
 }
 
 export interface DefineStepRule extends StepRuleData {
-  useIndicesConfig: string;
   index: string[];
   queryBar: FieldValueQueryBar;
 }
@@ -108,6 +109,8 @@ export interface AboutStepRuleJson {
   references: string[];
   false_positives: string[];
   tags: string[];
+  timeline_id: string | null;
+  timeline_title: string | null;
   threats: IMitreEnterpriseAttack[];
 }
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index edf196b96f5d02..f6ac0435cd7c1b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -52,6 +52,7 @@ export const fullRuleAlertParamsRest = (): RuleAlertParamsRest => ({
   created_at: '2019-12-13T16:40:33.400Z',
   updated_at: '2019-12-13T16:40:33.400Z',
   timeline_id: 'timeline-id',
+  timeline_title: 'timeline-title',
 });
 
 export const typicalPayload = (): Partial<RuleAlertParamsRest> => ({
@@ -271,6 +272,7 @@ export const getResult = (): RuleAlertType => ({
     outputIndex: '.siem-signals',
     savedId: 'some-id',
     timelineId: 'some-timeline-id',
+    timelineTitle: 'some-timeline-title',
     meta: { someMeta: 'someField' },
     filters: [
       {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/signals_mapping.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/signals_mapping.json
index afe9bac9d87fec..79fb136afd52ae 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/signals_mapping.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/signals_mapping.json
@@ -36,6 +36,9 @@
               "timeline_id": {
                 "type": "keyword"
               },
+              "timeline_title": {
+                "type": "keyword"
+              },
               "max_signals": {
                 "type": "keyword"
               },
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
index 256b341fca656a..3d9719a7b248b2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -74,6 +74,7 @@ export const createCreateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRou
             updated_at: updatedAt,
             references,
             timeline_id: timelineId,
+            timeline_title: timelineTitle,
             version,
           } = payloadRule;
           const ruleIdOrUuid = ruleId ?? uuid.v4();
@@ -112,6 +113,7 @@ export const createCreateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRou
               outputIndex: finalIndex,
               savedId,
               timelineId,
+              timelineTitle,
               meta,
               filters,
               ruleId: ruleIdOrUuid,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
index 476d5b8a49ba2d..cf8fb2a28288f0 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
@@ -44,6 +44,7 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
         output_index: outputIndex,
         saved_id: savedId,
         timeline_id: timelineId,
+        timeline_title: timelineTitle,
         meta,
         filters,
         rule_id: ruleId,
@@ -101,6 +102,7 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
           outputIndex: finalIndex,
           savedId,
           timelineId,
+          timelineTitle,
           meta,
           filters,
           ruleId: ruleId != null ? ruleId : uuid.v4(),
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
index b30b6c791522b0..180a75bdaaeead 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
@@ -50,6 +50,7 @@ export const createUpdateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRou
             output_index: outputIndex,
             saved_id: savedId,
             timeline_id: timelineId,
+            timeline_title: timelineTitle,
             meta,
             filters,
             rule_id: ruleId,
@@ -82,6 +83,7 @@ export const createUpdateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRou
               outputIndex,
               savedId,
               timelineId,
+              timelineTitle,
               meta,
               filters,
               id,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
index ec3d9514fa5db8..6db8a8902915aa 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
@@ -38,6 +38,7 @@ export const createUpdateRulesRoute: Hapi.ServerRoute = {
       output_index: outputIndex,
       saved_id: savedId,
       timeline_id: timelineId,
+      timeline_title: timelineTitle,
       meta,
       filters,
       rule_id: ruleId,
@@ -77,6 +78,7 @@ export const createUpdateRulesRoute: Hapi.ServerRoute = {
         outputIndex,
         savedId,
         timelineId,
+        timelineTitle,
         meta,
         filters,
         id,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts
index b1f61d11458fe3..44d47ad435682c 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts
@@ -79,6 +79,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         to: 'now',
         type: 'query',
         version: 1,
@@ -141,6 +142,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         to: 'now',
         type: 'query',
         version: 1,
@@ -205,6 +207,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         to: 'now',
         type: 'query',
         version: 1,
@@ -269,6 +272,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         to: 'now',
         type: 'query',
         version: 1,
@@ -331,6 +335,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         to: 'now',
         type: 'query',
         version: 1,
@@ -396,6 +401,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         to: 'now',
         type: 'query',
         version: 1,
@@ -461,6 +467,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         to: 'now',
         type: 'query',
         version: 1,
@@ -526,6 +533,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         to: 'now',
         type: 'query',
         version: 1,
@@ -642,6 +650,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         version: 1,
       };
       expect(output).toEqual({
@@ -714,6 +723,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         version: 1,
       };
       expect(output).toEqual(expected);
@@ -875,6 +885,7 @@ describe('utils', () => {
         },
         saved_id: 'some-id',
         timeline_id: 'some-timeline-id',
+        timeline_title: 'some-timeline-title',
         version: 1,
       };
       expect(output).toEqual(expected);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
index b9bf3f8a942fcb..714035a4234132 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
@@ -85,6 +85,7 @@ export const transformAlertToRule = (alert: RuleAlertType): Partial<OutputRuleAl
     references: alert.params.references,
     saved_id: alert.params.savedId,
     timeline_id: alert.params.timelineId,
+    timeline_title: alert.params.timelineTitle,
     meta: alert.params.meta,
     severity: alert.params.severity,
     updated_by: alert.updatedBy,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
index 04a72135d3f003..74eb4d6c8e918a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
@@ -1076,9 +1076,7 @@ describe('add prepackaged rules schema', () => {
 
   test('You can omit the query string when filters are present', () => {
     expect(
-      addPrepackagedRulesSchema.validate<
-        Partial<Omit<RuleAlertParamsRest, 'meta'> & { meta: string }>
-      >({
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
         rule_id: 'rule-1',
         risk_score: 50,
         description: 'some description',
@@ -1099,7 +1097,7 @@ describe('add prepackaged rules schema', () => {
     ).toBeFalsy();
   });
 
-  test('validates with timeline_id', () => {
+  test('validates with timeline_id and timeline_title', () => {
     expect(
       addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
         rule_id: 'rule-1',
@@ -1117,7 +1115,131 @@ describe('add prepackaged rules schema', () => {
         language: 'kuery',
         version: 1,
         timeline_id: 'timeline-id',
+        timeline_title: 'timeline-title',
       }).error
     ).toBeFalsy();
   });
+
+  test('You cannot omit timeline_title when timeline_id is present', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        language: 'kuery',
+        filters: [],
+        max_signals: 1,
+        version: 1,
+        timeline_id: 'timeline-id',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have a null value for timeline_title when timeline_id is present', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        language: 'kuery',
+        filters: [],
+        max_signals: 1,
+        version: 1,
+        timeline_id: 'timeline-id',
+        timeline_title: null,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have empty string for timeline_title when timeline_id is present', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        language: 'kuery',
+        filters: [],
+        max_signals: 1,
+        version: 1,
+        timeline_id: 'timeline-id',
+        timeline_title: '',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have timeline_title with an empty timeline_id', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        language: 'kuery',
+        filters: [],
+        max_signals: 1,
+        version: 1,
+        timeline_id: '',
+        timeline_title: 'some-title',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have timeline_title without timeline_id', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        language: 'kuery',
+        filters: [],
+        max_signals: 1,
+        version: 1,
+        timeline_title: 'some-title',
+      }).error
+    ).toBeTruthy();
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.ts
index c993b05cb5f299..49907b4a975e6d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.ts
@@ -21,6 +21,7 @@ import {
   language,
   saved_id,
   timeline_id,
+  timeline_title,
   meta,
   risk_score,
   max_signals,
@@ -63,6 +64,7 @@ export const addPrepackagedRulesSchema = Joi.object({
     otherwise: Joi.forbidden(),
   }),
   timeline_id,
+  timeline_title,
   meta,
   risk_score: risk_score.required(),
   max_signals: max_signals.default(DEFAULT_MAX_SIGNALS),
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
index 8dc00b66e97a3e..87916bea606493 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
@@ -1024,7 +1024,7 @@ describe('create rules schema', () => {
 
   test('You can omit the query string when filters are present', () => {
     expect(
-      createRulesSchema.validate<Partial<Omit<RuleAlertParamsRest, 'meta'> & { meta: string }>>({
+      createRulesSchema.validate<Partial<RuleAlertParamsRest>>({
         rule_id: 'rule-1',
         output_index: '.siem-signals',
         risk_score: 50,
@@ -1045,7 +1045,7 @@ describe('create rules schema', () => {
     ).toBeFalsy();
   });
 
-  test('timeline_id validates', () => {
+  test('validates with timeline_id and timeline_title', () => {
     expect(
       createRulesSchema.validate<Partial<RuleAlertParamsRest>>({
         rule_id: 'rule-1',
@@ -1062,8 +1062,122 @@ describe('create rules schema', () => {
         references: ['index-1'],
         query: 'some query',
         language: 'kuery',
-        timeline_id: 'some_id',
+        timeline_id: 'timeline-id',
+        timeline_title: 'timeline-title',
       }).error
     ).toBeFalsy();
   });
+
+  test('You cannot omit timeline_title when timeline_id is present', () => {
+    expect(
+      createRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        output_index: '.siem-signals',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        timeline_id: 'some_id',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have a null value for timeline_title when timeline_id is present', () => {
+    expect(
+      createRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        output_index: '.siem-signals',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        timeline_id: 'some_id',
+        timeline_title: null,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have empty string for timeline_title when timeline_id is present', () => {
+    expect(
+      createRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        output_index: '.siem-signals',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        timeline_id: 'some_id',
+        timeline_title: '',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have timeline_title with an empty timeline_id', () => {
+    expect(
+      createRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        output_index: '.siem-signals',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        timeline_id: '',
+        timeline_title: 'some-title',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have timeline_title without timeline_id', () => {
+    expect(
+      createRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        output_index: '.siem-signals',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        timeline_title: 'some-title',
+      }).error
+    ).toBeTruthy();
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.ts
index 614451312d04da..df5c1694d6c782 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.ts
@@ -22,6 +22,7 @@ import {
   output_index,
   saved_id,
   timeline_id,
+  timeline_title,
   meta,
   risk_score,
   max_signals,
@@ -57,6 +58,7 @@ export const createRulesSchema = Joi.object({
     otherwise: Joi.forbidden(),
   }),
   timeline_id,
+  timeline_title,
   meta,
   risk_score: risk_score.required(),
   max_signals: max_signals.default(DEFAULT_MAX_SIGNALS),
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/schemas.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/schemas.ts
index 68d3166c74d6da..c8331bb7820dd1 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/schemas.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/schemas.ts
@@ -24,6 +24,11 @@ export const language = Joi.string().valid('kuery', 'lucene');
 export const output_index = Joi.string();
 export const saved_id = Joi.string();
 export const timeline_id = Joi.string();
+export const timeline_title = Joi.string().when('timeline_id', {
+  is: Joi.exist(),
+  then: Joi.required(),
+  otherwise: Joi.forbidden(),
+});
 export const meta = Joi.object();
 export const max_signals = Joi.number().greater(0);
 export const name = Joi.string();
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
index 1f00e0a13866a4..f713840ab43f93 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
@@ -867,7 +867,7 @@ describe('update rules schema', () => {
     ).toBeTruthy();
   });
 
-  test('timeline_id validates', () => {
+  test('validates with timeline_id and timeline_title', () => {
     expect(
       updateRulesSchema.validate<Partial<UpdateRuleAlertParamsRest>>({
         id: 'rule-1',
@@ -881,7 +881,101 @@ describe('update rules schema', () => {
         type: 'saved_query',
         saved_id: 'some id',
         timeline_id: 'some-id',
+        timeline_title: 'some-title',
       }).error
     ).toBeFalsy();
   });
+
+  test('You cannot omit timeline_title when timeline_id is present', () => {
+    expect(
+      updateRulesSchema.validate<Partial<UpdateRuleAlertParamsRest>>({
+        id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'saved_query',
+        saved_id: 'some id',
+        timeline_id: 'some-id',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have a null value for timeline_title when timeline_id is present', () => {
+    expect(
+      updateRulesSchema.validate<Partial<UpdateRuleAlertParamsRest>>({
+        id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'saved_query',
+        saved_id: 'some id',
+        timeline_id: 'timeline-id',
+        timeline_title: null,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have empty string for timeline_title when timeline_id is present', () => {
+    expect(
+      updateRulesSchema.validate<Partial<UpdateRuleAlertParamsRest>>({
+        id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'saved_query',
+        saved_id: 'some id',
+        timeline_id: 'some-id',
+        timeline_title: '',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have timeline_title with an empty timeline_id', () => {
+    expect(
+      updateRulesSchema.validate<Partial<UpdateRuleAlertParamsRest>>({
+        id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'saved_query',
+        saved_id: 'some id',
+        timeline_id: '',
+        timeline_title: 'some-title',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot have timeline_title without timeline_id', () => {
+    expect(
+      updateRulesSchema.validate<Partial<UpdateRuleAlertParamsRest>>({
+        id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'saved_query',
+        saved_id: 'some id',
+        timeline_title: 'some-title',
+      }).error
+    ).toBeTruthy();
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.ts
index afd8a5fce48331..9c3188738faea7 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.ts
@@ -22,6 +22,7 @@ import {
   output_index,
   saved_id,
   timeline_id,
+  timeline_title,
   meta,
   risk_score,
   max_signals,
@@ -53,6 +54,7 @@ export const updateRulesSchema = Joi.object({
   output_index,
   saved_id,
   timeline_id,
+  timeline_title,
   meta,
   risk_score,
   max_signals,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
index 07cf0b0c716cc0..d2f76907d7aa3e 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
@@ -19,6 +19,7 @@ export const createRules = async ({
   language,
   savedId,
   timelineId,
+  timelineTitle,
   meta,
   filters,
   ruleId,
@@ -56,6 +57,7 @@ export const createRules = async ({
         outputIndex,
         savedId,
         timelineId,
+        timelineTitle,
         meta,
         filters,
         maxSignals,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/install_prepacked_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/install_prepacked_rules.ts
index 9acfbf8c43221c..9c3be64f71a0dc 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/install_prepacked_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/install_prepacked_rules.ts
@@ -26,6 +26,7 @@ export const installPrepackagedRules = async (
       language,
       saved_id: savedId,
       timeline_id: timelineId,
+      timeline_title: timelineTitle,
       meta,
       filters,
       rule_id: ruleId,
@@ -55,6 +56,7 @@ export const installPrepackagedRules = async (
       outputIndex,
       savedId,
       timelineId,
+      timelineTitle,
       meta,
       filters,
       ruleId,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
index c9dac82b6eb8f7..0fe4b15437af85 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
@@ -74,6 +74,7 @@ export const updateRules = async ({
   outputIndex,
   savedId,
   timelineId,
+  timelineTitle,
   meta,
   filters,
   from,
@@ -118,6 +119,7 @@ export const updateRules = async ({
       outputIndex,
       savedId,
       timelineId,
+      timelineTitle,
       meta,
       filters,
       index,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_timelineid.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_timelineid.json
index 2f995029447ffe..eb87a14e0c6885 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_timelineid.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_timelineid.json
@@ -7,5 +7,6 @@
   "from": "now-6m",
   "to": "now",
   "query": "user.name: root or user.name: admin",
-  "timeline_id": "timeline-id"
+  "timeline_id": "timeline-id",
+  "timeline_title": "timeline_title"
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_everything.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_everything.json
index 60095a0a6a8334..46a2feeefd49e3 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_everything.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_everything.json
@@ -78,5 +78,6 @@
     "Some plain text string here explaining why this is a valid thing to look out for"
   ],
   "timeline_id": "timeline_id",
+  "timeline_title": "timeline_title",
   "version": 1
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/saved_queries/saved_query_with_everything.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/saved_queries/saved_query_with_everything.json
index 2628b69eb064d7..16d5d6cc2b36a2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/saved_queries/saved_query_with_everything.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/saved_queries/saved_query_with_everything.json
@@ -78,5 +78,6 @@
     "Some plain text string here explaining why this is a valid thing to look out for"
   ],
   "saved_id": "test-saved-id",
-  "timeline_id": "test-timeline-id"
+  "timeline_id": "test-timeline-id",
+  "timeline_title": "test-timeline-title"
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_query_everything.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_query_everything.json
index 4da285e5b09bf9..7fc8de9fe8f9ec 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_query_everything.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_query_everything.json
@@ -78,5 +78,6 @@
     "Some plain text string here explaining why this is a valid thing to look out for"
   ],
   "timeline_id": "other-timeline-id",
+  "timeline_title": "other-timeline-title",
   "version": 42
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_timelineid.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_timelineid.json
index 8cfa3303f54a62..27dee7dd81463c 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_timelineid.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_timelineid.json
@@ -1,4 +1,5 @@
 {
   "rule_id": "query-rule-id",
-  "timeline_id": "other-timeline-id"
+  "timeline_id": "other-timeline-id",
+  "timeline_title": "other-timeline-title"
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts
index 5e50b65b517172..ede82a597b238e 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts
@@ -31,6 +31,7 @@ export const sampleRuleAlertParams = (
   filters: undefined,
   savedId: undefined,
   timelineId: undefined,
+  timelineTitle: undefined,
   meta: undefined,
   threats: undefined,
   version: 1,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
index 0a3526d32e511a..1093ff3a8a462d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
@@ -34,6 +34,7 @@ export const buildRule = ({
     false_positives: ruleParams.falsePositives,
     saved_id: ruleParams.savedId,
     timeline_id: ruleParams.timelineId,
+    timeline_title: ruleParams.timelineTitle,
     meta: ruleParams.meta,
     max_signals: ruleParams.maxSignals,
     risk_score: ruleParams.riskScore,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index 87d31abbc5371a..ab2c1733b04ca2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -42,6 +42,7 @@ export const signalRulesAlertType = ({
         outputIndex: schema.nullable(schema.string()),
         savedId: schema.nullable(schema.string()),
         timelineId: schema.nullable(schema.string()),
+        timelineTitle: schema.nullable(schema.string()),
         meta: schema.nullable(schema.object({}, { allowUnknowns: true })),
         query: schema.nullable(schema.string()),
         filters: schema.nullable(schema.arrayOf(schema.object({}, { allowUnknowns: true }))),
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
index f4a8263da6ba42..ff0f2a8782cd21 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
@@ -44,6 +44,7 @@ export interface RuleAlertParams {
   tags: string[];
   to: string;
   timelineId: string | undefined | null;
+  timelineTitle: string | undefined | null;
   threats: ThreatParams[] | undefined | null;
   type: 'query' | 'saved_query';
   version: number;
@@ -60,6 +61,7 @@ export type RuleAlertParamsRest = Omit<
   | 'savedId'
   | 'riskScore'
   | 'timelineId'
+  | 'timelineTitle'
   | 'outputIndex'
   | 'updatedAt'
   | 'createdAt'
@@ -68,6 +70,7 @@ export type RuleAlertParamsRest = Omit<
   false_positives: RuleAlertParams['falsePositives'];
   saved_id: RuleAlertParams['savedId'];
   timeline_id: RuleAlertParams['timelineId'];
+  timeline_title: RuleAlertParams['timelineTitle'];
   max_signals: RuleAlertParams['maxSignals'];
   risk_score: RuleAlertParams['riskScore'];
   output_index: RuleAlertParams['outputIndex'];

From 0e46b240bbc7daef9e8191e847adb924f7947bab Mon Sep 17 00:00:00 2001
From: Brandon Morelli <brandon.morelli@elastic.co>
Date: Wed, 8 Jan 2020 16:44:56 -0800
Subject: [PATCH 71/96] [docs][APM] Add runtime index config documentation
 (#53907)

---
 docs/apm/settings.asciidoc            |  14 +++++++++++---
 docs/apm/troubleshooting.asciidoc     |  16 ++++++++++++----
 docs/settings/apm-settings.asciidoc   |  23 ++++++++++++++++++++---
 docs/settings/images/apm-settings.png | Bin 0 -> 299491 bytes
 4 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 docs/settings/images/apm-settings.png

diff --git a/docs/apm/settings.asciidoc b/docs/apm/settings.asciidoc
index 2fc8748f13b096..37122fc9c635d0 100644
--- a/docs/apm/settings.asciidoc
+++ b/docs/apm/settings.asciidoc
@@ -3,8 +3,16 @@
 [[apm-settings-in-kibana]]
 === APM settings in Kibana
 
-You do not need to configure any settings to use APM. It is enabled by default.
-If you'd like to change any of the default values,
-copy and paste the relevant settings below into your `kibana.yml` configuration file.
+You do not need to configure any settings to use the APM app. It is enabled by default.
+
+[float]
+[[apm-indices-settings]]
+==== APM Indices
+
+include::./../settings/apm-settings.asciidoc[tag=apm-indices-settings]
+
+[float]
+[[general-apm-settings]]
+==== General APM settings
 
 include::./../settings/apm-settings.asciidoc[tag=general-apm-settings]
diff --git a/docs/apm/troubleshooting.asciidoc b/docs/apm/troubleshooting.asciidoc
index ec0863b09d653c..22279b69b70feb 100644
--- a/docs/apm/troubleshooting.asciidoc
+++ b/docs/apm/troubleshooting.asciidoc
@@ -17,6 +17,7 @@ This section can help with any of the following:
 There are a number of factors that could be at play here.
 One important thing to double-check first is your index template.
 
+*Index template*
 An APM index template must exist for the APM app to work correctly.
 By default, this index template is created by APM Server on startup.
 However, this only happens if `setup.template.enabled` is `true` in `apm-server.yml`.
@@ -34,14 +35,21 @@ GET /_template/apm-{version}
 --------------------------------------------------
 // CONSOLE
 
+*Using Logstash, Kafka, etc.*
 If you're not outputting data directly from APM Server to Elasticsearch (perhaps you're using Logstash or Kafka),
 then the index template will not be set up automatically. Instead, you'll need to
-{apm-server-ref}/_manually_loading_template_configuration.html#load-template-manually-alternate[load the template manually].
+{apm-server-ref}/_manually_loading_template_configuration.html[load the template manually].
 
-Finally, this problem can also occur if you've changed the index name that you write APM data to.
-The default index pattern can be found {apm-server-ref}/elasticsearch-output.html#index-option-es[here].
-If you change this setting, you must also configure the `setup.template.name` and `setup.template.pattern` options.
+*Using a custom index names*
+This problem can also occur if you've customized the index name that you write APM data to.
+The default index name that APM writes events to can be found
+{apm-server-ref}/elasticsearch-output.html#index-option-es[here].
+If you change the default, you must also configure the `setup.template.name` and `setup.template.pattern` options.
 See {apm-server-ref}/configuration-template.html[Load the Elasticsearch index template].
+If the Elasticsearch index template has already been successfully loaded to the index,
+you can customize the indices that the APM app uses to display data.
+Navigate to *APM* > *Settings* > *Indices*, and change all `apm_oss.*Pattern` values to
+include the new index pattern. For example: `customIndexName-*`.
 
 ==== Unknown route
 
diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
index 8d28b55a6502fb..a6eeffec51cb02 100644
--- a/docs/settings/apm-settings.asciidoc
+++ b/docs/settings/apm-settings.asciidoc
@@ -5,9 +5,23 @@
 <titleabbrev>APM settings</titleabbrev>
 ++++
 
-You do not need to configure any settings to use APM. It is enabled by default.
-If you'd like to change any of the default values,
-copy and paste the relevant settings below into your `kibana.yml` configuration file.
+You do not need to configure any settings to use the APM app. It is enabled by default.
+
+[float]
+[[apm-indices-settings-kb]]
+==== APM Indices
+
+// This content is reused in the APM app documentation.
+// Any changes made in this file will be seen there as well.
+// tag::apm-indices-settings[]
+
+Index defaults can be changed in Kibana. Navigate to *APM* > *Settings* > *Indices*.
+Index settings in the APM app take precedence over those set in `kibana.yml`.
+
+[role="screenshot"]
+image::settings/images/apm-settings.png[APM app settings in Kibana]
+
+// end::apm-indices-settings[]
 
 [float]
 [[general-apm-settings-kb]]
@@ -17,6 +31,9 @@ copy and paste the relevant settings below into your `kibana.yml` configuration
 // Any changes made in this file will be seen there as well.
 // tag::general-apm-settings[]
 
+If you'd like to change any of the default values,
+copy and paste the relevant settings below into your `kibana.yml` configuration file.
+
 xpack.apm.enabled:: Set to `false` to disabled the APM plugin {kib}. Defaults to
 `true`.
 
diff --git a/docs/settings/images/apm-settings.png b/docs/settings/images/apm-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..876f135da93564e81886547698db7103fc83f0f2
GIT binary patch
literal 299491
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%0A&7e15i{jE6TnceK8l`YqHP5%s2
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
O@3e*WkLBj)ul^74l!HG2

literal 0
HcmV?d00001


From a27c4c4a4e67383e790b0fd4de187735bda69487 Mon Sep 17 00:00:00 2001
From: Ahmad Bamieh <ahmadbamieh@gmail.com>
Date: Thu, 9 Jan 2020 02:55:17 +0200
Subject: [PATCH 72/96] =?UTF-8?q?[Telemetry]=20[Monitoring]=20Only=20retry?=
 =?UTF-8?q?=20fetching=20usage=20once=20monito=E2=80=A6=20(#54309)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix interval and add tests

* Update x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js

Co-Authored-By: Christiane (Tina) Heiligers <christiane.heiligers@elastic.co>

Co-authored-by: Christiane (Tina) Heiligers <christiane.heiligers@elastic.co>
---
 .../__tests__/bulk_uploader.js                | 54 ++++++++++++++---
 .../server/kibana_monitoring/bulk_uploader.js | 58 ++++++++++++-------
 2 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js
index fff0b742925c84..ef7d3f1224fab4 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js
+++ b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js
@@ -209,7 +209,7 @@ describe('BulkUploader', () => {
       }, CHECK_DELAY);
     });
 
-    it('refetches UsageCollectors if uploading to local cluster was not successful', done => {
+    it('stops refetching UsageCollectors if uploading to local cluster was not successful', async () => {
       const usageCollectorFetch = sinon
         .stub()
         .returns({ type: 'type_usage_collector_test', result: { testData: 12345 } });
@@ -227,12 +227,52 @@ describe('BulkUploader', () => {
 
       uploader._onPayload = async () => ({ took: 0, ignored: true, errors: false });
 
-      uploader.start(collectors);
-      setTimeout(() => {
-        uploader.stop();
-        expect(usageCollectorFetch.callCount).to.be.greaterThan(1);
-        done();
-      }, CHECK_DELAY);
+      await uploader._fetchAndUpload(uploader.filterCollectorSet(collectors));
+      await uploader._fetchAndUpload(uploader.filterCollectorSet(collectors));
+      await uploader._fetchAndUpload(uploader.filterCollectorSet(collectors));
+
+      expect(uploader._holdSendingUsage).to.eql(true);
+      expect(usageCollectorFetch.callCount).to.eql(1);
+    });
+
+    it('fetches UsageCollectors once uploading to local cluster is successful again', async () => {
+      const usageCollectorFetch = sinon
+        .stub()
+        .returns({ type: 'type_usage_collector_test', result: { usageData: 12345 } });
+
+      const statsCollectorFetch = sinon
+        .stub()
+        .returns({ type: 'type_stats_collector_test', result: { statsData: 12345 } });
+
+      const collectors = new MockCollectorSet(server, [
+        {
+          fetch: statsCollectorFetch,
+          isReady: () => true,
+          formatForBulkUpload: result => result,
+          isUsageCollector: false,
+        },
+        {
+          fetch: usageCollectorFetch,
+          isReady: () => true,
+          formatForBulkUpload: result => result,
+          isUsageCollector: true,
+        },
+      ]);
+
+      const uploader = new BulkUploader({ ...server, interval: FETCH_INTERVAL });
+      let bulkIgnored = true;
+      uploader._onPayload = async () => ({ took: 0, ignored: bulkIgnored, errors: false });
+
+      await uploader._fetchAndUpload(uploader.filterCollectorSet(collectors));
+      expect(uploader._holdSendingUsage).to.eql(true);
+
+      bulkIgnored = false;
+      await uploader._fetchAndUpload(uploader.filterCollectorSet(collectors));
+      await uploader._fetchAndUpload(uploader.filterCollectorSet(collectors));
+
+      expect(uploader._holdSendingUsage).to.eql(false);
+      expect(usageCollectorFetch.callCount).to.eql(2);
+      expect(statsCollectorFetch.callCount).to.eql(3);
     });
 
     it('calls UsageCollectors if last reported exceeds during a _usageInterval', done => {
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
index 2d81cb23b6b3b5..5e0d8aa4be1fdc 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
+++ b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
@@ -40,8 +40,14 @@ export class BulkUploader {
     }
 
     this._timer = null;
+    // Hold sending and fetching usage until monitoring.bulk is successful. This means that we
+    // send usage data on the second tick. But would save a lot of bandwidth fetching usage on
+    // every tick when ES is failing or monitoring is disabled.
+    this._holdSendingUsage = false;
     this._interval = interval;
     this._lastFetchUsageTime = null;
+    // Limit sending and fetching usage to once per day once usage is successfully stored
+    // into the monitoring indices.
     this._usageInterval = TELEMETRY_COLLECTION_INTERVAL;
 
     this._log = {
@@ -65,6 +71,29 @@ export class BulkUploader {
       });
   }
 
+  filterCollectorSet(usageCollection) {
+    const successfulUploadInLastDay =
+      this._lastFetchUsageTime && this._lastFetchUsageTime + this._usageInterval > Date.now();
+
+    return usageCollection.getFilteredCollectorSet(c => {
+      // this is internal bulk upload, so filter out API-only collectors
+      if (c.ignoreForInternalUploader) {
+        return false;
+      }
+      // Only collect usage data at the same interval as telemetry would (default to once a day)
+      if (usageCollection.isUsageCollector(c)) {
+        if (this._holdSendingUsage) {
+          return false;
+        }
+        if (successfulUploadInLastDay) {
+          return false;
+        }
+      }
+
+      return true;
+    });
+  }
+
   /*
    * Start the interval timer
    * @param {usageCollection} usageCollection object to use for initial the fetch/upload and fetch/uploading on interval
@@ -72,31 +101,15 @@ export class BulkUploader {
    */
   start(usageCollection) {
     this._log.info('Starting monitoring stats collection');
-    const filterCollectorSet = _usageCollection => {
-      const successfulUploadInLastDay =
-        this._lastFetchUsageTime && this._lastFetchUsageTime + this._usageInterval > Date.now();
-
-      return _usageCollection.getFilteredCollectorSet(c => {
-        // this is internal bulk upload, so filter out API-only collectors
-        if (c.ignoreForInternalUploader) {
-          return false;
-        }
-        // Only collect usage data at the same interval as telemetry would (default to once a day)
-        if (successfulUploadInLastDay && _usageCollection.isUsageCollector(c)) {
-          return false;
-        }
-        return true;
-      });
-    };
 
     if (this._timer) {
       clearInterval(this._timer);
     } else {
-      this._fetchAndUpload(filterCollectorSet(usageCollection)); // initial fetch
+      this._fetchAndUpload(this.filterCollectorSet(usageCollection)); // initial fetch
     }
 
     this._timer = setInterval(() => {
-      this._fetchAndUpload(filterCollectorSet(usageCollection));
+      this._fetchAndUpload(this.filterCollectorSet(usageCollection));
     }, this._interval);
   }
 
@@ -146,12 +159,17 @@ export class BulkUploader {
         const sendSuccessful = !result.ignored && !result.errors;
         if (!sendSuccessful && hasUsageCollectors) {
           this._lastFetchUsageTime = null;
+          this._holdSendingUsage = true;
           this._log.debug(
             'Resetting lastFetchWithUsage because uploading to the cluster was not successful.'
           );
         }
-        if (sendSuccessful && hasUsageCollectors) {
-          this._lastFetchUsageTime = Date.now();
+
+        if (sendSuccessful) {
+          this._holdSendingUsage = false;
+          if (hasUsageCollectors) {
+            this._lastFetchUsageTime = Date.now();
+          }
         }
         this._log.debug(`Uploaded bulk stats payload to the local cluster`);
       } catch (err) {

From d5939c4af8721d5696353e664848858d13d8916c Mon Sep 17 00:00:00 2001
From: Marco Vettorello <vettorello.marco@gmail.com>
Date: Thu, 9 Jan 2020 03:41:24 +0100
Subject: [PATCH 73/96] [Discover] fix histogram min interval (#53979)

- Fixes issues involving min intervals for leap years and DST
---
 .../np_ready/angular/directives/histogram.tsx | 57 +++++++++++-
 .../np_ready/public/legacy/build_pipeline.ts  |  2 +
 .../point_series/__tests__/_init_x_axis.js    |  4 +
 .../agg_response/point_series/_init_x_axis.js | 18 +++-
 .../apps/discover/_discover_histogram.js      | 91 +++++++++++++++++++
 test/functional/apps/discover/index.js        |  1 +
 .../apps/management/_handle_alias.js          |  2 +-
 test/functional/page_objects/discover_page.js | 15 ++-
 8 files changed, 180 insertions(+), 10 deletions(-)
 create mode 100644 test/functional/apps/discover/_discover_histogram.js

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
index c2f716ff6c45a7..b83ac5b4a77955 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
@@ -19,6 +19,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiSpacer } from '@elastic/eui';
 import moment from 'moment-timezone';
+import { unitOfTime } from 'moment';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import lightEuiTheme from '@elastic/eui/dist/eui_theme_light.json';
@@ -53,6 +54,58 @@ interface DiscoverHistogramState {
   chartsTheme: EuiChartThemeType['theme'];
 }
 
+function findIntervalFromDuration(
+  dateValue: number,
+  esValue: number,
+  esUnit: unitOfTime.Base,
+  timeZone: string
+) {
+  const date = moment.tz(dateValue, timeZone);
+  const startOfDate = moment.tz(date, timeZone).startOf(esUnit);
+  const endOfDate = moment
+    .tz(date, timeZone)
+    .startOf(esUnit)
+    .add(esValue, esUnit);
+  return endOfDate.valueOf() - startOfDate.valueOf();
+}
+
+function getIntervalInMs(
+  value: number,
+  esValue: number,
+  esUnit: unitOfTime.Base,
+  timeZone: string
+): number {
+  switch (esUnit) {
+    case 's':
+      return 1000 * esValue;
+    case 'ms':
+      return 1 * esValue;
+    default:
+      return findIntervalFromDuration(value, esValue, esUnit, timeZone);
+  }
+}
+
+export function findMinInterval(
+  xValues: number[],
+  esValue: number,
+  esUnit: string,
+  timeZone: string
+): number {
+  return xValues.reduce((minInterval, currentXvalue, index) => {
+    let currentDiff = minInterval;
+    if (index > 0) {
+      currentDiff = Math.abs(xValues[index - 1] - currentXvalue);
+    }
+    const singleUnitInterval = getIntervalInMs(
+      currentXvalue,
+      esValue,
+      esUnit as unitOfTime.Base,
+      timeZone
+    );
+    return Math.min(minInterval, singleUnitInterval, currentDiff);
+  }, Number.MAX_SAFE_INTEGER);
+}
+
 export class DiscoverHistogram extends Component<DiscoverHistogramProps, DiscoverHistogramState> {
   public static propTypes = {
     chartData: PropTypes.object,
@@ -154,7 +207,7 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
      * see https://github.com/elastic/kibana/issues/27410
      * TODO: Once the Discover query has been update, we should change the below to use the new field
      */
-    const xInterval = chartData.ordered.interval;
+    const { intervalESValue, intervalESUnit, interval: xInterval } = chartData.ordered;
 
     const xValues = chartData.xAxisOrderedValues;
     const lastXValue = xValues[xValues.length - 1];
@@ -169,7 +222,7 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
     const xDomain = {
       min: domainMin,
       max: domainMax,
-      minInterval: xInterval,
+      minInterval: findMinInterval(xValues, intervalESValue, intervalESUnit, timeZone),
     };
 
     // Domain end of 'now' will be milliseconds behind current time, so we extend time by 1 minute and check if
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
index 59c6bddb64521d..cc2ab133941db5 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
@@ -445,6 +445,8 @@ export const buildVislibDimensions = async (
       dimensions.x.params.date = true;
       const { esUnit, esValue } = xAgg.buckets.getInterval();
       dimensions.x.params.interval = moment.duration(esValue, esUnit);
+      dimensions.x.params.intervalESValue = esValue;
+      dimensions.x.params.intervalESUnit = esUnit;
       dimensions.x.params.format = xAgg.buckets.getScaledDateFormat();
       dimensions.x.params.bounds = xAgg.buckets.getBounds();
     } else if (xAgg.type.name === 'histogram') {
diff --git a/src/legacy/ui/public/agg_response/point_series/__tests__/_init_x_axis.js b/src/legacy/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
index 929aa4d5a7a9f5..a8512edee658b5 100644
--- a/src/legacy/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
+++ b/src/legacy/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
@@ -104,6 +104,8 @@ describe('initXAxis', function() {
 
   it('reads the date interval param from the x agg', function() {
     chart.aspects.x[0].params.interval = 'P1D';
+    chart.aspects.x[0].params.intervalESValue = 1;
+    chart.aspects.x[0].params.intervalESUnit = 'd';
     chart.aspects.x[0].params.date = true;
     initXAxis(chart, table);
     expect(chart)
@@ -113,6 +115,8 @@ describe('initXAxis', function() {
 
     expect(moment.isDuration(chart.ordered.interval)).to.be(true);
     expect(chart.ordered.interval.toISOString()).to.eql('P1D');
+    expect(chart.ordered.intervalESValue).to.be(1);
+    expect(chart.ordered.intervalESUnit).to.be('d');
   });
 
   it('reads the numeric interval param from the x agg', function() {
diff --git a/src/legacy/ui/public/agg_response/point_series/_init_x_axis.js b/src/legacy/ui/public/agg_response/point_series/_init_x_axis.js
index 531c564ea19d6f..4a81486783b085 100644
--- a/src/legacy/ui/public/agg_response/point_series/_init_x_axis.js
+++ b/src/legacy/ui/public/agg_response/point_series/_init_x_axis.js
@@ -28,9 +28,19 @@ export function initXAxis(chart, table) {
   chart.xAxisFormat = format;
   chart.xAxisLabel = title;
 
-  if (params.interval) {
-    chart.ordered = {
-      interval: params.date ? moment.duration(params.interval) : params.interval,
-    };
+  const { interval, date } = params;
+  if (interval) {
+    if (date) {
+      const { intervalESUnit, intervalESValue } = params;
+      chart.ordered = {
+        interval: moment.duration(interval),
+        intervalESUnit: intervalESUnit,
+        intervalESValue: intervalESValue,
+      };
+    } else {
+      chart.ordered = {
+        interval,
+      };
+    }
   }
 }
diff --git a/test/functional/apps/discover/_discover_histogram.js b/test/functional/apps/discover/_discover_histogram.js
new file mode 100644
index 00000000000000..4780f36fc27c6e
--- /dev/null
+++ b/test/functional/apps/discover/_discover_histogram.js
@@ -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';
+
+export default function({ getService, getPageObjects }) {
+  const log = getService('log');
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+  const kibanaServer = getService('kibanaServer');
+  const PageObjects = getPageObjects(['settings', 'common', 'discover', 'header', 'timePicker']);
+  const defaultSettings = {
+    defaultIndex: 'long-window-logstash-*',
+    'dateFormat:tz': 'Europe/Berlin',
+  };
+
+  describe('discover histogram', function describeIndexTests() {
+    before(async function() {
+      log.debug('load kibana index with default index pattern');
+      await PageObjects.common.navigateToApp('home');
+      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load('long_window_logstash');
+      await esArchiver.load('visualize');
+      await esArchiver.load('discover');
+
+      log.debug('create long_window_logstash index pattern');
+      // NOTE: long_window_logstash load does NOT create index pattern
+      await PageObjects.settings.createIndexPattern('long-window-logstash-');
+      await kibanaServer.uiSettings.replace(defaultSettings);
+      await browser.refresh();
+
+      log.debug('discover');
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.selectIndexPattern('long-window-logstash-*');
+      // NOTE: For some reason without setting this relative time, the abs times will not fetch data.
+      await PageObjects.timePicker.setCommonlyUsedTime('superDatePickerCommonlyUsed_Last_1 year');
+    });
+    after(async () => {
+      await esArchiver.unload('long_window_logstash');
+      await esArchiver.unload('visualize');
+      await esArchiver.unload('discover');
+    });
+
+    it('should visualize monthly data with different day intervals', async () => {
+      //Nov 1, 2017 @ 01:00:00.000 - Mar 21, 2018 @ 02:00:00.000
+      const fromTime = '2017-11-01 00:00:00.000';
+      const toTime = '2018-03-21 00:00:00.000';
+      await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
+      await PageObjects.discover.setChartInterval('Monthly');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      const chartCanvasExist = await PageObjects.discover.chartCanvasExist();
+      expect(chartCanvasExist).to.be(true);
+    });
+    it('should visualize weekly data with within DST changes', async () => {
+      //Nov 1, 2017 @ 01:00:00.000 - Mar 21, 2018 @ 02:00:00.000
+      const fromTime = '2018-03-01 00:00:00.000';
+      const toTime = '2018-05-01 00:00:00.000';
+      await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
+      await PageObjects.discover.setChartInterval('Weekly');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      const chartCanvasExist = await PageObjects.discover.chartCanvasExist();
+      expect(chartCanvasExist).to.be(true);
+    });
+    it('should visualize monthly data with different years Scaled to 30d', async () => {
+      //Nov 1, 2017 @ 01:00:00.000 - Mar 21, 2018 @ 02:00:00.000
+      const fromTime = '2010-01-01 00:00:00.000';
+      const toTime = '2018-03-21 00:00:00.000';
+      await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
+      await PageObjects.discover.setChartInterval('Daily');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      const chartCanvasExist = await PageObjects.discover.chartCanvasExist();
+      expect(chartCanvasExist).to.be(true);
+    });
+  });
+}
diff --git a/test/functional/apps/discover/index.js b/test/functional/apps/discover/index.js
index e10e772e93ab1c..64a5a61335365e 100644
--- a/test/functional/apps/discover/index.js
+++ b/test/functional/apps/discover/index.js
@@ -34,6 +34,7 @@ export default function({ getService, loadTestFile }) {
 
     loadTestFile(require.resolve('./_saved_queries'));
     loadTestFile(require.resolve('./_discover'));
+    loadTestFile(require.resolve('./_discover_histogram'));
     loadTestFile(require.resolve('./_filter_editor'));
     loadTestFile(require.resolve('./_errors'));
     loadTestFile(require.resolve('./_field_data'));
diff --git a/test/functional/apps/management/_handle_alias.js b/test/functional/apps/management/_handle_alias.js
index 06406bddeb009d..3d9368f8d46807 100644
--- a/test/functional/apps/management/_handle_alias.js
+++ b/test/functional/apps/management/_handle_alias.js
@@ -74,7 +74,7 @@ export default function({ getService, getPageObjects }) {
       const toTime = 'Nov 19, 2016 @ 05:00:00.000';
 
       await PageObjects.common.navigateToApp('discover');
-      await PageObjects.discover.selectIndexPattern('alias2');
+      await PageObjects.discover.selectIndexPattern('alias2*');
       await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
 
       await retry.try(async function() {
diff --git a/test/functional/page_objects/discover_page.js b/test/functional/page_objects/discover_page.js
index 7029fbf9e1350b..3ba0f217813f2c 100644
--- a/test/functional/page_objects/discover_page.js
+++ b/test/functional/page_objects/discover_page.js
@@ -117,8 +117,16 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
       await testSubjects.click('discoverOpenButton');
     }
 
+    async getChartCanvas() {
+      return await find.byCssSelector('.echChart canvas:last-of-type');
+    }
+
+    async chartCanvasExist() {
+      return await find.existsByCssSelector('.echChart canvas:last-of-type');
+    }
+
     async clickHistogramBar() {
-      const el = await find.byCssSelector('.echChart canvas:last-of-type');
+      const el = await this.getChartCanvas();
 
       await browser
         .getActions()
@@ -128,7 +136,8 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
     }
 
     async brushHistogram() {
-      const el = await find.byCssSelector('.echChart canvas:last-of-type');
+      const el = await this.getChartCanvas();
+
       await browser.dragAndDrop(
         { location: el, offset: { x: 200, y: 20 } },
         { location: el, offset: { x: 400, y: 30 } }
@@ -279,7 +288,7 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
     async selectIndexPattern(indexPattern) {
       await testSubjects.click('indexPattern-switch-link');
       await find.clickByCssSelector(
-        `[data-test-subj="indexPattern-switcher"] [title="${indexPattern}*"]`
+        `[data-test-subj="indexPattern-switcher"] [title="${indexPattern}"]`
       );
       await PageObjects.header.waitUntilLoadingHasFinished();
     }

From ecddfd8842e48f9d559c1b4a7d5c4a42fa4259e4 Mon Sep 17 00:00:00 2001
From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com>
Date: Thu, 9 Jan 2020 11:00:30 +0300
Subject: [PATCH 74/96] [Vis: Default editor] Reactify the timelion editor
 (#52990)

* Reactify timelion editor

* Change translation ids

* Add @types/pegjs into renovate.json5

* Add validation, add hover suggestions

* Style fixes

* Change plugin setup, use kibana context

* Change plugin start

* Mock services

* Fix other comments

* Build renovate config

* Fix some classnames and SASS file structure

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Caroline Horn <549577+cchaos@users.noreply.github.com>
---
 package.json                                  |   1 +
 renovate.json5                                |   8 +
 .../core_plugins/timelion/common/types.ts     |  46 +++
 .../timelion/public/components/_index.scss    |   1 +
 .../_timelion_expression_input.scss           |  18 ++
 .../timelion/public/components/index.ts       |  21 ++
 .../components/timelion_expression_input.tsx  | 146 +++++++++
 .../timelion_expression_input_helpers.ts      | 287 ++++++++++++++++++
 .../public/components/timelion_interval.tsx   | 144 +++++++++
 .../timelion_expression_input_helpers.js      |  13 +-
 .../directives/timelion_expression_input.js   |   6 +-
 .../core_plugins/timelion/public/index.scss   |   1 +
 .../core_plugins/timelion/public/legacy.ts    |   2 +-
 .../public/panels/timechart/schema.ts         |   1 +
 .../core_plugins/timelion/public/plugin.ts    |   7 +-
 .../arg_value_suggestions.ts}                 |  81 +++--
 .../public/services/plugin_services.ts        |  30 ++
 .../timelion/public/timelion_vis_fn.ts        |   6 +-
 .../timelion/public/vis/_index.scss           |   1 +
 .../timelion/public/vis/_timelion_editor.scss |  15 +
 .../public/vis/{index.ts => index.tsx}        |  13 +-
 .../timelion/public/vis/timelion_options.tsx  |  48 +++
 .../public/vis/timelion_vis_params.html       |  27 --
 .../server/lib/classes/timelion_function.d.ts |  17 +-
 .../core_plugins/timelion/server/types.ts     |   9 +-
 .../public/code_editor/code_editor.tsx        |  14 +
 yarn.lock                                     |   5 +
 27 files changed, 875 insertions(+), 93 deletions(-)
 create mode 100644 src/legacy/core_plugins/timelion/common/types.ts
 create mode 100644 src/legacy/core_plugins/timelion/public/components/_index.scss
 create mode 100644 src/legacy/core_plugins/timelion/public/components/_timelion_expression_input.scss
 create mode 100644 src/legacy/core_plugins/timelion/public/components/index.ts
 create mode 100644 src/legacy/core_plugins/timelion/public/components/timelion_expression_input.tsx
 create mode 100644 src/legacy/core_plugins/timelion/public/components/timelion_expression_input_helpers.ts
 create mode 100644 src/legacy/core_plugins/timelion/public/components/timelion_interval.tsx
 rename src/legacy/core_plugins/timelion/public/{directives/timelion_expression_suggestions/arg_value_suggestions.js => services/arg_value_suggestions.ts} (72%)
 create mode 100644 src/legacy/core_plugins/timelion/public/services/plugin_services.ts
 create mode 100644 src/legacy/core_plugins/timelion/public/vis/_timelion_editor.scss
 rename src/legacy/core_plugins/timelion/public/vis/{index.ts => index.tsx} (80%)
 create mode 100644 src/legacy/core_plugins/timelion/public/vis/timelion_options.tsx
 delete mode 100644 src/legacy/core_plugins/timelion/public/vis/timelion_vis_params.html

diff --git a/package.json b/package.json
index db5764e6e91bac..0dbed9e432e991 100644
--- a/package.json
+++ b/package.json
@@ -341,6 +341,7 @@
     "@types/mustache": "^0.8.31",
     "@types/node": "^10.12.27",
     "@types/opn": "^5.1.0",
+    "@types/pegjs": "^0.10.1",
     "@types/pngjs": "^3.3.2",
     "@types/podium": "^1.0.0",
     "@types/prop-types": "^15.5.3",
diff --git a/renovate.json5 b/renovate.json5
index f069e961c0f2be..a5983283a9e856 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -673,6 +673,14 @@
           '@types/parse-link-header',
         ],
       },
+      {
+        groupSlug: 'pegjs',
+        groupName: 'pegjs related packages',
+        packageNames: [
+          'pegjs',
+          '@types/pegjs',
+        ],
+      },
       {
         groupSlug: 'pngjs',
         groupName: 'pngjs related packages',
diff --git a/src/legacy/core_plugins/timelion/common/types.ts b/src/legacy/core_plugins/timelion/common/types.ts
new file mode 100644
index 00000000000000..f7084948a14f73
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/common/types.ts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+type TimelionFunctionArgsTypes = 'seriesList' | 'number' | 'string' | 'boolean' | 'null';
+
+interface TimelionFunctionArgsSuggestion {
+  name: string;
+  help: string;
+}
+
+export interface TimelionFunctionArgs {
+  name: string;
+  help?: string;
+  multi?: boolean;
+  types: TimelionFunctionArgsTypes[];
+  suggestions?: TimelionFunctionArgsSuggestion[];
+}
+
+export interface ITimelionFunction {
+  aliases: string[];
+  args: TimelionFunctionArgs[];
+  name: string;
+  help: string;
+  chainable: boolean;
+  extended: boolean;
+  isAlias: boolean;
+  argsByName: {
+    [key: string]: TimelionFunctionArgs[];
+  };
+}
diff --git a/src/legacy/core_plugins/timelion/public/components/_index.scss b/src/legacy/core_plugins/timelion/public/components/_index.scss
new file mode 100644
index 00000000000000..f2458a367e1768
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/components/_index.scss
@@ -0,0 +1 @@
+@import './timelion_expression_input';
diff --git a/src/legacy/core_plugins/timelion/public/components/_timelion_expression_input.scss b/src/legacy/core_plugins/timelion/public/components/_timelion_expression_input.scss
new file mode 100644
index 00000000000000..b1c0b5514ff7ad
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/components/_timelion_expression_input.scss
@@ -0,0 +1,18 @@
+.timExpressionInput {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+  margin-top: $euiSize;
+}
+
+.timExpressionInput__editor {
+  height: 100%;
+  padding-top: $euiSizeS;
+}
+
+@include euiBreakpoint('xs', 's', 'm') {
+  .timExpressionInput__editor {
+    height: $euiSize * 15;
+    max-height: $euiSize * 15;
+  }
+}
diff --git a/src/legacy/core_plugins/timelion/public/components/index.ts b/src/legacy/core_plugins/timelion/public/components/index.ts
new file mode 100644
index 00000000000000..8d7d32a3ba2627
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/components/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './timelion_expression_input';
+export * from './timelion_interval';
diff --git a/src/legacy/core_plugins/timelion/public/components/timelion_expression_input.tsx b/src/legacy/core_plugins/timelion/public/components/timelion_expression_input.tsx
new file mode 100644
index 00000000000000..c695d09ca822bd
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/components/timelion_expression_input.tsx
@@ -0,0 +1,146 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useEffect, useCallback, useRef, useMemo } from 'react';
+import { EuiFormLabel } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api';
+
+import { CodeEditor, useKibana } from '../../../../../plugins/kibana_react/public';
+import { suggest, getSuggestion } from './timelion_expression_input_helpers';
+import { ITimelionFunction, TimelionFunctionArgs } from '../../common/types';
+import { getArgValueSuggestions } from '../services/arg_value_suggestions';
+
+const LANGUAGE_ID = 'timelion_expression';
+monacoEditor.languages.register({ id: LANGUAGE_ID });
+
+interface TimelionExpressionInputProps {
+  value: string;
+  setValue(value: string): void;
+}
+
+function TimelionExpressionInput({ value, setValue }: TimelionExpressionInputProps) {
+  const functionList = useRef([]);
+  const kibana = useKibana();
+  const argValueSuggestions = useMemo(getArgValueSuggestions, []);
+
+  const provideCompletionItems = useCallback(
+    async (model: monacoEditor.editor.ITextModel, position: monacoEditor.Position) => {
+      const text = model.getValue();
+      const wordUntil = model.getWordUntilPosition(position);
+      const wordRange = new monacoEditor.Range(
+        position.lineNumber,
+        wordUntil.startColumn,
+        position.lineNumber,
+        wordUntil.endColumn
+      );
+
+      const suggestions = await suggest(
+        text,
+        functionList.current,
+        // it's important to offset the cursor position on 1 point left
+        // because of PEG parser starts the line with 0, but monaco with 1
+        position.column - 1,
+        argValueSuggestions
+      );
+
+      return {
+        suggestions: suggestions
+          ? suggestions.list.map((s: ITimelionFunction | TimelionFunctionArgs) =>
+              getSuggestion(s, suggestions.type, wordRange)
+            )
+          : [],
+      };
+    },
+    [argValueSuggestions]
+  );
+
+  const provideHover = useCallback(
+    async (model: monacoEditor.editor.ITextModel, position: monacoEditor.Position) => {
+      const suggestions = await suggest(
+        model.getValue(),
+        functionList.current,
+        // it's important to offset the cursor position on 1 point left
+        // because of PEG parser starts the line with 0, but monaco with 1
+        position.column - 1,
+        argValueSuggestions
+      );
+
+      return {
+        contents: suggestions
+          ? suggestions.list.map((s: ITimelionFunction | TimelionFunctionArgs) => ({
+              value: s.help,
+            }))
+          : [],
+      };
+    },
+    [argValueSuggestions]
+  );
+
+  useEffect(() => {
+    if (kibana.services.http) {
+      kibana.services.http.get('../api/timelion/functions').then(data => {
+        functionList.current = data;
+      });
+    }
+  }, [kibana.services.http]);
+
+  return (
+    <div className="timExpressionInput">
+      <EuiFormLabel>
+        <FormattedMessage id="timelion.vis.expressionLabel" defaultMessage="Timelion expression" />
+      </EuiFormLabel>
+      <div className="timExpressionInput__editor">
+        <CodeEditor
+          languageId={LANGUAGE_ID}
+          value={value}
+          onChange={setValue}
+          suggestionProvider={{
+            triggerCharacters: ['.', ',', '(', '=', ':'],
+            provideCompletionItems,
+          }}
+          hoverProvider={{ provideHover }}
+          options={{
+            fixedOverflowWidgets: true,
+            fontSize: 14,
+            folding: false,
+            lineNumbers: 'off',
+            scrollBeyondLastLine: false,
+            minimap: {
+              enabled: false,
+            },
+            wordBasedSuggestions: false,
+            wordWrap: 'on',
+            wrappingIndent: 'indent',
+          }}
+          languageConfiguration={{
+            autoClosingPairs: [
+              {
+                open: '(',
+                close: ')',
+              },
+            ],
+          }}
+        />
+      </div>
+    </div>
+  );
+}
+
+export { TimelionExpressionInput };
diff --git a/src/legacy/core_plugins/timelion/public/components/timelion_expression_input_helpers.ts b/src/legacy/core_plugins/timelion/public/components/timelion_expression_input_helpers.ts
new file mode 100644
index 00000000000000..fc90c276eeca2f
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/components/timelion_expression_input_helpers.ts
@@ -0,0 +1,287 @@
+/*
+ * 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 { get, startsWith } from 'lodash';
+import PEG from 'pegjs';
+import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api';
+
+// @ts-ignore
+import grammar from 'raw-loader!../chain.peg';
+
+import { i18n } from '@kbn/i18n';
+import { ITimelionFunction, TimelionFunctionArgs } from '../../common/types';
+import { ArgValueSuggestions, FunctionArg, Location } from '../services/arg_value_suggestions';
+
+const Parser = PEG.generate(grammar);
+
+export enum SUGGESTION_TYPE {
+  ARGUMENTS = 'arguments',
+  ARGUMENT_VALUE = 'argument_value',
+  FUNCTIONS = 'functions',
+}
+
+function inLocation(cursorPosition: number, location: Location) {
+  return cursorPosition >= location.min && cursorPosition <= location.max;
+}
+
+function getArgumentsHelp(
+  functionHelp: ITimelionFunction | undefined,
+  functionArgs: FunctionArg[] = []
+) {
+  if (!functionHelp) {
+    return [];
+  }
+
+  // Do not provide 'inputSeries' as argument suggestion for chainable functions
+  const argsHelp = functionHelp.chainable ? functionHelp.args.slice(1) : functionHelp.args.slice(0);
+
+  // ignore arguments that are already provided in function declaration
+  const functionArgNames = functionArgs.map(arg => arg.name);
+  return argsHelp.filter(arg => !functionArgNames.includes(arg.name));
+}
+
+async function extractSuggestionsFromParsedResult(
+  result: ReturnType<typeof Parser.parse>,
+  cursorPosition: number,
+  functionList: ITimelionFunction[],
+  argValueSuggestions: ArgValueSuggestions
+) {
+  const activeFunc = result.functions.find(({ location }: { location: Location }) =>
+    inLocation(cursorPosition, location)
+  );
+
+  if (!activeFunc) {
+    return;
+  }
+
+  const functionHelp = functionList.find(({ name }) => name === activeFunc.function);
+
+  if (!functionHelp) {
+    return;
+  }
+
+  // return function suggestion when cursor is outside of parentheses
+  // location range includes '.', function name, and '('.
+  const openParen = activeFunc.location.min + activeFunc.function.length + 2;
+  if (cursorPosition < openParen) {
+    return { list: [functionHelp], type: SUGGESTION_TYPE.FUNCTIONS };
+  }
+
+  // return argument value suggestions when cursor is inside argument value
+  const activeArg = activeFunc.arguments.find((argument: FunctionArg) => {
+    return inLocation(cursorPosition, argument.location);
+  });
+  if (
+    activeArg &&
+    activeArg.type === 'namedArg' &&
+    inLocation(cursorPosition, activeArg.value.location)
+  ) {
+    const { function: functionName, arguments: functionArgs } = activeFunc;
+
+    const {
+      name: argName,
+      value: { text: partialInput },
+    } = activeArg;
+
+    let valueSuggestions;
+    if (argValueSuggestions.hasDynamicSuggestionsForArgument(functionName, argName)) {
+      valueSuggestions = await argValueSuggestions.getDynamicSuggestionsForArgument(
+        functionName,
+        argName,
+        functionArgs,
+        partialInput
+      );
+    } else {
+      const { suggestions: staticSuggestions } =
+        functionHelp.args.find(arg => arg.name === activeArg.name) || {};
+      valueSuggestions = argValueSuggestions.getStaticSuggestionsForInput(
+        partialInput,
+        staticSuggestions
+      );
+    }
+    return {
+      list: valueSuggestions,
+      type: SUGGESTION_TYPE.ARGUMENT_VALUE,
+    };
+  }
+
+  // return argument suggestions
+  const argsHelp = getArgumentsHelp(functionHelp, activeFunc.arguments);
+  const argumentSuggestions = argsHelp.filter(arg => {
+    if (get(activeArg, 'type') === 'namedArg') {
+      return startsWith(arg.name, activeArg.name);
+    } else if (activeArg) {
+      return startsWith(arg.name, activeArg.text);
+    }
+    return true;
+  });
+  return { list: argumentSuggestions, type: SUGGESTION_TYPE.ARGUMENTS };
+}
+
+export async function suggest(
+  expression: string,
+  functionList: ITimelionFunction[],
+  cursorPosition: number,
+  argValueSuggestions: ArgValueSuggestions
+) {
+  try {
+    const result = await Parser.parse(expression);
+
+    return await extractSuggestionsFromParsedResult(
+      result,
+      cursorPosition,
+      functionList,
+      argValueSuggestions
+    );
+  } catch (err) {
+    let message: any;
+    try {
+      // The grammar will throw an error containing a message if the expression is formatted
+      // correctly and is prepared to accept suggestions. If the expression is not formatted
+      // correctly the grammar will just throw a regular PEG SyntaxError, and this JSON.parse
+      // attempt will throw an error.
+      message = JSON.parse(err.message);
+    } catch (e) {
+      // The expression isn't correctly formatted, so JSON.parse threw an error.
+      return;
+    }
+
+    switch (message.type) {
+      case 'incompleteFunction': {
+        let list;
+        if (message.function) {
+          // The user has start typing a function name, so we'll filter the list down to only
+          // possible matches.
+          list = functionList.filter(func => startsWith(func.name, message.function));
+        } else {
+          // The user hasn't typed anything yet, so we'll just return the entire list.
+          list = functionList;
+        }
+        return { list, type: SUGGESTION_TYPE.FUNCTIONS };
+      }
+      case 'incompleteArgument': {
+        const { currentFunction: functionName, currentArgs: functionArgs } = message;
+        const functionHelp = functionList.find(func => func.name === functionName);
+        return {
+          list: getArgumentsHelp(functionHelp, functionArgs),
+          type: SUGGESTION_TYPE.ARGUMENTS,
+        };
+      }
+      case 'incompleteArgumentValue': {
+        const { name: argName, currentFunction: functionName, currentArgs: functionArgs } = message;
+        let valueSuggestions = [];
+        if (argValueSuggestions.hasDynamicSuggestionsForArgument(functionName, argName)) {
+          valueSuggestions = await argValueSuggestions.getDynamicSuggestionsForArgument(
+            functionName,
+            argName,
+            functionArgs
+          );
+        } else {
+          const functionHelp = functionList.find(func => func.name === functionName);
+          if (functionHelp) {
+            const argHelp = functionHelp.args.find(arg => arg.name === argName);
+            if (argHelp && argHelp.suggestions) {
+              valueSuggestions = argHelp.suggestions;
+            }
+          }
+        }
+        return {
+          list: valueSuggestions,
+          type: SUGGESTION_TYPE.ARGUMENT_VALUE,
+        };
+      }
+    }
+  }
+}
+
+export function getSuggestion(
+  suggestion: ITimelionFunction | TimelionFunctionArgs,
+  type: SUGGESTION_TYPE,
+  range: monacoEditor.Range
+): monacoEditor.languages.CompletionItem {
+  let kind: monacoEditor.languages.CompletionItemKind =
+    monacoEditor.languages.CompletionItemKind.Method;
+  let insertText: string = suggestion.name;
+  let insertTextRules: monacoEditor.languages.CompletionItem['insertTextRules'];
+  let detail: string = '';
+  let command: monacoEditor.languages.CompletionItem['command'];
+
+  switch (type) {
+    case SUGGESTION_TYPE.ARGUMENTS:
+      command = {
+        title: 'Trigger Suggestion Dialog',
+        id: 'editor.action.triggerSuggest',
+      };
+      kind = monacoEditor.languages.CompletionItemKind.Property;
+      insertText = `${insertText}=`;
+      detail = `${i18n.translate(
+        'timelion.expressionSuggestions.argument.description.acceptsText',
+        {
+          defaultMessage: 'Accepts',
+        }
+      )}: ${(suggestion as TimelionFunctionArgs).types}`;
+
+      break;
+    case SUGGESTION_TYPE.FUNCTIONS:
+      command = {
+        title: 'Trigger Suggestion Dialog',
+        id: 'editor.action.triggerSuggest',
+      };
+      kind = monacoEditor.languages.CompletionItemKind.Function;
+      insertText = `${insertText}($0)`;
+      insertTextRules = monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet;
+      detail = `(${
+        (suggestion as ITimelionFunction).chainable
+          ? i18n.translate('timelion.expressionSuggestions.func.description.chainableHelpText', {
+              defaultMessage: 'Chainable',
+            })
+          : i18n.translate('timelion.expressionSuggestions.func.description.dataSourceHelpText', {
+              defaultMessage: 'Data source',
+            })
+      })`;
+
+      break;
+    case SUGGESTION_TYPE.ARGUMENT_VALUE:
+      const param = suggestion.name.split(':');
+
+      if (param.length === 1 || param[1]) {
+        insertText = `${param.length === 1 ? insertText : param[1]},`;
+      }
+
+      command = {
+        title: 'Trigger Suggestion Dialog',
+        id: 'editor.action.triggerSuggest',
+      };
+      kind = monacoEditor.languages.CompletionItemKind.Property;
+      detail = suggestion.help || '';
+
+      break;
+  }
+
+  return {
+    detail,
+    insertText,
+    insertTextRules,
+    kind,
+    label: suggestion.name,
+    documentation: suggestion.help,
+    command,
+    range,
+  };
+}
diff --git a/src/legacy/core_plugins/timelion/public/components/timelion_interval.tsx b/src/legacy/core_plugins/timelion/public/components/timelion_interval.tsx
new file mode 100644
index 00000000000000..6294e51e54788d
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/components/timelion_interval.tsx
@@ -0,0 +1,144 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useMemo, useCallback } from 'react';
+import { EuiFormRow, EuiComboBox, EuiComboBoxOptionProps } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { useValidation } from 'ui/vis/editors/default/controls/agg_utils';
+import { isValidEsInterval } from '../../../../core_plugins/data/common';
+
+const intervalOptions = [
+  {
+    label: i18n.translate('timelion.vis.interval.auto', {
+      defaultMessage: 'Auto',
+    }),
+    value: 'auto',
+  },
+  {
+    label: i18n.translate('timelion.vis.interval.second', {
+      defaultMessage: '1 second',
+    }),
+    value: '1s',
+  },
+  {
+    label: i18n.translate('timelion.vis.interval.minute', {
+      defaultMessage: '1 minute',
+    }),
+    value: '1m',
+  },
+  {
+    label: i18n.translate('timelion.vis.interval.hour', {
+      defaultMessage: '1 hour',
+    }),
+    value: '1h',
+  },
+  {
+    label: i18n.translate('timelion.vis.interval.day', {
+      defaultMessage: '1 day',
+    }),
+    value: '1d',
+  },
+  {
+    label: i18n.translate('timelion.vis.interval.week', {
+      defaultMessage: '1 week',
+    }),
+    value: '1w',
+  },
+  {
+    label: i18n.translate('timelion.vis.interval.month', {
+      defaultMessage: '1 month',
+    }),
+    value: '1M',
+  },
+  {
+    label: i18n.translate('timelion.vis.interval.year', {
+      defaultMessage: '1 year',
+    }),
+    value: '1y',
+  },
+];
+
+interface TimelionIntervalProps {
+  value: string;
+  setValue(value: string): void;
+  setValidity(valid: boolean): void;
+}
+
+function TimelionInterval({ value, setValue, setValidity }: TimelionIntervalProps) {
+  const onCustomInterval = useCallback(
+    (customValue: string) => {
+      setValue(customValue.trim());
+    },
+    [setValue]
+  );
+
+  const onChange = useCallback(
+    (opts: Array<EuiComboBoxOptionProps<string>>) => {
+      setValue((opts[0] && opts[0].value) || '');
+    },
+    [setValue]
+  );
+
+  const selectedOptions = useMemo(
+    () => [intervalOptions.find(op => op.value === value) || { label: value, value }],
+    [value]
+  );
+
+  const isValid = intervalOptions.some(int => int.value === value) || isValidEsInterval(value);
+
+  useValidation(setValidity, isValid);
+
+  return (
+    <EuiFormRow
+      compressed
+      fullWidth
+      helpText={i18n.translate('timelion.vis.selectIntervalHelpText', {
+        defaultMessage:
+          'Select an option or create a custom value. Examples: 30s, 20m, 24h, 2d, 1w, 1M',
+      })}
+      isInvalid={!isValid}
+      error={
+        !isValid &&
+        i18n.translate('timelion.vis.invalidIntervalErrorMessage', {
+          defaultMessage: 'Invalid interval format.',
+        })
+      }
+      label={i18n.translate('timelion.vis.intervalLabel', {
+        defaultMessage: 'Interval',
+      })}
+    >
+      <EuiComboBox
+        compressed
+        fullWidth
+        isInvalid={!isValid}
+        onChange={onChange}
+        onCreateOption={onCustomInterval}
+        options={intervalOptions}
+        selectedOptions={selectedOptions}
+        singleSelection={{ asPlainText: true }}
+        placeholder={i18n.translate('timelion.vis.selectIntervalPlaceholder', {
+          defaultMessage: 'Select an interval',
+        })}
+      />
+    </EuiFormRow>
+  );
+}
+
+export { TimelionInterval };
diff --git a/src/legacy/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js b/src/legacy/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js
index b90f5932b5b099..231330b898edb5 100644
--- a/src/legacy/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js
+++ b/src/legacy/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js
@@ -21,9 +21,15 @@ import expect from '@kbn/expect';
 import PEG from 'pegjs';
 import grammar from 'raw-loader!../../chain.peg';
 import { SUGGESTION_TYPE, suggest } from '../timelion_expression_input_helpers';
-import { ArgValueSuggestionsProvider } from '../timelion_expression_suggestions/arg_value_suggestions';
+import { getArgValueSuggestions } from '../../services/arg_value_suggestions';
+import { setIndexPatterns, setSavedObjectsClient } from '../../services/plugin_services';
 
 describe('Timelion expression suggestions', () => {
+  setIndexPatterns({});
+  setSavedObjectsClient({});
+
+  const argValueSuggestions = getArgValueSuggestions();
+
   describe('getSuggestions', () => {
     const func1 = {
       name: 'func1',
@@ -44,11 +50,6 @@ describe('Timelion expression suggestions', () => {
     };
     const functionList = [func1, myFunc2];
     let Parser;
-    const privateStub = () => {
-      return {};
-    };
-    const indexPatternsStub = {};
-    const argValueSuggestions = ArgValueSuggestionsProvider(privateStub, indexPatternsStub); // eslint-disable-line new-cap
     beforeEach(function() {
       Parser = PEG.generate(grammar);
     });
diff --git a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js b/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js
index 137dd6b82046dc..449c0489fea251 100644
--- a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js
+++ b/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js
@@ -52,11 +52,11 @@ import {
   insertAtLocation,
 } from './timelion_expression_input_helpers';
 import { comboBoxKeyCodes } from '@elastic/eui';
-import { ArgValueSuggestionsProvider } from './timelion_expression_suggestions/arg_value_suggestions';
+import { getArgValueSuggestions } from '../services/arg_value_suggestions';
 
 const Parser = PEG.generate(grammar);
 
-export function TimelionExpInput($http, $timeout, Private) {
+export function TimelionExpInput($http, $timeout) {
   return {
     restrict: 'E',
     scope: {
@@ -68,7 +68,7 @@ export function TimelionExpInput($http, $timeout, Private) {
     replace: true,
     template: timelionExpressionInputTemplate,
     link: function(scope, elem) {
-      const argValueSuggestions = Private(ArgValueSuggestionsProvider);
+      const argValueSuggestions = getArgValueSuggestions();
       const expressionInput = elem.find('[data-expression-input]');
       const functionReference = {};
       let suggestibleFunctionLocation = {};
diff --git a/src/legacy/core_plugins/timelion/public/index.scss b/src/legacy/core_plugins/timelion/public/index.scss
index f6123f40521562..7ccc6c300bc40b 100644
--- a/src/legacy/core_plugins/timelion/public/index.scss
+++ b/src/legacy/core_plugins/timelion/public/index.scss
@@ -11,5 +11,6 @@
 //   timChart__legend-isLoading
 
 @import './app';
+@import './components/index';
 @import './directives/index';
 @import './vis/index';
diff --git a/src/legacy/core_plugins/timelion/public/legacy.ts b/src/legacy/core_plugins/timelion/public/legacy.ts
index d989a68d40eeb4..1cf6bb65cdc029 100644
--- a/src/legacy/core_plugins/timelion/public/legacy.ts
+++ b/src/legacy/core_plugins/timelion/public/legacy.ts
@@ -37,4 +37,4 @@ const setupPlugins: Readonly<TimelionPluginSetupDependencies> = {
 const pluginInstance = plugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
-export const start = pluginInstance.start(npStart.core);
+export const start = pluginInstance.start(npStart.core, npStart.plugins);
diff --git a/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts b/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts
index 04b27c4020ce3b..0bbda4bf3646fc 100644
--- a/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts
+++ b/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts
@@ -35,6 +35,7 @@ const DEBOUNCE_DELAY = 50;
 
 export function timechartFn(dependencies: TimelionVisualizationDependencies) {
   const { $rootScope, $compile, uiSettings } = dependencies;
+
   return function() {
     return {
       help: 'Draw a timeseries chart',
diff --git a/src/legacy/core_plugins/timelion/public/plugin.ts b/src/legacy/core_plugins/timelion/public/plugin.ts
index ba8c25c20abeab..42f0ee3ad47258 100644
--- a/src/legacy/core_plugins/timelion/public/plugin.ts
+++ b/src/legacy/core_plugins/timelion/public/plugin.ts
@@ -26,12 +26,14 @@ import {
 } from 'kibana/public';
 import { Plugin as ExpressionsPlugin } from 'src/plugins/expressions/public';
 import { DataPublicPluginSetup, TimefilterContract } from 'src/plugins/data/public';
+import { PluginsStart } from 'ui/new_platform/new_platform';
 import { VisualizationsSetup } from '../../visualizations/public/np_ready/public';
 import { getTimelionVisualizationConfig } from './timelion_vis_fn';
 import { getTimelionVisualization } from './vis';
 import { getTimeChart } from './panels/timechart/timechart';
 import { Panel } from './panels/panel';
 import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
+import { setIndexPatterns, setSavedObjectsClient } from './services/plugin_services';
 
 /** @internal */
 export interface TimelionVisualizationDependencies extends LegacyDependenciesPluginSetup {
@@ -85,12 +87,15 @@ export class TimelionPlugin implements Plugin<Promise<void>, void> {
     dependencies.timelionPanels.set(timeChartPanel.name, timeChartPanel);
   }
 
-  public start(core: CoreStart) {
+  public start(core: CoreStart, plugins: PluginsStart) {
     const timelionUiEnabled = core.injectedMetadata.getInjectedVar('timelionUiEnabled');
 
     if (timelionUiEnabled === false) {
       core.chrome.navLinks.update('timelion', { hidden: true });
     }
+
+    setIndexPatterns(plugins.data.indexPatterns);
+    setSavedObjectsClient(core.savedObjects.client);
   }
 
   public stop(): void {}
diff --git a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js b/src/legacy/core_plugins/timelion/public/services/arg_value_suggestions.ts
similarity index 72%
rename from src/legacy/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js
rename to src/legacy/core_plugins/timelion/public/services/arg_value_suggestions.ts
index e698a69401a376..8d133de51f6d9a 100644
--- a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js
+++ b/src/legacy/core_plugins/timelion/public/services/arg_value_suggestions.ts
@@ -17,33 +17,51 @@
  * under the License.
  */
 
-import _ from 'lodash';
-import { npStart } from 'ui/new_platform';
+import { get } from 'lodash';
+import { TimelionFunctionArgs } from '../../common/types';
+import { getIndexPatterns, getSavedObjectsClient } from './plugin_services';
 
-export function ArgValueSuggestionsProvider() {
-  const { indexPatterns } = npStart.plugins.data;
-  const { client: savedObjectsClient } = npStart.core.savedObjects;
+export interface Location {
+  min: number;
+  max: number;
+}
 
-  async function getIndexPattern(functionArgs) {
-    const indexPatternArg = functionArgs.find(argument => {
-      return argument.name === 'index';
-    });
+export interface FunctionArg {
+  function: string;
+  location: Location;
+  name: string;
+  text: string;
+  type: string;
+  value: {
+    location: Location;
+    text: string;
+    type: string;
+    value: string;
+  };
+}
+
+export function getArgValueSuggestions() {
+  const indexPatterns = getIndexPatterns();
+  const savedObjectsClient = getSavedObjectsClient();
+
+  async function getIndexPattern(functionArgs: FunctionArg[]) {
+    const indexPatternArg = functionArgs.find(({ name }) => name === 'index');
     if (!indexPatternArg) {
       // index argument not provided
       return;
     }
-    const indexPatternTitle = _.get(indexPatternArg, 'value.text');
+    const indexPatternTitle = get(indexPatternArg, 'value.text');
 
-    const resp = await savedObjectsClient.find({
+    const { savedObjects } = await savedObjectsClient.find({
       type: 'index-pattern',
       fields: ['title'],
       search: `"${indexPatternTitle}"`,
-      search_fields: ['title'],
+      searchFields: ['title'],
       perPage: 10,
     });
-    const indexPatternSavedObject = resp.savedObjects.find(savedObject => {
-      return savedObject.attributes.title === indexPatternTitle;
-    });
+    const indexPatternSavedObject = savedObjects.find(
+      ({ attributes }) => attributes.title === indexPatternTitle
+    );
     if (!indexPatternSavedObject) {
       // index argument does not match an index pattern
       return;
@@ -52,7 +70,7 @@ export function ArgValueSuggestionsProvider() {
     return await indexPatterns.get(indexPatternSavedObject.id);
   }
 
-  function containsFieldName(partial, field) {
+  function containsFieldName(partial: string, field: { name: string }) {
     if (!partial) {
       return true;
     }
@@ -63,13 +81,13 @@ export function ArgValueSuggestionsProvider() {
   // Could not put with function definition since functions are defined on server
   const customHandlers = {
     es: {
-      index: async function(partial) {
+      async index(partial: string) {
         const search = partial ? `${partial}*` : '*';
         const resp = await savedObjectsClient.find({
           type: 'index-pattern',
           fields: ['title', 'type'],
           search: `${search}`,
-          search_fields: ['title'],
+          searchFields: ['title'],
           perPage: 25,
         });
         return resp.savedObjects
@@ -78,7 +96,7 @@ export function ArgValueSuggestionsProvider() {
             return { name: savedObject.attributes.title };
           });
       },
-      metric: async function(partial, functionArgs) {
+      async metric(partial: string, functionArgs: FunctionArg[]) {
         if (!partial || !partial.includes(':')) {
           return [
             { name: 'avg:' },
@@ -109,7 +127,7 @@ export function ArgValueSuggestionsProvider() {
             return { name: `${valueSplit[0]}:${field.name}`, help: field.type };
           });
       },
-      split: async function(partial, functionArgs) {
+      async split(partial: string, functionArgs: FunctionArg[]) {
         const indexPattern = await getIndexPattern(functionArgs);
         if (!indexPattern) {
           return [];
@@ -127,7 +145,7 @@ export function ArgValueSuggestionsProvider() {
             return { name: field.name, help: field.type };
           });
       },
-      timefield: async function(partial, functionArgs) {
+      async timefield(partial: string, functionArgs: FunctionArg[]) {
         const indexPattern = await getIndexPattern(functionArgs);
         if (!indexPattern) {
           return [];
@@ -150,7 +168,10 @@ export function ArgValueSuggestionsProvider() {
      * @param {string} argName - user provided argument name
      * @return {boolean} true when dynamic suggestion handler provided for function argument
      */
-    hasDynamicSuggestionsForArgument: (functionName, argName) => {
+    hasDynamicSuggestionsForArgument: <T extends keyof typeof customHandlers>(
+      functionName: T,
+      argName: keyof typeof customHandlers[T]
+    ) => {
       return customHandlers[functionName] && customHandlers[functionName][argName];
     },
 
@@ -161,12 +182,13 @@ export function ArgValueSuggestionsProvider() {
      * @param {string} partial - user provided argument value
      * @return {array} array of dynamic suggestions matching partial
      */
-    getDynamicSuggestionsForArgument: async (
-      functionName,
-      argName,
-      functionArgs,
+    getDynamicSuggestionsForArgument: async <T extends keyof typeof customHandlers>(
+      functionName: T,
+      argName: keyof typeof customHandlers[T],
+      functionArgs: FunctionArg[],
       partialInput = ''
     ) => {
+      // @ts-ignore
       return await customHandlers[functionName][argName](partialInput, functionArgs);
     },
 
@@ -175,7 +197,10 @@ export function ArgValueSuggestionsProvider() {
      * @param {array} staticSuggestions - argument value suggestions
      * @return {array} array of static suggestions matching partial
      */
-    getStaticSuggestionsForInput: (partialInput = '', staticSuggestions = []) => {
+    getStaticSuggestionsForInput: (
+      partialInput = '',
+      staticSuggestions: TimelionFunctionArgs['suggestions'] = []
+    ) => {
       if (partialInput) {
         return staticSuggestions.filter(suggestion => {
           return suggestion.name.includes(partialInput);
@@ -186,3 +211,5 @@ export function ArgValueSuggestionsProvider() {
     },
   };
 }
+
+export type ArgValueSuggestions = ReturnType<typeof getArgValueSuggestions>;
diff --git a/src/legacy/core_plugins/timelion/public/services/plugin_services.ts b/src/legacy/core_plugins/timelion/public/services/plugin_services.ts
new file mode 100644
index 00000000000000..5ba4ee5e479832
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/services/plugin_services.ts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IndexPatternsContract } from 'src/plugins/data/public';
+import { SavedObjectsClientContract } from 'kibana/public';
+import { createGetterSetter } from '../../../../../plugins/kibana_utils/public';
+
+export const [getIndexPatterns, setIndexPatterns] = createGetterSetter<IndexPatternsContract>(
+  'IndexPatterns'
+);
+
+export const [getSavedObjectsClient, setSavedObjectsClient] = createGetterSetter<
+  SavedObjectsClientContract
+>('SavedObjectsClient');
diff --git a/src/legacy/core_plugins/timelion/public/timelion_vis_fn.ts b/src/legacy/core_plugins/timelion/public/timelion_vis_fn.ts
index 474f464a550cd5..206f9f5d8368da 100644
--- a/src/legacy/core_plugins/timelion/public/timelion_vis_fn.ts
+++ b/src/legacy/core_plugins/timelion/public/timelion_vis_fn.ts
@@ -28,7 +28,7 @@ const name = 'timelion_vis';
 
 interface Arguments {
   expression: string;
-  interval: any;
+  interval: string;
 }
 
 interface RenderValue {
@@ -38,7 +38,7 @@ interface RenderValue {
 }
 
 type Context = KibanaContext | null;
-type VisParams = Arguments;
+export type VisParams = Arguments;
 type Return = Promise<Render<RenderValue>>;
 
 export const getTimelionVisualizationConfig = (
@@ -60,7 +60,7 @@ export const getTimelionVisualizationConfig = (
       help: '',
     },
     interval: {
-      types: ['string', 'null'],
+      types: ['string'],
       default: 'auto',
       help: '',
     },
diff --git a/src/legacy/core_plugins/timelion/public/vis/_index.scss b/src/legacy/core_plugins/timelion/public/vis/_index.scss
index e44b6336d33c19..17a2018f7a56a8 100644
--- a/src/legacy/core_plugins/timelion/public/vis/_index.scss
+++ b/src/legacy/core_plugins/timelion/public/vis/_index.scss
@@ -1 +1,2 @@
 @import './timelion_vis';
+@import './timelion_editor';
diff --git a/src/legacy/core_plugins/timelion/public/vis/_timelion_editor.scss b/src/legacy/core_plugins/timelion/public/vis/_timelion_editor.scss
new file mode 100644
index 00000000000000..a9331930a86ffa
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/vis/_timelion_editor.scss
@@ -0,0 +1,15 @@
+.visEditor--timelion {
+  vis-options-react-wrapper,
+  .visEditorSidebar__options,
+  .visEditorSidebar__timelionOptions {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .visEditor__sidebar {
+    @include euiBreakpoint('xs', 's', 'm') {
+      width: 100%;
+    }
+  }
+}
diff --git a/src/legacy/core_plugins/timelion/public/vis/index.ts b/src/legacy/core_plugins/timelion/public/vis/index.tsx
similarity index 80%
rename from src/legacy/core_plugins/timelion/public/vis/index.ts
rename to src/legacy/core_plugins/timelion/public/vis/index.tsx
index 7b82553a24e5b1..1edcb0a5ce71c0 100644
--- a/src/legacy/core_plugins/timelion/public/vis/index.ts
+++ b/src/legacy/core_plugins/timelion/public/vis/index.tsx
@@ -17,19 +17,24 @@
  * under the License.
  */
 
+import React from 'react';
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
 import { DefaultEditorSize } from 'ui/vis/editor_size';
+import { VisOptionsProps } from 'ui/vis/editors/default';
+import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public';
 import { getTimelionRequestHandler } from './timelion_request_handler';
 import visConfigTemplate from './timelion_vis.html';
-import editorConfigTemplate from './timelion_vis_params.html';
 import { TimelionVisualizationDependencies } from '../plugin';
 // @ts-ignore
 import { AngularVisController } from '../../../../ui/public/vis/vis_types/angular_vis_type';
+import { TimelionOptions } from './timelion_options';
+import { VisParams } from '../timelion_vis_fn';
 
 export const TIMELION_VIS_NAME = 'timelion';
 
 export function getTimelionVisualization(dependencies: TimelionVisualizationDependencies) {
+  const { http, uiSettings } = dependencies;
   const timelionRequestHandler = getTimelionRequestHandler(dependencies);
 
   // return the visType object, which kibana will use to display and configure new
@@ -50,7 +55,11 @@ export function getTimelionVisualization(dependencies: TimelionVisualizationDepe
       template: visConfigTemplate,
     },
     editorConfig: {
-      optionsTemplate: editorConfigTemplate,
+      optionsTemplate: (props: VisOptionsProps<VisParams>) => (
+        <KibanaContextProvider services={{ uiSettings, http }}>
+          <TimelionOptions {...props} />
+        </KibanaContextProvider>
+      ),
       defaultSize: DefaultEditorSize.MEDIUM,
     },
     requestHandler: timelionRequestHandler,
diff --git a/src/legacy/core_plugins/timelion/public/vis/timelion_options.tsx b/src/legacy/core_plugins/timelion/public/vis/timelion_options.tsx
new file mode 100644
index 00000000000000..527fcc3bc6ce87
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/vis/timelion_options.tsx
@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useCallback } from 'react';
+import { EuiPanel } from '@elastic/eui';
+
+import { VisOptionsProps } from 'ui/vis/editors/default';
+import { VisParams } from '../timelion_vis_fn';
+import { TimelionInterval, TimelionExpressionInput } from '../components';
+
+function TimelionOptions({ stateParams, setValue, setValidity }: VisOptionsProps<VisParams>) {
+  const setInterval = useCallback((value: VisParams['interval']) => setValue('interval', value), [
+    setValue,
+  ]);
+  const setExpressionInput = useCallback(
+    (value: VisParams['expression']) => setValue('expression', value),
+    [setValue]
+  );
+
+  return (
+    <EuiPanel className="visEditorSidebar__timelionOptions" paddingSize="s">
+      <TimelionInterval
+        value={stateParams.interval}
+        setValue={setInterval}
+        setValidity={setValidity}
+      />
+      <TimelionExpressionInput value={stateParams.expression} setValue={setExpressionInput} />
+    </EuiPanel>
+  );
+}
+
+export { TimelionOptions };
diff --git a/src/legacy/core_plugins/timelion/public/vis/timelion_vis_params.html b/src/legacy/core_plugins/timelion/public/vis/timelion_vis_params.html
deleted file mode 100644
index 9f2d2094fb1f7c..00000000000000
--- a/src/legacy/core_plugins/timelion/public/vis/timelion_vis_params.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="visEditorSidebar__section">
-  <div class="form-group">
-    <label
-      for="timelionInterval"
-      i18n-id="timelion.vis.intervalLabel"
-      i18n-default-message="Interval"
-    ></label>
-    <div class="form-group">
-      <timelion-interval model="editorState.params.interval"></timelion-interval>
-    </div>
-  </div>
-
-  <div class="form-group">
-    <div>
-      <label
-        i18n-id="timelion.vis.expressionLabel"
-        i18n-default-message="Timelion Expression"
-      ></label>
-    </div>
-
-    <timelion-expression-input
-      sheet="editorState.params.expression"
-      rows="9"
-    ></timelion-expression-input>
-  </div>
-
-</div>
diff --git a/src/legacy/core_plugins/timelion/server/lib/classes/timelion_function.d.ts b/src/legacy/core_plugins/timelion/server/lib/classes/timelion_function.d.ts
index 6e32a4454e7074..798902aa133dee 100644
--- a/src/legacy/core_plugins/timelion/server/lib/classes/timelion_function.d.ts
+++ b/src/legacy/core_plugins/timelion/server/lib/classes/timelion_function.d.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { TimelionFunctionArgs } from '../../../common/types';
+
 export interface TimelionFunctionInterface extends TimelionFunctionConfig {
   chainable: boolean;
   originalFn: Function;
@@ -32,21 +34,6 @@ export interface TimelionFunctionConfig {
   args: TimelionFunctionArgs[];
 }
 
-export interface TimelionFunctionArgs {
-  name: string;
-  help?: string;
-  multi?: boolean;
-  types: TimelionFunctionArgsTypes[];
-  suggestions?: TimelionFunctionArgsSuggestion[];
-}
-
-export type TimelionFunctionArgsTypes = 'seriesList' | 'number' | 'string' | 'boolean' | 'null';
-
-export interface TimelionFunctionArgsSuggestion {
-  name: string;
-  help: string;
-}
-
 // eslint-disable-next-line import/no-default-export
 export default class TimelionFunction {
   constructor(name: string, config: TimelionFunctionConfig);
diff --git a/src/legacy/core_plugins/timelion/server/types.ts b/src/legacy/core_plugins/timelion/server/types.ts
index e612bc14a0daa5..a035d64f764f13 100644
--- a/src/legacy/core_plugins/timelion/server/types.ts
+++ b/src/legacy/core_plugins/timelion/server/types.ts
@@ -17,12 +17,5 @@
  * under the License.
  */
 
-export {
-  TimelionFunctionInterface,
-  TimelionFunctionConfig,
-  TimelionFunctionArgs,
-  TimelionFunctionArgsSuggestion,
-  TimelionFunctionArgsTypes,
-} from './lib/classes/timelion_function';
-
+export { TimelionFunctionInterface, TimelionFunctionConfig } from './lib/classes/timelion_function';
 export { TimelionRequestQuery } from './routes/run';
diff --git a/src/plugins/kibana_react/public/code_editor/code_editor.tsx b/src/plugins/kibana_react/public/code_editor/code_editor.tsx
index 0ae77995c0502f..62440f12c6d849 100644
--- a/src/plugins/kibana_react/public/code_editor/code_editor.tsx
+++ b/src/plugins/kibana_react/public/code_editor/code_editor.tsx
@@ -78,6 +78,13 @@ export interface Props {
    */
   hoverProvider?: monacoEditor.languages.HoverProvider;
 
+  /**
+   * Language config provider for bracket
+   * Documentation for the provider can be found here:
+   * https://microsoft.github.io/monaco-editor/api/interfaces/monaco.languages.languageconfiguration.html
+   */
+  languageConfiguration?: monacoEditor.languages.LanguageConfiguration;
+
   /**
    * Function called before the editor is mounted in the view
    */
@@ -130,6 +137,13 @@ export class CodeEditor extends React.Component<Props, {}> {
       if (this.props.hoverProvider) {
         monaco.languages.registerHoverProvider(this.props.languageId, this.props.hoverProvider);
       }
+
+      if (this.props.languageConfiguration) {
+        monaco.languages.setLanguageConfiguration(
+          this.props.languageId,
+          this.props.languageConfiguration
+        );
+      }
     });
 
     // Register the theme
diff --git a/yarn.lock b/yarn.lock
index 96ec5213badcb2..983ad570e0f680 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3944,6 +3944,11 @@
   resolved "https://registry.yarnpkg.com/@types/parse-link-header/-/parse-link-header-1.0.0.tgz#69f059e40a0fa93dc2e095d4142395ae6adc5d7a"
   integrity sha512-fCA3btjE7QFeRLfcD0Sjg+6/CnmC66HpMBoRfRzd2raTaWMJV21CCZ0LO8MOqf8onl5n0EPfjq4zDhbyX8SVwA==
 
+"@types/pegjs@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@types/pegjs/-/pegjs-0.10.1.tgz#9a2f3961dc62430fdb21061eb0ddbd890f9e3b94"
+  integrity sha512-ra8IchO9odGQmYKbm+94K58UyKCEKdZh9y0vxhG4pIpOJOBlC1C+ZtBVr6jLs+/oJ4pl+1p/4t3JtBA8J10Vvw==
+
 "@types/pngjs@^3.3.2":
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/@types/pngjs/-/pngjs-3.3.2.tgz#8ed3bd655ab3a92ea32ada7a21f618e63b93b1d4"

From 58f792cee3e7668ac9f24809a904a600c6c46762 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Thu, 9 Jan 2020 11:56:14 +0100
Subject: [PATCH 75/96] Remove eslint overwrite for
 src/legacy/core_plugins/kibana (#54222)

* Cleanup code
* Remove eslint overwrite
---
 .eslintrc.js                                     |  7 -------
 .../np_ready/components/doc/use_es_doc_search.ts |  2 +-
 .../field_chooser/discover_field_search.tsx      | 11 ++++++-----
 .../field_chooser/discover_index_pattern.tsx     | 14 +++++++-------
 ...e.ts => discover_index_pattern_directive.tsx} | 16 ++++++++++++++--
 5 files changed, 28 insertions(+), 22 deletions(-)
 rename src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/{discover_index_pattern_directive.ts => discover_index_pattern_directive.tsx} (65%)

diff --git a/.eslintrc.js b/.eslintrc.js
index c43366abf0c3d8..9719d1b35548ea 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -82,13 +82,6 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['src/legacy/core_plugins/kibana/**/*.{js,ts,tsx}'],
-      rules: {
-        'react-hooks/rules-of-hooks': 'off',
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: ['src/legacy/core_plugins/tile_map/**/*.{js,ts,tsx}'],
       rules: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
index a40d9731a04f5f..d3bf3696c08a5c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
@@ -91,7 +91,7 @@ export function useEsDocSearch({
 
   useEffect(() => {
     requestData();
-  }, []);
+  });
 
   return [status, hit, indexPattern];
 }
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.tsx
index d5f6b63d121992..2910ff2825fe7d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.tsx
@@ -67,11 +67,6 @@ export interface Props {
  * Additionally there's a button displayed that allows the user to show/hide more filter fields
  */
 export function DiscoverFieldSearch({ onChange, value, types }: Props) {
-  if (typeof value !== 'string') {
-    // at initial rendering value is undefined (angular related), this catches the warning
-    // should be removed once all is react
-    return null;
-  }
   const searchPlaceholder = i18n.translate('kbn.discover.fieldChooser.searchPlaceHolder', {
     defaultMessage: 'Search field names',
   });
@@ -99,6 +94,12 @@ export function DiscoverFieldSearch({ onChange, value, types }: Props) {
     missing: true,
   });
 
+  if (typeof value !== 'string') {
+    // at initial rendering value is undefined (angular related), this catches the warning
+    // should be removed once all is react
+    return null;
+  }
+
   const filterBtnAriaLabel = isPopoverOpen
     ? i18n.translate('kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel', {
         defaultMessage: 'Hide field filter settings',
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx
index 37338decce2c29..a4e8ee2ca3d8aa 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx
@@ -45,19 +45,19 @@ export function DiscoverIndexPattern({
   selectedIndexPattern,
   setIndexPattern,
 }: DiscoverIndexPatternProps) {
-  if (!indexPatternList || indexPatternList.length === 0 || !selectedIndexPattern) {
-    // just in case, shouldn't happen
-    return null;
-  }
-  const options: IndexPatternRef[] = indexPatternList.map(entity => ({
+  const options: IndexPatternRef[] = (indexPatternList || []).map(entity => ({
     id: entity.id,
     title: entity.attributes!.title,
   }));
+  const { id: selectedId, attributes } = selectedIndexPattern || {};
 
   const [selected, setSelected] = useState({
-    id: selectedIndexPattern.id,
-    title: selectedIndexPattern.attributes!.title,
+    id: selectedId,
+    title: attributes?.title || '',
   });
+  if (!selectedId) {
+    return null;
+  }
 
   return (
     <div className="indexPattern__container">
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.tsx
similarity index 65%
rename from src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.tsx
index 8bbeac086f093d..d6527b0d7beedf 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.tsx
@@ -16,11 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import React from 'react';
 import { wrapInI18nContext } from '../../../kibana_services';
-import { DiscoverIndexPattern } from './discover_index_pattern';
+import { DiscoverIndexPattern, DiscoverIndexPatternProps } from './discover_index_pattern';
+
+/**
+ * At initial rendering the angular directive the selectedIndexPattern prop is undefined
+ * This wrapper catches this, had to be introduced to satisfy eslint
+ */
+export function DiscoverIndexPatternWrapper(props: DiscoverIndexPatternProps) {
+  if (!props.selectedIndexPattern || !Array.isArray(props.indexPatternList)) {
+    return null;
+  }
+  return <DiscoverIndexPattern {...props} />;
+}
 
 export function createIndexPatternSelectDirective(reactDirective: any) {
-  return reactDirective(wrapInI18nContext(DiscoverIndexPattern), [
+  return reactDirective(wrapInI18nContext(DiscoverIndexPatternWrapper), [
     ['indexPatternList', { watchDepth: 'reference' }],
     ['selectedIndexPattern', { watchDepth: 'reference' }],
     ['setIndexPattern', { watchDepth: 'reference' }],

From 44660593277aa710b3afb6a416874095b5797009 Mon Sep 17 00:00:00 2001
From: DeFazio <michael.defazio@elastic.co>
Date: Thu, 9 Jan 2020 08:46:46 -0500
Subject: [PATCH 76/96] [ML] Updates Anomaly Detection job wizard button
 styles, page panel and titles (#53340)

* Update button styles, page panel and page title

* Add getJobCreatorTitle function for human readable job type name

* Add formatMessage to Create job title

* Fix translation test

* Update tests
---
 .../full_time_range_selector.test.tsx.snap    |  1 -
 .../full_time_range_selector.tsx              |  1 -
 .../common/job_creator/util/general.ts        | 28 ++++++++++
 .../components/wizard_nav/wizard_nav.tsx      | 15 ++++--
 .../jobs/new_job/pages/new_job/page.tsx       | 54 ++++++++++++++-----
 .../new_job/pages/new_job/wizard_steps.tsx    |  4 +-
 .../translations/translations/ja-JP.json      |  2 +-
 .../translations/translations/zh-CN.json      |  2 +-
 8 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
index 0e14f0b402fb29..d633b755ec6bab 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
@@ -3,7 +3,6 @@
 exports[`FullTimeRangeSelector renders the selector 1`] = `
 <EuiButton
   data-test-subj="mlButtonUseFullData"
-  fill={true}
   isDisabled={false}
   onClick={[Function]}
 >
diff --git a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
index ef2a4c28a570d1..4460ced7079c3d 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
@@ -31,7 +31,6 @@ export const FullTimeRangeSelector: FC<Props> = ({ indexPattern, query, disabled
   }
   return (
     <EuiButton
-      fill
       isDisabled={disabled}
       onClick={() => setRange(indexPattern, query)}
       data-test-subj="mlButtonUseFullData"
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
index 760dbe447dc894..29af08b8826eed 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { i18n } from '@kbn/i18n';
 import { Job, Datafeed, Detector } from '../configs';
 import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
 import {
@@ -270,3 +271,30 @@ export function advancedStartDatafeed(jobCreator: JobCreatorType) {
 export function aggFieldPairsCanBeCharted(afs: AggFieldPair[]) {
   return afs.some(a => a.agg.dslName === null) === false;
 }
+
+export function getJobCreatorTitle(jobCreator: JobCreatorType) {
+  switch (jobCreator.type) {
+    case JOB_TYPE.SINGLE_METRIC:
+      return i18n.translate('xpack.ml.newJob.wizard.jobCreatorTitle.singleMetric', {
+        defaultMessage: 'Single metric',
+      });
+    case JOB_TYPE.MULTI_METRIC:
+      return i18n.translate('xpack.ml.newJob.wizard.jobCreatorTitle.multiMetric', {
+        defaultMessage: 'Multi metric',
+      });
+    case JOB_TYPE.POPULATION:
+      return i18n.translate('xpack.ml.newJob.wizard.jobCreatorTitle.population', {
+        defaultMessage: 'Population',
+      });
+    case JOB_TYPE.ADVANCED:
+      return i18n.translate('xpack.ml.newJob.wizard.jobCreatorTitle.advanced', {
+        defaultMessage: 'Advanced',
+      });
+    // case JOB_TYPE.CATEGORIZATION:
+    //   return i18n.translate('xpack.ml.newJob.wizard.jobCreatorTitle.categorization', {
+    //     defaultMessage: 'Categorization',
+    //   });
+    default:
+      return '';
+  }
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/wizard_nav/wizard_nav.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/wizard_nav/wizard_nav.tsx
index b0c5758fdd2e7c..92429cf907592d 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/wizard_nav/wizard_nav.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/wizard_nav/wizard_nav.tsx
@@ -8,7 +8,13 @@ import React, { FC, Fragment } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+} from '@elastic/eui';
 
 interface StepsNavProps {
   previousActive?: boolean;
@@ -44,20 +50,23 @@ export const WizardNav: FC<StepsNavProps> = ({
 );
 
 export const PreviousButton: FC<StepsNavProps> = ({ previous, previousActive = true }) => (
-  <EuiButton
+  <EuiButtonEmpty
     disabled={!previousActive}
     onClick={previous}
     iconType="arrowLeft"
+    iconSide="left"
     data-test-subj="mlJobWizardNavButtonPrevious"
   >
     <FormattedMessage id="xpack.ml.newJob.wizard.previousStepButton" defaultMessage="Previous" />
-  </EuiButton>
+  </EuiButtonEmpty>
 );
 
 export const NextButton: FC<StepsNavProps> = ({ next, nextActive = true }) => (
   <EuiButton
+    fill
     disabled={!nextActive}
     onClick={next}
+    iconSide="right"
     iconType="arrowRight"
     data-test-subj="mlJobWizardNavButtonNext"
   >
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
index 79f98c1170ff8d..2e025c49318181 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
@@ -5,13 +5,22 @@
  */
 
 import React, { FC, useEffect, Fragment } from 'react';
-
-import { EuiPage, EuiPageBody, EuiPageContentBody } from '@elastic/eui';
+import {
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentHeader,
+  EuiPageContentHeaderSection,
+  EuiTitle,
+  EuiPageContentBody,
+} from '@elastic/eui';
 import { toastNotifications } from 'ui/notify';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { Wizard } from './wizard';
 import { WIZARD_STEPS } from '../components/step_types';
 import { jobCreatorFactory, isAdvancedJobCreator } from '../../common/job_creator';
+import { getJobCreatorTitle } from '../../common/job_creator/util/general';
 import {
   JOB_TYPE,
   DEFAULT_MODEL_MEMORY_LIMIT,
@@ -37,7 +46,6 @@ export interface PageProps {
 
 export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
   const kibanaContext = useKibanaContext();
-
   const jobCreator = jobCreatorFactory(jobType)(
     kibanaContext.currentIndexPattern,
     kibanaContext.currentSavedSearch,
@@ -149,21 +157,39 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
     };
   });
 
+  const jobCreatorTitle = getJobCreatorTitle(jobCreator);
+
   return (
     <Fragment>
       <EuiPage style={{ backgroundColor: 'inherit' }} data-test-subj={`mlPageJobWizard ${jobType}`}>
         <EuiPageBody>
-          <EuiPageContentBody>
-            <Wizard
-              jobCreator={jobCreator}
-              chartLoader={chartLoader}
-              resultsLoader={resultsLoader}
-              chartInterval={chartInterval}
-              jobValidator={jobValidator}
-              existingJobsAndGroups={existingJobsAndGroups}
-              firstWizardStep={firstWizardStep}
-            />
-          </EuiPageContentBody>
+          <EuiPageContent>
+            <EuiPageContentHeader>
+              <EuiPageContentHeaderSection>
+                <EuiTitle>
+                  <h2>
+                    <FormattedMessage
+                      id="xpack.ml.newJob.page.createJob"
+                      defaultMessage="Create job"
+                    />
+                    : {jobCreatorTitle}
+                  </h2>
+                </EuiTitle>
+              </EuiPageContentHeaderSection>
+            </EuiPageContentHeader>
+
+            <EuiPageContentBody>
+              <Wizard
+                jobCreator={jobCreator}
+                chartLoader={chartLoader}
+                resultsLoader={resultsLoader}
+                chartInterval={chartInterval}
+                jobValidator={jobValidator}
+                existingJobsAndGroups={existingJobsAndGroups}
+                firstWizardStep={firstWizardStep}
+              />
+            </EuiPageContentBody>
+          </EuiPageContent>
         </EuiPageBody>
       </EuiPage>
     </Fragment>
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx
index 8e81c05092c98b..df21e70a68ed97 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx
@@ -143,8 +143,8 @@ export const WizardSteps: FC<Props> = ({ currentStep, setCurrentStep }) => {
 const Title: FC<{ 'data-test-subj': string }> = ({ 'data-test-subj': dataTestSubj, children }) => {
   return (
     <Fragment>
-      <EuiTitle>
-        <h2 data-test-subj={dataTestSubj}>{children}</h2>
+      <EuiTitle size="s">
+        <h3 data-test-subj={dataTestSubj}>{children}</h3>
       </EuiTitle>
       <EuiSpacer />
     </Fragment>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 545a4fc7c8f936..ee33ff5c568aaa 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -12704,4 +12704,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 05251d20a66e41..ced7c4e822c27f 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -12793,4 +12793,4 @@
     "xpack.licensing.welcomeBanner.licenseIsExpiredDescription.updateYourLicenseLinkText": "更新您的许可",
     "xpack.licensing.welcomeBanner.licenseIsExpiredTitle": "您的{licenseType}许可已过期"
   }
-}
+}
\ No newline at end of file

From a8c2d5cd58f9d34dc1c33999cf1590237b25356c Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Thu, 9 Jan 2020 17:19:56 +0300
Subject: [PATCH 77/96] [NP] Add lifecycle timeout (#54129)

* add promise timeout decorator

* crash Kibana if lifecycle takes > 30sec

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../public/plugins/plugins_service.test.ts    | 59 +++++++++++++++++
 src/core/public/plugins/plugins_service.ts    | 26 +++++---
 .../server/plugins/plugins_system.test.ts     | 48 ++++++++++++++
 src/core/server/plugins/plugins_system.ts     | 27 +++++---
 src/core/utils/index.ts                       |  1 +
 src/core/utils/promise.test.ts                | 63 +++++++++++++++++++
 src/core/utils/promise.ts                     | 33 ++++++++++
 7 files changed, 237 insertions(+), 20 deletions(-)
 create mode 100644 src/core/utils/promise.test.ts
 create mode 100644 src/core/utils/promise.ts

diff --git a/src/core/public/plugins/plugins_service.test.ts b/src/core/public/plugins/plugins_service.test.ts
index 281778f9420dd6..cafc7e5887e385 100644
--- a/src/core/public/plugins/plugins_service.test.ts
+++ b/src/core/public/plugins/plugins_service.test.ts
@@ -279,6 +279,37 @@ describe('PluginsService', () => {
       expect((contracts.get('pluginA')! as any).setupValue).toEqual(1);
       expect((contracts.get('pluginB')! as any).pluginAPlusB).toEqual(2);
     });
+
+    describe('timeout', () => {
+      const flushPromises = () => new Promise(resolve => setImmediate(resolve));
+      beforeAll(() => {
+        jest.useFakeTimers();
+      });
+      afterAll(() => {
+        jest.useRealTimers();
+      });
+
+      it('throws timeout error if "setup" was not completed in 30 sec.', async () => {
+        mockPluginInitializers.set(
+          'pluginA',
+          jest.fn(() => ({
+            setup: jest.fn(() => new Promise(i => i)),
+            start: jest.fn(() => ({ value: 1 })),
+            stop: jest.fn(),
+          }))
+        );
+        const pluginsService = new PluginsService(mockCoreContext, plugins);
+        const promise = pluginsService.setup(mockSetupDeps);
+
+        jest.runAllTimers(); // load plugin bundles
+        await flushPromises();
+        jest.runAllTimers(); // setup plugins
+
+        await expect(promise).rejects.toMatchInlineSnapshot(
+          `[Error: Setup lifecycle of "pluginA" plugin wasn't completed in 30sec. Consider disabling the plugin and re-start.]`
+        );
+      });
+    });
   });
 
   describe('#start()', () => {
@@ -331,6 +362,34 @@ describe('PluginsService', () => {
       expect((contracts.get('pluginA')! as any).startValue).toEqual(2);
       expect((contracts.get('pluginB')! as any).pluginAPlusB).toEqual(3);
     });
+    describe('timeout', () => {
+      beforeAll(() => {
+        jest.useFakeTimers();
+      });
+      afterAll(() => {
+        jest.useRealTimers();
+      });
+
+      it('throws timeout error if "start" was not completed in 30 sec.', async () => {
+        mockPluginInitializers.set(
+          'pluginA',
+          jest.fn(() => ({
+            setup: jest.fn(() => ({ value: 1 })),
+            start: jest.fn(() => new Promise(i => i)),
+            stop: jest.fn(),
+          }))
+        );
+        const pluginsService = new PluginsService(mockCoreContext, plugins);
+        await pluginsService.setup(mockSetupDeps);
+
+        const promise = pluginsService.start(mockStartDeps);
+        jest.runAllTimers();
+
+        await expect(promise).rejects.toMatchInlineSnapshot(
+          `[Error: Start lifecycle of "pluginA" plugin wasn't completed in 30sec. Consider disabling the plugin and re-start.]`
+        );
+      });
+    });
   });
 
   describe('#stop()', () => {
diff --git a/src/core/public/plugins/plugins_service.ts b/src/core/public/plugins/plugins_service.ts
index c1939a33976474..8e1574d05baf8e 100644
--- a/src/core/public/plugins/plugins_service.ts
+++ b/src/core/public/plugins/plugins_service.ts
@@ -28,7 +28,9 @@ import {
 } from './plugin_context';
 import { InternalCoreSetup, InternalCoreStart } from '../core_system';
 import { InjectedPluginMetadata } from '../injected_metadata';
+import { withTimeout } from '../../utils';
 
+const Sec = 1000;
 /** @internal */
 export type PluginsServiceSetupDeps = InternalCoreSetup;
 /** @internal */
@@ -110,13 +112,15 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
         {} as Record<PluginName, unknown>
       );
 
-      contracts.set(
-        pluginName,
-        await plugin.setup(
+      const contract = await withTimeout({
+        promise: plugin.setup(
           createPluginSetupContext(this.coreContext, deps, plugin),
           pluginDepContracts
-        )
-      );
+        ),
+        timeout: 30 * Sec,
+        errorMessage: `Setup lifecycle of "${pluginName}" plugin wasn't completed in 30sec. Consider disabling the plugin and re-start.`,
+      });
+      contracts.set(pluginName, contract);
 
       this.satupPlugins.push(pluginName);
     }
@@ -142,13 +146,15 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
         {} as Record<PluginName, unknown>
       );
 
-      contracts.set(
-        pluginName,
-        await plugin.start(
+      const contract = await withTimeout({
+        promise: plugin.start(
           createPluginStartContext(this.coreContext, deps, plugin),
           pluginDepContracts
-        )
-      );
+        ),
+        timeout: 30 * Sec,
+        errorMessage: `Start lifecycle of "${pluginName}" plugin wasn't completed in 30sec. Consider disabling the plugin and re-start.`,
+      });
+      contracts.set(pluginName, contract);
     }
 
     // Expose start contracts
diff --git a/src/core/server/plugins/plugins_system.test.ts b/src/core/server/plugins/plugins_system.test.ts
index 18c04af3bb6413..22dfbeecbaedd8 100644
--- a/src/core/server/plugins/plugins_system.test.ts
+++ b/src/core/server/plugins/plugins_system.test.ts
@@ -414,3 +414,51 @@ test('`startPlugins` only starts plugins that were setup', async () => {
     ]
   `);
 });
+
+describe('setup', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+  it('throws timeout error if "setup" was not completed in 30 sec.', async () => {
+    const plugin: PluginWrapper = createPlugin('timeout-setup');
+    jest.spyOn(plugin, 'setup').mockImplementation(() => new Promise(i => i));
+    pluginsSystem.addPlugin(plugin);
+    mockCreatePluginSetupContext.mockImplementation(() => ({}));
+
+    const promise = pluginsSystem.setupPlugins(setupDeps);
+    jest.runAllTimers();
+
+    await expect(promise).rejects.toMatchInlineSnapshot(
+      `[Error: Setup lifecycle of "timeout-setup" plugin wasn't completed in 30sec. Consider disabling the plugin and re-start.]`
+    );
+  });
+});
+
+describe('start', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+  it('throws timeout error if "start" was not completed in 30 sec.', async () => {
+    const plugin: PluginWrapper = createPlugin('timeout-start');
+    jest.spyOn(plugin, 'setup').mockResolvedValue({});
+    jest.spyOn(plugin, 'start').mockImplementation(() => new Promise(i => i));
+
+    pluginsSystem.addPlugin(plugin);
+    mockCreatePluginSetupContext.mockImplementation(() => ({}));
+    mockCreatePluginStartContext.mockImplementation(() => ({}));
+
+    await pluginsSystem.setupPlugins(setupDeps);
+    const promise = pluginsSystem.startPlugins(startDeps);
+    jest.runAllTimers();
+
+    await expect(promise).rejects.toMatchInlineSnapshot(
+      `[Error: Start lifecycle of "timeout-start" plugin wasn't completed in 30sec. Consider disabling the plugin and re-start.]`
+    );
+  });
+});
diff --git a/src/core/server/plugins/plugins_system.ts b/src/core/server/plugins/plugins_system.ts
index f437b51e5b07a7..dd2df7c8e01d1f 100644
--- a/src/core/server/plugins/plugins_system.ts
+++ b/src/core/server/plugins/plugins_system.ts
@@ -23,7 +23,9 @@ import { PluginWrapper } from './plugin';
 import { DiscoveredPlugin, PluginName, PluginOpaqueId } from './types';
 import { createPluginSetupContext, createPluginStartContext } from './plugin_context';
 import { PluginsServiceSetupDeps, PluginsServiceStartDeps } from './plugins_service';
+import { withTimeout } from '../../utils';
 
+const Sec = 1000;
 /** @internal */
 export class PluginsSystem {
   private readonly plugins = new Map<PluginName, PluginWrapper>();
@@ -85,14 +87,16 @@ export class PluginsSystem {
         return depContracts;
       }, {} as Record<PluginName, unknown>);
 
-      contracts.set(
-        pluginName,
-        await plugin.setup(
+      const contract = await withTimeout({
+        promise: plugin.setup(
           createPluginSetupContext(this.coreContext, deps, plugin),
           pluginDepContracts
-        )
-      );
+        ),
+        timeout: 30 * Sec,
+        errorMessage: `Setup lifecycle of "${pluginName}" plugin wasn't completed in 30sec. Consider disabling the plugin and re-start.`,
+      });
 
+      contracts.set(pluginName, contract);
       this.satupPlugins.push(pluginName);
     }
 
@@ -121,13 +125,16 @@ export class PluginsSystem {
         return depContracts;
       }, {} as Record<PluginName, unknown>);
 
-      contracts.set(
-        pluginName,
-        await plugin.start(
+      const contract = await withTimeout({
+        promise: plugin.start(
           createPluginStartContext(this.coreContext, deps, plugin),
           pluginDepContracts
-        )
-      );
+        ),
+        timeout: 30 * Sec,
+        errorMessage: `Start lifecycle of "${pluginName}" plugin wasn't completed in 30sec. Consider disabling the plugin and re-start.`,
+      });
+
+      contracts.set(pluginName, contract);
     }
 
     return contracts;
diff --git a/src/core/utils/index.ts b/src/core/utils/index.ts
index b51cc4ef56410e..7f8645e2e2e404 100644
--- a/src/core/utils/index.ts
+++ b/src/core/utils/index.ts
@@ -24,5 +24,6 @@ export * from './get';
 export * from './map_to_object';
 export * from './merge';
 export * from './pick';
+export * from './promise';
 export * from './url';
 export * from './unset';
diff --git a/src/core/utils/promise.test.ts b/src/core/utils/promise.test.ts
new file mode 100644
index 00000000000000..97d16c5158c7b8
--- /dev/null
+++ b/src/core/utils/promise.test.ts
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { withTimeout } from './promise';
+
+const delay = (ms: number, resolveValue?: any) =>
+  new Promise(resolve => setTimeout(resolve, ms, resolveValue));
+
+describe('withTimeout', () => {
+  it('resolves with a promise value if resolved in given timeout', async () => {
+    await expect(
+      withTimeout({
+        promise: delay(10, 'value'),
+        timeout: 200,
+        errorMessage: 'error-message',
+      })
+    ).resolves.toBe('value');
+  });
+
+  it('rejects with errorMessage if not resolved in given time', async () => {
+    await expect(
+      withTimeout({
+        promise: delay(200, 'value'),
+        timeout: 10,
+        errorMessage: 'error-message',
+      })
+    ).rejects.toMatchInlineSnapshot(`[Error: error-message]`);
+
+    await expect(
+      withTimeout({
+        promise: new Promise(i => i),
+        timeout: 10,
+        errorMessage: 'error-message',
+      })
+    ).rejects.toMatchInlineSnapshot(`[Error: error-message]`);
+  });
+
+  it('does not swallow promise error', async () => {
+    await expect(
+      withTimeout({
+        promise: Promise.reject(new Error('from-promise')),
+        timeout: 10,
+        errorMessage: 'error-message',
+      })
+    ).rejects.toMatchInlineSnapshot(`[Error: from-promise]`);
+  });
+});
diff --git a/src/core/utils/promise.ts b/src/core/utils/promise.ts
new file mode 100644
index 00000000000000..ae1db9c54eda57
--- /dev/null
+++ b/src/core/utils/promise.ts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export function withTimeout<T>({
+  promise,
+  timeout,
+  errorMessage,
+}: {
+  promise: Promise<T>;
+  timeout: number;
+  errorMessage: string;
+}) {
+  return Promise.race([
+    promise,
+    new Promise((resolve, reject) => setTimeout(() => reject(new Error(errorMessage)), timeout)),
+  ]) as Promise<T>;
+}

From 2d15b8c82b1981f7eca2cae20994c8ffcd83e211 Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrew@andrewvc.com>
Date: Thu, 9 Jan 2020 08:36:31 -0600
Subject: [PATCH 78/96] [Uptime] Improve query performance with Heartbeat 7.6+
 data. (#52433)

This PR optimizes both the snapshot component and the monitor list on the overview page by using the new monitor.timespan field from elastic/beats#14778. Note that the functionality here will work with heartbeats lacking that patch, but the performance improvements will be absent.

This PR adapts the snapshot tests to use synthetically generated data which should be easier to maintain. As a result some of that code is refactored as well.

See #52433 parent issue as well.
---
 .../uptime/common/graphql/introspection.json  |  12 --
 .../plugins/uptime/common/graphql/types.ts    |   2 -
 .../runtime_types/snapshot/snapshot_count.ts  |   1 -
 .../functional/__tests__/snapshot.test.tsx    |   1 -
 .../__snapshots__/donut_chart.test.tsx.snap   |   2 +
 .../donut_chart_legend.test.tsx.snap          |   2 +
 .../donut_chart_legend_row.test.tsx.snap      |   1 +
 .../__tests__/donut_chart_legend_row.test.tsx |   2 +-
 .../functional/charts/donut_chart.tsx         |   2 +-
 .../functional/charts/donut_chart_legend.tsx  |   6 +-
 .../charts/donut_chart_legend_row.tsx         |   7 +-
 .../monitor_list_drawer/__tests__/data.json   |   2 -
 .../monitor_list_status_column.tsx            |   6 -
 .../__snapshots__/snapshot.test.ts.snap       |   7 +-
 .../state/api/__tests__/snapshot.test.ts      |   4 +-
 .../__snapshots__/snapshot.test.ts.snap       |   4 -
 .../state/reducers/__tests__/snapshot.test.ts |   3 +-
 .../uptime/public/state/reducers/snapshot.ts  |   1 -
 .../state/selectors/__tests__/index.test.ts   |   1 -
 .../get_snapshot_helper.test.ts.snap          |  10 --
 .../__tests__/get_snapshot_helper.test.ts     | 106 --------------
 .../elasticsearch_monitor_states_adapter.ts   | 116 +++++++++++----
 .../monitor_states/get_snapshot_helper.ts     |  40 ------
 .../search/__tests__/fetch_page.test.ts       |   2 +-
 .../__tests__/monitor_group_iterator.test.ts  |   2 +-
 .../search/__tests__/test_helpers.ts          |  13 +-
 .../search/enrich_monitor_groups.ts           |  48 +++----
 .../monitor_states/search/fetch_chunk.ts      |   2 +-
 .../monitor_states/search/fetch_page.ts       |   3 +-
 .../search/find_potential_matches.ts          |  20 +--
 .../search/monitor_group_iterator.ts          |   4 +-
 .../monitor_states/search/query_context.ts    | 135 ++++++++++++++++++
 .../search/refine_potential_matches.ts        |   5 +-
 .../translations/translations/ja-JP.json      |   6 +-
 .../translations/translations/zh-CN.json      |   6 +-
 .../uptime/graphql/fixtures/snapshot.json     |   5 +-
 .../graphql/fixtures/snapshot_empty.json      |   5 +-
 .../fixtures/snapshot_filtered_by_down.json   |   1 -
 .../fixtures/snapshot_filtered_by_up.json     |   5 +-
 .../uptime/graphql/helpers/make_checks.ts     |  76 +++++++++-
 .../apis/uptime/graphql/monitor_states.ts     |   7 +-
 .../api_integration/apis/uptime/rest/index.ts |   4 +-
 .../apis/uptime/rest/snapshot.ts              | 114 ++++++++++-----
 .../test/functional/apps/uptime/overview.ts   |  22 +++
 .../es_archives/uptime/blank/mappings.json    |   3 +
 .../functional/page_objects/uptime_page.ts    |   4 +
 x-pack/test/functional/services/uptime.ts     |   6 +
 47 files changed, 493 insertions(+), 343 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/__tests__/__snapshots__/get_snapshot_helper.test.ts.snap
 delete mode 100644 x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/__tests__/get_snapshot_helper.test.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/get_snapshot_helper.ts
 create mode 100644 x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/query_context.ts

diff --git a/x-pack/legacy/plugins/uptime/common/graphql/introspection.json b/x-pack/legacy/plugins/uptime/common/graphql/introspection.json
index 4d1993233e9ca6..29e8435e61b7b5 100644
--- a/x-pack/legacy/plugins/uptime/common/graphql/introspection.json
+++ b/x-pack/legacy/plugins/uptime/common/graphql/introspection.json
@@ -2173,18 +2173,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "mixed",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "total",
             "description": "",
diff --git a/x-pack/legacy/plugins/uptime/common/graphql/types.ts b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
index ed7c9ef19f484f..9998720d5e378e 100644
--- a/x-pack/legacy/plugins/uptime/common/graphql/types.ts
+++ b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
@@ -419,8 +419,6 @@ export interface SnapshotCount {
 
   down: number;
 
-  mixed: number;
-
   total: number;
 }
 
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts
index d4935c50ff5b8d..3abc25530a2dcf 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts
@@ -8,7 +8,6 @@ import * as t from 'io-ts';
 
 export const SnapshotType = t.type({
   down: t.number,
-  mixed: t.number,
   total: t.number,
   up: t.number,
 });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/snapshot.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/snapshot.test.tsx
index 193f37c8fe56b5..d645eb21ac7766 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/snapshot.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/snapshot.test.tsx
@@ -13,7 +13,6 @@ describe('Snapshot component', () => {
   const snapshot: Snapshot = {
     up: 8,
     down: 2,
-    mixed: 0,
     total: 10,
   };
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
index c8c4177a4907e9..9699a1842ccf14 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
@@ -103,6 +103,7 @@ exports[`DonutChart component renders a donut chart 1`] = `
         </span>
         <span
           class="euiFlexItem c2"
+          data-test-subj="xpack.uptime.snapshot.donutChart.down"
         >
           32
         </span>
@@ -150,6 +151,7 @@ exports[`DonutChart component renders a donut chart 1`] = `
         </span>
         <span
           class="euiFlexItem c2"
+          data-test-subj="xpack.uptime.snapshot.donutChart.up"
         >
           95
         </span>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart_legend.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart_legend.test.tsx.snap
index 3674497b538f38..e971576521b7d5 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart_legend.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart_legend.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`DonutChartLegend applies valid props as expected 1`] = `
   <DonutChartLegendRow
     color="#bd271e"
     content={23}
+    data-test-subj="xpack.uptime.snapshot.donutChart.down"
     message="Down"
   />
   <EuiSpacer
@@ -13,6 +14,7 @@ exports[`DonutChartLegend applies valid props as expected 1`] = `
   <DonutChartLegendRow
     color="#d3dae6"
     content={45}
+    data-test-subj="xpack.uptime.snapshot.donutChart.up"
     message="Up"
   />
 </styled.div>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart_legend_row.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart_legend_row.test.tsx.snap
index 5f6508e299a28b..bc6033ea7109ab 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart_legend_row.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart_legend_row.test.tsx.snap
@@ -21,6 +21,7 @@ exports[`DonutChartLegendRow passes appropriate props 1`] = `
   </Styled(EuiFlexItem)>
   <Styled(EuiFlexItem)
     component="span"
+    data-test-subj="foo"
   >
     23
   </Styled(EuiFlexItem)>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/donut_chart_legend_row.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/donut_chart_legend_row.test.tsx
index 82e2279edd8926..49e887cc8f96c2 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/donut_chart_legend_row.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/donut_chart_legend_row.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 describe('DonutChartLegendRow', () => {
   it('passes appropriate props', () => {
     const wrapper = shallowWithIntl(
-      <DonutChartLegendRow color="green" message="Foo" content={23} />
+      <DonutChartLegendRow color="green" message="Foo" content={23} data-test-subj="foo" />
     );
     expect(wrapper).toMatchSnapshot();
   });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart.tsx
index e2705e7cbacb31..50dca8577455d3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart.tsx
@@ -73,7 +73,7 @@ export const DonutChart = ({ height, down, up, width }: DonutChartProps) => {
     <EuiFlexGroup alignItems="center" responsive={false}>
       <EuiFlexItem grow={false}>
         <svg
-          aria-label={i18n.translate('xpack.uptime.donutChart.ariaLabel', {
+          aria-label={i18n.translate('xpack.uptime.snapshot.donutChart.ariaLabel', {
             defaultMessage:
               'Pie chart showing the current status. {down} of {total} monitors are down.',
             values: { down, total: up + down },
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart_legend.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart_legend.tsx
index cc3a75d314b327..ff471f7ba5407d 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart_legend.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart_legend.tsx
@@ -34,17 +34,19 @@ export const DonutChartLegend = ({ down, up }: Props) => {
       <DonutChartLegendRow
         color={danger}
         content={down}
-        message={i18n.translate('xpack.uptime.donutChart.legend.downRowLabel', {
+        message={i18n.translate('xpack.uptime.snapshot.donutChart.legend.downRowLabel', {
           defaultMessage: 'Down',
         })}
+        data-test-subj={'xpack.uptime.snapshot.donutChart.down'}
       />
       <EuiSpacer size="m" />
       <DonutChartLegendRow
         color={gray}
         content={up}
-        message={i18n.translate('xpack.uptime.donutChart.legend.upRowLabel', {
+        message={i18n.translate('xpack.uptime.snapshot.donutChart.legend.upRowLabel', {
           defaultMessage: 'Up',
         })}
+        data-test-subj={'xpack.uptime.snapshot.donutChart.up'}
       />
     </LegendContainer>
   );
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart_legend_row.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart_legend_row.tsx
index bf684a3446b9a8..fc67a86db3b487 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart_legend_row.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart_legend_row.tsx
@@ -23,9 +23,10 @@ interface Props {
   color: string;
   message: string;
   content: string | number;
+  'data-test-subj': string;
 }
 
-export const DonutChartLegendRow = ({ color, content, message }: Props) => (
+export const DonutChartLegendRow = ({ color, content, message, 'data-test-subj': dts }: Props) => (
   <EuiFlexGroup gutterSize="l" responsive={false}>
     <EuiFlexItemReducedMargin component="span" grow={false}>
       <EuiHealth color={color} />
@@ -33,6 +34,8 @@ export const DonutChartLegendRow = ({ color, content, message }: Props) => (
     <EuiFlexItemReducedMargin component="span" grow={false}>
       {message}
     </EuiFlexItemReducedMargin>
-    <EuiFlexItemAlignRight component="span">{content}</EuiFlexItemAlignRight>
+    <EuiFlexItemAlignRight component="span" data-test-subj={dts}>
+      {content}
+    </EuiFlexItemAlignRight>
   </EuiFlexGroup>
 );
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/data.json b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/data.json
index 64adf3642fb228..a45e974685b9c9 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/data.json
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/data.json
@@ -271,7 +271,6 @@
             "monitor": {
               "id": null,
               "name": "elastic",
-              "status": "mixed",
               "type": null,
               "__typename": "MonitorState"
             },
@@ -377,7 +376,6 @@
             "monitor": {
               "id": null,
               "name": null,
-              "status": "mixed",
               "type": null,
               "__typename": "MonitorState"
             },
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx
index 463048512e1e0f..0a3a0962a4d09a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx
@@ -20,8 +20,6 @@ const getHealthColor = (status: string): string => {
       return 'success';
     case 'down':
       return 'danger';
-    case 'mixed':
-      return 'warning';
     default:
       return '';
   }
@@ -37,10 +35,6 @@ const getHealthMessage = (status: string): string | null => {
       return i18n.translate('xpack.uptime.monitorList.statusColumn.downLabel', {
         defaultMessage: 'Down',
       });
-    case 'mixed':
-      return i18n.translate('xpack.uptime.monitorList.statusColumn.mixedLabel', {
-        defaultMessage: 'Mixed',
-      });
     default:
       return null;
   }
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/__tests__/__snapshots__/snapshot.test.ts.snap b/x-pack/legacy/plugins/uptime/public/state/api/__tests__/__snapshots__/snapshot.test.ts.snap
index 53716681664c23..0d2392390c7e40 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/__tests__/__snapshots__/snapshot.test.ts.snap
+++ b/x-pack/legacy/plugins/uptime/public/state/api/__tests__/__snapshots__/snapshot.test.ts.snap
@@ -1,8 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`snapshot API throws when server response doesn't correspond to expected type 1`] = `
-[Error: Invalid value undefined supplied to : { down: number, mixed: number, total: number, up: number }/down: number
-Invalid value undefined supplied to : { down: number, mixed: number, total: number, up: number }/mixed: number
-Invalid value undefined supplied to : { down: number, mixed: number, total: number, up: number }/total: number
-Invalid value undefined supplied to : { down: number, mixed: number, total: number, up: number }/up: number]
+[Error: Invalid value undefined supplied to : { down: number, total: number, up: number }/down: number
+Invalid value undefined supplied to : { down: number, total: number, up: number }/total: number
+Invalid value undefined supplied to : { down: number, total: number, up: number }/up: number]
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/__tests__/snapshot.test.ts b/x-pack/legacy/plugins/uptime/public/state/api/__tests__/snapshot.test.ts
index f5fdfb172bc58c..e9b1391a23e32a 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/__tests__/snapshot.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/__tests__/snapshot.test.ts
@@ -14,7 +14,7 @@ describe('snapshot API', () => {
     fetchMock = jest.spyOn(window, 'fetch');
     mockResponse = {
       ok: true,
-      json: () => new Promise(r => r({ up: 3, down: 12, mixed: 0, total: 15 })),
+      json: () => new Promise(r => r({ up: 3, down: 12, total: 15 })),
     };
   });
 
@@ -34,7 +34,7 @@ describe('snapshot API', () => {
     expect(fetchMock).toHaveBeenCalledWith(
       '/api/uptime/snapshot/count?dateRangeStart=now-15m&dateRangeEnd=now&filters=monitor.id%3A%22auto-http-0X21EE76EAC459873F%22&statusFilter=up'
     );
-    expect(resp).toEqual({ up: 3, down: 12, mixed: 0, total: 15 });
+    expect(resp).toEqual({ up: 3, down: 12, total: 15 });
   });
 
   it(`throws when server response doesn't correspond to expected type`, async () => {
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/snapshot.test.ts.snap b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/snapshot.test.ts.snap
index d3a21ec9eece33..7a3c72f93d86fb 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/snapshot.test.ts.snap
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/snapshot.test.ts.snap
@@ -4,7 +4,6 @@ exports[`snapshot reducer appends a current error to existing errors list 1`] =
 Object {
   "count": Object {
     "down": 0,
-    "mixed": 0,
     "total": 0,
     "up": 0,
   },
@@ -19,7 +18,6 @@ exports[`snapshot reducer changes the count when a snapshot fetch succeeds 1`] =
 Object {
   "count": Object {
     "down": 15,
-    "mixed": 0,
     "total": 25,
     "up": 10,
   },
@@ -32,7 +30,6 @@ exports[`snapshot reducer sets the state's status to loading during a fetch 1`]
 Object {
   "count": Object {
     "down": 0,
-    "mixed": 0,
     "total": 0,
     "up": 0,
   },
@@ -45,7 +42,6 @@ exports[`snapshot reducer updates existing state 1`] = `
 Object {
   "count": Object {
     "down": 1,
-    "mixed": 0,
     "total": 4,
     "up": 3,
   },
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/snapshot.test.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/snapshot.test.ts
index a4b317d5af1979..95c576e0fd72e5 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/snapshot.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/snapshot.test.ts
@@ -21,7 +21,7 @@ describe('snapshot reducer', () => {
     expect(
       snapshotReducer(
         {
-          count: { down: 1, mixed: 0, total: 4, up: 3 },
+          count: { down: 1, total: 4, up: 3 },
           errors: [],
           loading: false,
         },
@@ -47,7 +47,6 @@ describe('snapshot reducer', () => {
       payload: {
         up: 10,
         down: 15,
-        mixed: 0,
         total: 25,
       },
     };
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/snapshot.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/snapshot.ts
index dd9449325f4fb9..2155d0e3a74e3c 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/snapshot.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/snapshot.ts
@@ -21,7 +21,6 @@ export interface SnapshotState {
 const initialState: SnapshotState = {
   count: {
     down: 0,
-    mixed: 0,
     total: 0,
     up: 0,
   },
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index 33b6400c56c608..23787706015940 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -19,7 +19,6 @@ describe('state selectors', () => {
       count: {
         up: 2,
         down: 0,
-        mixed: 0,
         total: 2,
       },
       errors: [],
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/__tests__/__snapshots__/get_snapshot_helper.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/__tests__/__snapshots__/get_snapshot_helper.test.ts.snap
deleted file mode 100644
index 29c82ff455d369..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/__tests__/__snapshots__/get_snapshot_helper.test.ts.snap
+++ /dev/null
@@ -1,10 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`get snapshot helper reduces check groups as expected 1`] = `
-Object {
-  "down": 1,
-  "mixed": 0,
-  "total": 3,
-  "up": 2,
-}
-`;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/__tests__/get_snapshot_helper.test.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/__tests__/get_snapshot_helper.test.ts
deleted file mode 100644
index 917e4a149de677..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/__tests__/get_snapshot_helper.test.ts
+++ /dev/null
@@ -1,106 +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 { getSnapshotCountHelper } from '../get_snapshot_helper';
-import { MonitorGroups } from '../search';
-
-describe('get snapshot helper', () => {
-  let mockIterator: any;
-  beforeAll(() => {
-    mockIterator = jest.fn();
-    const summaryTimestamp = new Date('2019-01-01');
-    const firstResult: MonitorGroups = {
-      id: 'firstGroup',
-      groups: [
-        {
-          monitorId: 'first-monitor',
-          location: 'us-east-1',
-          checkGroup: 'abc',
-          status: 'down',
-          summaryTimestamp,
-        },
-        {
-          monitorId: 'first-monitor',
-          location: 'us-west-1',
-          checkGroup: 'abc',
-          status: 'up',
-          summaryTimestamp,
-        },
-        {
-          monitorId: 'first-monitor',
-          location: 'amsterdam',
-          checkGroup: 'abc',
-          status: 'down',
-          summaryTimestamp,
-        },
-      ],
-    };
-    const secondResult: MonitorGroups = {
-      id: 'secondGroup',
-      groups: [
-        {
-          monitorId: 'second-monitor',
-          location: 'us-east-1',
-          checkGroup: 'yyz',
-          status: 'up',
-          summaryTimestamp,
-        },
-        {
-          monitorId: 'second-monitor',
-          location: 'us-west-1',
-          checkGroup: 'yyz',
-          status: 'up',
-          summaryTimestamp,
-        },
-        {
-          monitorId: 'second-monitor',
-          location: 'amsterdam',
-          checkGroup: 'yyz',
-          status: 'up',
-          summaryTimestamp,
-        },
-      ],
-    };
-    const thirdResult: MonitorGroups = {
-      id: 'thirdGroup',
-      groups: [
-        {
-          monitorId: 'third-monitor',
-          location: 'us-east-1',
-          checkGroup: 'dt',
-          status: 'up',
-          summaryTimestamp,
-        },
-        {
-          monitorId: 'third-monitor',
-          location: 'us-west-1',
-          checkGroup: 'dt',
-          status: 'up',
-          summaryTimestamp,
-        },
-        {
-          monitorId: 'third-monitor',
-          location: 'amsterdam',
-          checkGroup: 'dt',
-          status: 'up',
-          summaryTimestamp,
-        },
-      ],
-    };
-
-    const mockNext = jest
-      .fn()
-      .mockReturnValueOnce(firstResult)
-      .mockReturnValueOnce(secondResult)
-      .mockReturnValueOnce(thirdResult)
-      .mockReturnValueOnce(null);
-    mockIterator.next = mockNext;
-  });
-
-  it('reduces check groups as expected', async () => {
-    expect(await getSnapshotCountHelper(mockIterator)).toMatchSnapshot();
-  });
-});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts
index d264da2e7ec0c6..eaaa8087e57cdd 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts
@@ -4,22 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UMMonitorStatesAdapter, CursorPagination } from './adapter_types';
+import { UMMonitorStatesAdapter } from './adapter_types';
 import { INDEX_NAMES, CONTEXT_DEFAULTS } from '../../../../common/constants';
 import { fetchPage } from './search';
 import { MonitorGroupIterator } from './search/monitor_group_iterator';
-import { getSnapshotCountHelper } from './get_snapshot_helper';
-
-export interface QueryContext {
-  count: (query: Record<string, any>) => Promise<any>;
-  search: (query: Record<string, any>) => Promise<any>;
-  dateRangeStart: string;
-  dateRangeEnd: string;
-  pagination: CursorPagination;
-  filterClause: any | null;
-  size: number;
-  statusFilter?: string;
-}
+import { Snapshot } from '../../../../common/runtime_types';
+import { QueryContext } from './search/query_context';
 
 export const elasticsearchMonitorStatesAdapter: UMMonitorStatesAdapter = {
   // Gets a page of monitor states.
@@ -35,16 +25,15 @@ export const elasticsearchMonitorStatesAdapter: UMMonitorStatesAdapter = {
     statusFilter = statusFilter === null ? undefined : statusFilter;
     const size = 10;
 
-    const queryContext: QueryContext = {
-      count: (query: Record<string, any>): Promise<any> => callES('count', query),
-      search: (query: Record<string, any>): Promise<any> => callES('search', query),
+    const queryContext = new QueryContext(
+      callES,
       dateRangeStart,
       dateRangeEnd,
       pagination,
-      filterClause: filters && filters !== '' ? JSON.parse(filters) : null,
+      filters && filters !== '' ? JSON.parse(filters) : null,
       size,
-      statusFilter,
-    };
+      statusFilter
+    );
 
     const page = await fetchPage(queryContext);
 
@@ -55,18 +44,46 @@ export const elasticsearchMonitorStatesAdapter: UMMonitorStatesAdapter = {
     };
   },
 
-  getSnapshotCount: async ({ callES, dateRangeStart, dateRangeEnd, filters, statusFilter }) => {
-    const context: QueryContext = {
-      count: query => callES('count', query),
-      search: query => callES('search', query),
+  getSnapshotCount: async ({
+    callES,
+    dateRangeStart,
+    dateRangeEnd,
+    filters,
+    statusFilter,
+  }): Promise<Snapshot> => {
+    if (!(statusFilter === 'up' || statusFilter === 'down' || statusFilter === undefined)) {
+      throw new Error(`Invalid status filter value '${statusFilter}'`);
+    }
+
+    const context = new QueryContext(
+      callES,
       dateRangeStart,
       dateRangeEnd,
-      pagination: CONTEXT_DEFAULTS.CURSOR_PAGINATION,
-      filterClause: filters && filters !== '' ? JSON.parse(filters) : null,
-      size: CONTEXT_DEFAULTS.MAX_MONITORS_FOR_SNAPSHOT_COUNT,
-      statusFilter,
+      CONTEXT_DEFAULTS.CURSOR_PAGINATION,
+      filters && filters !== '' ? JSON.parse(filters) : null,
+      CONTEXT_DEFAULTS.MAX_MONITORS_FOR_SNAPSHOT_COUNT,
+      statusFilter
+    );
+
+    // Calculate the total, up, and down counts.
+    const counts = await fastStatusCount(context);
+
+    // Check if the last count was accurate, if not, we need to perform a slower count with the
+    // MonitorGroupsIterator.
+    if (!(await context.hasTimespan())) {
+      // Figure out whether 'up' or 'down' is more common. It's faster to count the lower cardinality
+      // one then use subtraction to figure out its opposite.
+      const [leastCommonStatus, mostCommonStatus]: Array<'up' | 'down'> =
+        counts.up > counts.down ? ['down', 'up'] : ['up', 'down'];
+      counts[leastCommonStatus] = await slowStatusCount(context, leastCommonStatus);
+      counts[mostCommonStatus] = counts.total - counts[leastCommonStatus];
+    }
+
+    return {
+      total: statusFilter ? counts[statusFilter] : counts.total,
+      up: statusFilter === 'down' ? 0 : counts.up,
+      down: statusFilter === 'up' ? 0 : counts.down,
     };
-    return getSnapshotCountHelper(new MonitorGroupIterator(context));
   },
 
   statesIndexExists: async ({ callES }) => {
@@ -92,3 +109,46 @@ const jsonifyPagination = (p: any): string | null => {
 
   return JSON.stringify(p);
 };
+
+const fastStatusCount = async (context: QueryContext): Promise<Snapshot> => {
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      size: 0,
+      query: { bool: { filter: await context.dateAndCustomFilters() } },
+      aggs: {
+        unique: {
+          // We set the precision threshold to 40k which is the max precision supported by cardinality
+          cardinality: { field: 'monitor.id', precision_threshold: 40000 },
+        },
+        down: {
+          filter: { range: { 'summary.down': { gt: 0 } } },
+          aggs: {
+            unique: { cardinality: { field: 'monitor.id', precision_threshold: 40000 } },
+          },
+        },
+      },
+    },
+  };
+
+  const statistics = await context.search(params);
+  const total = statistics.aggregations.unique.value;
+  const down = statistics.aggregations.down.unique.value;
+
+  return {
+    total,
+    down,
+    up: total - down,
+  };
+};
+
+const slowStatusCount = async (context: QueryContext, status: string): Promise<number> => {
+  const downContext = context.clone();
+  downContext.statusFilter = status;
+  const iterator = new MonitorGroupIterator(downContext);
+  let count = 0;
+  while (await iterator.next()) {
+    count++;
+  }
+  return count;
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/get_snapshot_helper.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/get_snapshot_helper.ts
deleted file mode 100644
index 8bd21b77406df1..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/get_snapshot_helper.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { MonitorGroups, MonitorGroupIterator } from './search';
-import { Snapshot } from '../../../../common/runtime_types';
-
-const reduceItemsToCounts = (items: MonitorGroups[]) => {
-  let down = 0;
-  let up = 0;
-  items.forEach(item => {
-    if (item.groups.some(group => group.status === 'down')) {
-      down++;
-    } else {
-      up++;
-    }
-  });
-  return {
-    down,
-    mixed: 0,
-    total: down + up,
-    up,
-  };
-};
-
-export const getSnapshotCountHelper = async (iterator: MonitorGroupIterator): Promise<Snapshot> => {
-  const items: MonitorGroups[] = [];
-  let res: MonitorGroups | null;
-  // query the index to find the most recent check group for each monitor/location
-  do {
-    res = await iterator.next();
-    if (res) {
-      items.push(res);
-    }
-  } while (res !== null);
-
-  return reduceItemsToCounts(items);
-};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/fetch_page.test.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/fetch_page.test.ts
index d571a5a902539d..0bbdaa87a5e661 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/fetch_page.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/fetch_page.test.ts
@@ -11,7 +11,7 @@ import {
   MonitorGroupsFetcher,
   MonitorGroupsPage,
 } from '../fetch_page';
-import { QueryContext } from '../../elasticsearch_monitor_states_adapter';
+import { QueryContext } from '../query_context';
 import { MonitorSummary } from '../../../../../../common/graphql/types';
 import { nextPagination, prevPagination, simpleQueryContext } from './test_helpers';
 
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/monitor_group_iterator.test.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/monitor_group_iterator.test.ts
index b8df3b635dc6ba..0ce5e75195475f 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/monitor_group_iterator.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/monitor_group_iterator.test.ts
@@ -11,8 +11,8 @@ import {
   MonitorGroupIterator,
 } from '../monitor_group_iterator';
 import { simpleQueryContext } from './test_helpers';
-import { QueryContext } from '../../elasticsearch_monitor_states_adapter';
 import { MonitorGroups } from '../fetch_page';
+import { QueryContext } from '../query_context';
 
 describe('iteration', () => {
   let iterator: MonitorGroupIterator | null = null;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts
index d6fe5f82e735d8..bb3f3da3e289da 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts
@@ -6,7 +6,7 @@
 
 import { CursorPagination } from '../../adapter_types';
 import { CursorDirection, SortOrder } from '../../../../../../common/graphql/types';
-import { QueryContext } from '../../elasticsearch_monitor_states_adapter';
+import { QueryContext } from '../query_context';
 
 export const prevPagination = (key: any): CursorPagination => {
   return {
@@ -23,14 +23,5 @@ export const nextPagination = (key: any): CursorPagination => {
   };
 };
 export const simpleQueryContext = (): QueryContext => {
-  return {
-    count: _query => new Promise(r => ({})),
-    search: _query => new Promise(r => ({})),
-    dateRangeEnd: '',
-    dateRangeStart: '',
-    filterClause: undefined,
-    pagination: nextPagination('something'),
-    size: 0,
-    statusFilter: '',
-  };
+  return new QueryContext(undefined, '', '', nextPagination('something'), undefined, 0, '');
 };
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts
index 093e105635c2c9..b64015424ff401 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts
@@ -5,7 +5,7 @@
  */
 
 import { get, sortBy } from 'lodash';
-import { QueryContext } from '../elasticsearch_monitor_states_adapter';
+import { QueryContext } from './query_context';
 import { getHistogramIntervalFormatted } from '../../../helper';
 import { INDEX_NAMES, STATES } from '../../../../../common/constants';
 import {
@@ -77,19 +77,19 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                         }
                         String agentIdIP = agentId + "-" + (ip == null ? "" : ip.toString());
                         def ts = doc["@timestamp"][0].toInstant().toEpochMilli();
-                        
+
                         def lastCheck = state.checksByAgentIdIP[agentId];
                         Instant lastTs = lastCheck != null ? lastCheck["@timestamp"] : null;
                         if (lastTs != null && lastTs > ts) {
                           return;
                         }
-                        
+
                         curCheck.put("@timestamp", ts);
-                        
+
                         Map agent = new HashMap();
                         agent.id = agentId;
                         curCheck.put("agent", agent);
-                        
+
                         if (state.globals.url == null) {
                           Map url = new HashMap();
                           Collection fields = ["full", "original", "scheme", "username", "password", "domain", "port", "path", "query", "fragment"];
@@ -102,7 +102,7 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                           }
                           state.globals.url = url;
                         }
-                        
+
                         Map monitor = new HashMap();
                         monitor.status = doc["monitor.status"][0];
                         monitor.ip = ip;
@@ -113,7 +113,7 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                           }
                         }
                         curCheck.monitor = monitor;
-                        
+
                         if (curCheck.observer == null) {
                           curCheck.observer = new HashMap();
                         }
@@ -144,14 +144,14 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                         if (!doc["tls.certificate_not_valid_before"].isEmpty()) {
                           curCheck.tls.certificate_not_valid_before = doc["tls.certificate_not_valid_before"][0];
                         }
-                        
+
                         state.checksByAgentIdIP[agentIdIP] = curCheck;
                 `,
                 combine_script: 'return state;',
                 reduce_script: `
                         // The final document
                         Map result = new HashMap();
-                        
+
                         Map checks = new HashMap();
                         Instant maxTs = Instant.ofEpochMilli(0);
                         Collection ips = new HashSet();
@@ -159,7 +159,7 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                         Collection podUids = new HashSet();
                         Collection containerIds = new HashSet();
                         Collection tls = new HashSet();
-                        String name = null; 
+                        String name = null;
                         for (state in states) {
                           result.putAll(state.globals);
                           for (entry in state.checksByAgentIdIP.entrySet()) {
@@ -167,18 +167,18 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                             def check = entry.getValue();
                             def lastBestCheck = checks.get(agentIdIP);
                             def checkTs = Instant.ofEpochMilli(check.get("@timestamp"));
-                        
+
                             if (maxTs.isBefore(checkTs)) { maxTs = checkTs}
-                        
+
                             if (lastBestCheck == null || lastBestCheck.get("@timestamp") < checkTs) {
                               check["@timestamp"] = check["@timestamp"];
                               checks[agentIdIP] = check
                             }
-      
+
                             if (check.monitor.name != null && check.monitor.name != "") {
                               name = check.monitor.name;
                             }
-      
+
                             ips.add(check.monitor.ip);
                             if (check.observer != null && check.observer.geo != null && check.observer.geo.name != null) {
                               geoNames.add(check.observer.geo.name);
@@ -194,45 +194,45 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                             }
                           }
                         }
-                        
+
                         // We just use the values so we can store these as nested docs
                         result.checks = checks.values();
                         result.put("@timestamp", maxTs);
-                        
-                        
+
+
                         Map summary = new HashMap();
                         summary.up = checks.entrySet().stream().filter(c -> c.getValue().monitor.status == "up").count();
                         summary.down = checks.size() - summary.up;
                         result.summary = summary;
-                        
+
                         Map monitor = new HashMap();
                         monitor.ip = ips;
                         monitor.name = name;
-                        monitor.status = summary.down > 0 ? (summary.up > 0 ? "mixed": "down") : "up";
+                        monitor.status = summary.down > 0 ? "down" : "up";
                         result.monitor = monitor;
-                        
+
                         Map observer = new HashMap();
                         Map geo = new HashMap();
                         observer.geo = geo;
                         geo.name = geoNames;
                         result.observer = observer;
-                        
+
                         if (!podUids.isEmpty()) {
                           result.kubernetes = new HashMap();
                           result.kubernetes.pod = new HashMap();
                           result.kubernetes.pod.uid = podUids;
                         }
-      
+
                         if (!containerIds.isEmpty()) {
                           result.container = new HashMap();
                           result.container.id = containerIds;
                         }
-                        
+
                         if (!tls.isEmpty()) {
                           result.tls = new HashMap();
                           result.tls = tls;
                         }
-      
+
                         return result;
                 `,
               },
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_chunk.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_chunk.ts
index e395df0d1d08d5..77676ac9a63731 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_chunk.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_chunk.ts
@@ -6,8 +6,8 @@
 
 import { refinePotentialMatches } from './refine_potential_matches';
 import { findPotentialMatches } from './find_potential_matches';
-import { QueryContext } from '../elasticsearch_monitor_states_adapter';
 import { ChunkFetcher, ChunkResult } from './monitor_group_iterator';
+import { QueryContext } from './query_context';
 
 /**
  * Fetches a single 'chunk' of data with a single query, then uses a secondary query to filter out erroneous matches.
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_page.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_page.ts
index 085c11f78b8f59..046bdc8a8d07d8 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_page.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_page.ts
@@ -6,7 +6,7 @@
 
 import { flatten } from 'lodash';
 import { CursorPagination } from '../adapter_types';
-import { QueryContext } from '../elasticsearch_monitor_states_adapter';
+import { QueryContext } from './query_context';
 import { QUERY } from '../../../../../common/constants';
 import { CursorDirection, MonitorSummary, SortOrder } from '../../../../../common/graphql/types';
 import { enrichMonitorGroups } from './enrich_monitor_groups';
@@ -51,6 +51,7 @@ const fetchPageMonitorGroups: MonitorGroupsFetcher = async (
   size: number
 ): Promise<MonitorGroupsPage> => {
   const monitorGroups: MonitorGroups[] = [];
+
   const iterator = new MonitorGroupIterator(queryContext);
 
   let paginationBefore: CursorPagination | null = null;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts
index 8f5e26b75f56cd..e34bc6ab805c06 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts
@@ -5,10 +5,9 @@
  */
 
 import { get, set } from 'lodash';
-import { QueryContext } from '../elasticsearch_monitor_states_adapter';
 import { CursorDirection } from '../../../../../common/graphql/types';
 import { INDEX_NAMES } from '../../../../../common/constants';
-import { makeDateRangeFilter } from '../../../helper/make_date_rate_filter';
+import { QueryContext } from './query_context';
 
 // This is the first phase of the query. In it, we find the most recent check groups that matched the given query.
 // Note that these check groups may not be the most recent groups for the matching monitor ID! We'll filter those
@@ -55,7 +54,7 @@ export const findPotentialMatches = async (
 };
 
 const query = async (queryContext: QueryContext, searchAfter: any, size: number) => {
-  const body = queryBody(queryContext, searchAfter, size);
+  const body = await queryBody(queryContext, searchAfter, size);
 
   const params = {
     index: INDEX_NAMES.HEARTBEAT,
@@ -65,15 +64,11 @@ const query = async (queryContext: QueryContext, searchAfter: any, size: number)
   return await queryContext.search(params);
 };
 
-const queryBody = (queryContext: QueryContext, searchAfter: any, size: number) => {
+const queryBody = async (queryContext: QueryContext, searchAfter: any, size: number) => {
   const compositeOrder = cursorDirectionToOrder(queryContext.pagination.cursorDirection);
 
-  const filters: any[] = [
-    makeDateRangeFilter(queryContext.dateRangeStart, queryContext.dateRangeEnd),
-  ];
-  if (queryContext.filterClause) {
-    filters.push(queryContext.filterClause);
-  }
+  const filters = await queryContext.dateAndCustomFilters();
+
   if (queryContext.statusFilter) {
     filters.push({ match: { 'monitor.status': queryContext.statusFilter } });
   }
@@ -82,6 +77,11 @@ const queryBody = (queryContext: QueryContext, searchAfter: any, size: number) =
     size: 0,
     query: { bool: { filter: filters } },
     aggs: {
+      has_timespan: {
+        filter: {
+          exists: { field: 'monitor.timespan' },
+        },
+      },
       monitors: {
         composite: {
           size,
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/monitor_group_iterator.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/monitor_group_iterator.ts
index 1de2dbb0e364d6..27c16863a37ab3 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/monitor_group_iterator.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/monitor_group_iterator.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { QueryContext } from '../elasticsearch_monitor_states_adapter';
+import { QueryContext } from './query_context';
 import { CursorPagination } from '../adapter_types';
 import { fetchChunk } from './fetch_chunk';
 import { CursorDirection } from '../../../../../common/graphql/types';
@@ -155,7 +155,7 @@ export class MonitorGroupIterator {
 
   // Returns a copy of this fetcher that goes backwards from the current position
   reverse(): MonitorGroupIterator | null {
-    const reverseContext = Object.assign({}, this.queryContext);
+    const reverseContext = this.queryContext.clone();
     const current = this.getCurrent();
 
     reverseContext.pagination = {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/query_context.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/query_context.ts
new file mode 100644
index 00000000000000..03e228952f0e79
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/query_context.ts
@@ -0,0 +1,135 @@
+/*
+ * 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 DateMath from '@elastic/datemath';
+import { APICaller } from 'kibana/server';
+import { CursorPagination } from '../adapter_types';
+import { INDEX_NAMES } from '../../../../../common/constants';
+
+export class QueryContext {
+  callES: APICaller;
+  dateRangeStart: string;
+  dateRangeEnd: string;
+  pagination: CursorPagination;
+  filterClause: any | null;
+  size: number;
+  statusFilter?: string;
+  hasTimespanCache?: boolean;
+
+  constructor(
+    database: any,
+    dateRangeStart: string,
+    dateRangeEnd: string,
+    pagination: CursorPagination,
+    filterClause: any | null,
+    size: number,
+    statusFilter?: string
+  ) {
+    this.callES = database;
+    this.dateRangeStart = dateRangeStart;
+    this.dateRangeEnd = dateRangeEnd;
+    this.pagination = pagination;
+    this.filterClause = filterClause;
+    this.size = size;
+    this.statusFilter = statusFilter;
+  }
+
+  async search(params: any): Promise<any> {
+    params.index = INDEX_NAMES.HEARTBEAT;
+    return this.callES('search', params);
+  }
+
+  async count(params: any): Promise<any> {
+    params.index = INDEX_NAMES.HEARTBEAT;
+    return this.callES('count', params);
+  }
+
+  async dateAndCustomFilters(): Promise<any[]> {
+    const clauses = [await this.dateRangeFilter()];
+    if (this.filterClause) {
+      clauses.push(this.filterClause);
+    }
+    return clauses;
+  }
+
+  async dateRangeFilter(forceNoTimespan?: boolean): Promise<any> {
+    const timestampClause = {
+      range: { '@timestamp': { gte: this.dateRangeStart, lte: this.dateRangeEnd } },
+    };
+
+    if (forceNoTimespan === true || !(await this.hasTimespan())) {
+      return timestampClause;
+    }
+
+    // @ts-ignore
+    const tsStart = DateMath.parse(this.dateRangeEnd).subtract(10, 'seconds');
+    const tsEnd = DateMath.parse(this.dateRangeEnd)!;
+
+    return {
+      bool: {
+        filter: [
+          timestampClause,
+          {
+            bool: {
+              should: [
+                {
+                  range: {
+                    'monitor.timespan': {
+                      gte: tsStart.toISOString(),
+                      lte: tsEnd.toISOString(),
+                    },
+                  },
+                },
+                {
+                  bool: {
+                    must_not: { exists: { field: 'monitor.timespan' } },
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      },
+    };
+  }
+
+  async hasTimespan(): Promise<boolean> {
+    if (this.hasTimespanCache) {
+      return this.hasTimespanCache;
+    }
+
+    this.hasTimespanCache =
+      (
+        await this.count({
+          body: {
+            query: {
+              bool: {
+                filter: [
+                  await this.dateRangeFilter(true),
+                  { exists: { field: 'monitor.timespan' } },
+                ],
+              },
+            },
+          },
+          terminate_after: 1,
+        })
+      ).count > 0;
+
+    return this.hasTimespanCache;
+  }
+
+  clone(): QueryContext {
+    return new QueryContext(
+      this.callES,
+      this.dateRangeStart,
+      this.dateRangeEnd,
+      this.pagination,
+      this.filterClause,
+      this.size,
+      this.statusFilter
+    );
+  }
+}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts
index b0060cbee17bb7..f8347d07375218 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts
@@ -5,10 +5,9 @@
  */
 
 import { INDEX_NAMES } from '../../../../../common/constants';
-import { QueryContext } from '../elasticsearch_monitor_states_adapter';
+import { QueryContext } from './query_context';
 import { CursorDirection } from '../../../../../common/graphql/types';
 import { MonitorGroups, MonitorLocCheckGroup } from './fetch_page';
-import { makeDateRangeFilter } from '../../../helper/make_date_rate_filter';
 
 /**
  * Determines whether the provided check groups are the latest complete check groups for their associated monitor ID's.
@@ -103,7 +102,7 @@ export const mostRecentCheckGroups = async (
       query: {
         bool: {
           filter: [
-            makeDateRangeFilter(queryContext.dateRangeStart, queryContext.dateRangeEnd),
+            await queryContext.dateRangeFilter(),
             { terms: { 'monitor.id': potentialMatchMonitorIDs } },
             // only match summary docs because we only want the latest *complete* check group.
             { exists: { field: 'summary' } },
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index ee33ff5c568aaa..916360a46e5a19 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -11818,9 +11818,9 @@
     "xpack.uptime.pingList.expandRow": "拡張",
     "xpack.uptime.snapshot.pingsOverTimeTitle": "一定時間のピング",
     "xpack.uptime.snapshotHistogram.yAxis.title": "ピング",
-    "xpack.uptime.donutChart.ariaLabel": "現在のステータスを表す円グラフ、{total} 個中 {down} 個のモニターがダウンしています。",
-    "xpack.uptime.donutChart.legend.downRowLabel": "ダウン",
-    "xpack.uptime.donutChart.legend.upRowLabel": "アップ",
+    "xpack.uptime.snapshot.donutChart.ariaLabel": "現在のステータスを表す円グラフ、{total} 個中 {down} 個のモニターがダウンしています。",
+    "xpack.uptime.snapshot.donutChart.legend.downRowLabel": "ダウン",
+    "xpack.uptime.snapshot.donutChart.legend.upRowLabel": "アップ",
     "xpack.uptime.durationChart.emptyPrompt.description": "このモニターは選択された時間範囲で一度も {emphasizedText} していません。",
     "xpack.uptime.durationChart.emptyPrompt.title": "利用可能な期間データがありません",
     "xpack.uptime.emptyStateError.notAuthorized": "アップタイムデータの表示が承認されていません。システム管理者にお問い合わせください。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index ced7c4e822c27f..f2806b0b33c29d 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -11907,9 +11907,9 @@
     "xpack.uptime.pingList.expandRow": "展开",
     "xpack.uptime.snapshot.pingsOverTimeTitle": "时移 Ping 数",
     "xpack.uptime.snapshotHistogram.yAxis.title": "Ping",
-    "xpack.uptime.donutChart.ariaLabel": "显示当前状态的饼图。{down} 个监测已关闭，共 {total} 个。",
-    "xpack.uptime.donutChart.legend.downRowLabel": "关闭",
-    "xpack.uptime.donutChart.legend.upRowLabel": "运行",
+    "xpack.uptime.snapshot.donutChart.ariaLabel": "显示当前状态的饼图。{down} 个监测已关闭，共 {total} 个。",
+    "xpack.uptime.snapshot.donutChart.legend.downRowLabel": "关闭",
+    "xpack.uptime.snapshot.donutChart.legend.upRowLabel": "运行",
     "xpack.uptime.durationChart.emptyPrompt.description": "在选定时间范围内此监测从未{emphasizedText}。",
     "xpack.uptime.durationChart.emptyPrompt.title": "没有持续时间数据",
     "xpack.uptime.emptyStateError.notAuthorized": "您无权查看 Uptime 数据，请联系系统管理员。",
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot.json
index 93d63bad66e30a..12d8f514a3a309 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot.json
@@ -1,6 +1,5 @@
 {
-  "up": 93,
+  "up": 10,
   "down": 7,
-  "mixed": 0,
-  "total": 100
+  "total": 17
 }
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_empty.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_empty.json
index 94c1ffbc742908..c1e7f0ba247fb4 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_empty.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_empty.json
@@ -1,6 +1,5 @@
 {
   "up": 0,
-  "down": 7,
-  "mixed": 0,
-  "total": 7
+  "down": 0,
+  "total": 0
 }
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_down.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_down.json
index 94c1ffbc742908..94777570dd6f0b 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_down.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_down.json
@@ -1,6 +1,5 @@
 {
   "up": 0,
   "down": 7,
-  "mixed": 0,
   "total": 7
 }
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_up.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_up.json
index 2d79880e7c0ee0..42a15817073602 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_up.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_up.json
@@ -1,6 +1,5 @@
 {
-  "up": 93,
+  "up": 10,
   "down": 0,
-  "mixed": 0,
-  "total": 93
+  "total": 10
 }
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/helpers/make_checks.ts b/x-pack/test/api_integration/apis/uptime/graphql/helpers/make_checks.ts
index 9bfdf04c8dbe3e..f89905f0da04fe 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/helpers/make_checks.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/helpers/make_checks.ts
@@ -5,11 +5,12 @@
  */
 
 import uuid from 'uuid';
-import { merge } from 'lodash';
+import { merge, flattenDeep } from 'lodash';
+
+const INDEX_NAME = 'heartbeat-8.0.0';
 
 export const makePing = async (
   es: any,
-  index: string,
   monitorId: string,
   fields: { [key: string]: any },
   mogrify: (doc: any) => any
@@ -101,7 +102,7 @@ export const makePing = async (
   const doc = mogrify(merge(baseDoc, fields));
 
   await es.index({
-    index,
+    index: INDEX_NAME,
     refresh: true,
     body: doc,
   });
@@ -111,7 +112,6 @@ export const makePing = async (
 
 export const makeCheck = async (
   es: any,
-  index: string,
   monitorId: string,
   numIps: number,
   fields: { [key: string]: any },
@@ -137,7 +137,7 @@ export const makeCheck = async (
     if (i === numIps - 1) {
       pingFields.summary = summary;
     }
-    const doc = await makePing(es, index, monitorId, pingFields, mogrify);
+    const doc = await makePing(es, monitorId, pingFields, mogrify);
     docs.push(doc);
     // @ts-ignore
     summary[doc.monitor.status]++;
@@ -147,16 +147,78 @@ export const makeCheck = async (
 
 export const makeChecks = async (
   es: any,
-  index: string,
   monitorId: string,
   numChecks: number,
   numIps: number,
+  every: number, // number of millis between checks
   fields: { [key: string]: any } = {},
   mogrify: (doc: any) => any = d => d
 ) => {
   const checks = [];
+  const oldestTime = new Date().getTime() - numChecks * every;
+  let newestTime = oldestTime;
   for (let li = 0; li < numChecks; li++) {
-    checks.push(await makeCheck(es, index, monitorId, numIps, fields, mogrify));
+    const checkDate = new Date(newestTime + every);
+    newestTime = checkDate.getTime() + every;
+    fields = merge(fields, {
+      '@timestamp': checkDate.toISOString(),
+      monitor: {
+        timespan: {
+          gte: checkDate.toISOString(),
+          lt: new Date(newestTime).toISOString(),
+        },
+      },
+    });
+    checks.push(await makeCheck(es, monitorId, numIps, fields, mogrify));
   }
+
   return checks;
 };
+
+export const makeChecksWithStatus = async (
+  es: any,
+  monitorId: string,
+  numChecks: number,
+  numIps: number,
+  every: number,
+  fields: { [key: string]: any } = {},
+  status: 'up' | 'down',
+  mogrify: (doc: any) => any = d => d
+) => {
+  const oppositeStatus = status === 'up' ? 'down' : 'up';
+
+  return await makeChecks(es, monitorId, numChecks, numIps, every, fields, d => {
+    d.monitor.status = status;
+    if (d.summary) {
+      d.summary[status] += d.summary[oppositeStatus];
+      d.summary[oppositeStatus] = 0;
+    }
+
+    return mogrify(d);
+  });
+};
+
+// Helper for processing a list of checks to find the time picker bounds.
+export const getChecksDateRange = (checks: any[]) => {
+  // Flatten 2d arrays
+  const flattened = flattenDeep(checks);
+
+  let startTime = 1 / 0;
+  let endTime = -1 / 0;
+  flattened.forEach(c => {
+    const ts = Date.parse(c['@timestamp']);
+
+    if (ts < startTime) {
+      startTime = ts;
+    }
+
+    if (ts > endTime) {
+      endTime = ts;
+    }
+  });
+
+  return {
+    start: new Date(startTime).toISOString(),
+    end: new Date(endTime).toISOString(),
+  };
+};
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
index c305bb99c28f79..511cdb6d004fa6 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 import { monitorStatesQueryString } from '../../../../../legacy/plugins/uptime/public/queries/monitor_states_query';
 import { expectFixtureEql } from './helpers/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { makeChecks } from './helpers/make_checks';
+import { makeChecksWithStatus } from './helpers/make_checks';
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
@@ -104,11 +104,10 @@ export default function({ getService }: FtrProviderContext) {
         };
 
         before(async () => {
-          const index = 'heartbeat-8.0.0';
-
           const es = getService('legacyEs');
           dateRangeStart = new Date().toISOString();
-          checks = await makeChecks(es, index, testMonitorId, 1, numIps, {}, d => {
+          checks = await makeChecksWithStatus(es, testMonitorId, 1, numIps, 1, {}, 'up', d => {
+            // turn an all up status into having at least one down
             if (d.summary) {
               d.monitor.status = 'down';
               d.summary.up--;
diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts
index b76d3f7c2e44ab..68377e0820e054 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -9,8 +9,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 export default function({ getService, loadTestFile }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   describe('uptime REST endpoints', () => {
-    before('load heartbeat data', () => esArchiver.load('uptime/full_heartbeat'));
-    after('unload', () => esArchiver.unload('uptime/full_heartbeat'));
+    before('load heartbeat data', () => esArchiver.load('uptime/blank'));
+    after('unload', () => esArchiver.unload('uptime/blank'));
     loadTestFile(require.resolve('./snapshot'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts b/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
index 0175dc649b4958..b0d97837c770f9 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
@@ -6,47 +6,97 @@
 
 import { expectFixtureEql } from '../graphql/helpers/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { makeChecksWithStatus, getChecksDateRange } from '../graphql/helpers/make_checks';
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('snapshot count', () => {
-    let dateRangeStart = '2019-01-28T17:40:08.078Z';
-    let dateRangeEnd = '2025-01-28T19:00:16.078Z';
-
-    it('will fetch the full set of snapshot counts', async () => {
-      const apiResponse = await supertest.get(
-        `/api/uptime/snapshot/count?dateRangeStart=${dateRangeStart}&dateRangeEnd=${dateRangeEnd}`
-      );
-      expectFixtureEql(apiResponse.body, 'snapshot');
-    });
+    const dateRangeStart = new Date().toISOString();
+    const dateRangeEnd = new Date().toISOString();
 
-    it('will fetch a monitor snapshot filtered by down status', async () => {
-      const filters = `{"bool":{"must":[{"match":{"monitor.status":{"query":"down","operator":"and"}}}]}}`;
-      const statusFilter = 'down';
-      const apiResponse = await supertest.get(
-        `/api/uptime/snapshot/count?dateRangeStart=${dateRangeStart}&dateRangeEnd=${dateRangeEnd}&filters=${filters}&statusFilter=${statusFilter}`
-      );
-      expectFixtureEql(apiResponse.body, 'snapshot_filtered_by_down');
-    });
+    describe('when no data is present', async () => {
+      it('returns a null snapshot', async () => {
+        const apiResponse = await supertest.get(
+          `/api/uptime/snapshot/count?dateRangeStart=${dateRangeStart}&dateRangeEnd=${dateRangeEnd}`
+        );
 
-    it('will fetch a monitor snapshot filtered by up status', async () => {
-      const filters = `{"bool":{"must":[{"match":{"monitor.status":{"query":"up","operator":"and"}}}]}}`;
-      const statusFilter = 'up';
-      const apiResponse = await supertest.get(
-        `/api/uptime/snapshot/count?dateRangeStart=${dateRangeStart}&dateRangeEnd=${dateRangeEnd}&filters=${filters}&statusFilter=${statusFilter}`
-      );
-      expectFixtureEql(apiResponse.body, 'snapshot_filtered_by_up');
+        expectFixtureEql(apiResponse.body, 'snapshot_empty');
+      });
     });
 
-    it('returns a null snapshot when no data is present', async () => {
-      dateRangeStart = '2019-01-25T04:30:54.740Z';
-      dateRangeEnd = '2025-01-28T04:50:54.740Z';
-      const filters = `{"bool":{"must":[{"match":{"monitor.status":{"query":"down","operator":"and"}}}]}}`;
-      const apiResponse = await supertest.get(
-        `/api/uptime/snapshot/count?dateRangeStart=${dateRangeStart}&dateRangeEnd=${dateRangeEnd}&filters=${filters}`
-      );
-      expectFixtureEql(apiResponse.body, 'snapshot_empty');
+    describe('when data is present', async () => {
+      const numUpMonitors = 10;
+      const numDownMonitors = 7;
+      const numIps = 2;
+      const checksPerMonitor = 5;
+      const scheduleEvery = 10000; // fake monitor checks every 10s
+      let dateRange: { start: string; end: string };
+
+      [true, false].forEach(async (includeTimespan: boolean) => {
+        describe(`with timespans ${includeTimespan ? 'included' : 'missing'}`, async () => {
+          before(async () => {
+            const promises: Array<Promise<any>> = [];
+
+            // When includeTimespan is false we have to remove the values there.
+            let mogrify = (d: any) => d;
+            if ((includeTimespan = false)) {
+              mogrify = (d: any): any => {
+                d.monitor.delete('timespan');
+                return d;
+              };
+            }
+
+            const makeMonitorChecks = async (monitorId: string, status: 'up' | 'down') => {
+              return makeChecksWithStatus(
+                getService('legacyEs'),
+                monitorId,
+                checksPerMonitor,
+                numIps,
+                scheduleEvery,
+                {},
+                status,
+                mogrify
+              );
+            };
+
+            for (let i = 0; i < numUpMonitors; i++) {
+              promises.push(makeMonitorChecks(`up-${i}`, 'up'));
+            }
+            for (let i = 0; i < numDownMonitors; i++) {
+              promises.push(makeMonitorChecks(`down-${i}`, 'down'));
+            }
+
+            const allResults = await Promise.all(promises);
+            dateRange = getChecksDateRange(allResults);
+          });
+
+          it('will count all statuses correctly', async () => {
+            const apiResponse = await supertest.get(
+              `/api/uptime/snapshot/count?dateRangeStart=${dateRange.start}&dateRangeEnd=${dateRange.end}`
+            );
+
+            expectFixtureEql(apiResponse.body, 'snapshot');
+          });
+
+          it('will fetch a monitor snapshot filtered by down status', async () => {
+            const statusFilter = 'down';
+            const apiResponse = await supertest.get(
+              `/api/uptime/snapshot/count?dateRangeStart=${dateRange.start}&dateRangeEnd=${dateRange.end}&statusFilter=${statusFilter}`
+            );
+
+            expectFixtureEql(apiResponse.body, 'snapshot_filtered_by_down');
+          });
+
+          it('will fetch a monitor snapshot filtered by up status', async () => {
+            const statusFilter = 'up';
+            const apiResponse = await supertest.get(
+              `/api/uptime/snapshot/count?dateRangeStart=${dateRange.start}&dateRangeEnd=${dateRange.end}&statusFilter=${statusFilter}`
+            );
+            expectFixtureEql(apiResponse.body, 'snapshot_filtered_by_up');
+          });
+        });
+      });
     });
   });
 }
diff --git a/x-pack/test/functional/apps/uptime/overview.ts b/x-pack/test/functional/apps/uptime/overview.ts
index 9a337c86185fe0..0366d128083702 100644
--- a/x-pack/test/functional/apps/uptime/overview.ts
+++ b/x-pack/test/functional/apps/uptime/overview.ts
@@ -64,5 +64,27 @@ export default ({ getPageObjects }: FtrProviderContext) => {
         '0009-up',
       ]);
     });
+
+    describe('snapshot counts', () => {
+      it('updates the snapshot count when status filter is set to down', async () => {
+        await pageObjects.uptime.goToUptimePageAndSetDateRange(
+          DEFAULT_DATE_START,
+          DEFAULT_DATE_END
+        );
+        await pageObjects.uptime.setStatusFilter('down');
+        const counts = await pageObjects.uptime.getSnapshotCount();
+        expect(counts).to.eql({ up: '0', down: '7' });
+      });
+
+      it('updates the snapshot count when status filter is set to up', async () => {
+        await pageObjects.uptime.goToUptimePageAndSetDateRange(
+          DEFAULT_DATE_START,
+          DEFAULT_DATE_END
+        );
+        await pageObjects.uptime.setStatusFilter('up');
+        const counts = await pageObjects.uptime.getSnapshotCount();
+        expect(counts).to.eql({ up: '93', down: '0' });
+      });
+    });
   });
 };
diff --git a/x-pack/test/functional/es_archives/uptime/blank/mappings.json b/x-pack/test/functional/es_archives/uptime/blank/mappings.json
index eb383cc87563d0..a1b0696cdaadc6 100644
--- a/x-pack/test/functional/es_archives/uptime/blank/mappings.json
+++ b/x-pack/test/functional/es_archives/uptime/blank/mappings.json
@@ -1267,6 +1267,9 @@
             "type": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timespan": {
+              "type": "date_range"
             }
           }
         },
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index 26c95c3bf526d8..6018b7ceebfa52 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -70,5 +70,9 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
         await uptimeService.setStatusFilterDown();
       }
     }
+
+    public async getSnapshotCount() {
+      return await uptimeService.getSnapshotCount();
+    }
   })();
 }
diff --git a/x-pack/test/functional/services/uptime.ts b/x-pack/test/functional/services/uptime.ts
index 40d2e3dafc7f84..12f1a23f1e024c 100644
--- a/x-pack/test/functional/services/uptime.ts
+++ b/x-pack/test/functional/services/uptime.ts
@@ -49,5 +49,11 @@ export function UptimeProvider({ getService }: FtrProviderContext) {
     async setStatusFilterDown() {
       await testSubjects.click('xpack.uptime.filterBar.filterStatusDown');
     },
+    async getSnapshotCount() {
+      return {
+        up: await testSubjects.getVisibleText('xpack.uptime.snapshot.donutChart.up'),
+        down: await testSubjects.getVisibleText('xpack.uptime.snapshot.donutChart.down'),
+      };
+    },
   };
 }

From 12bfd3bf779dcfea9d95124ca1cde13be87f224e Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Thu, 9 Jan 2020 09:48:22 -0500
Subject: [PATCH 79/96] Fix number of executions per agent in flaky test job
 (#54311)

---
 .ci/Jenkinsfile_flaky | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky
index 669395564db447..f702405aad69e3 100644
--- a/.ci/Jenkinsfile_flaky
+++ b/.ci/Jenkinsfile_flaky
@@ -99,7 +99,7 @@ def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWor
   def numberOfWorkers = Math.min(numberOfExecutions, maxWorkerProcesses)
 
   for(def i = 1; i <= numberOfWorkers; i++) {
-    def workerExecutions = numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0)
+    def workerExecutions = floor(numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0))
 
     workerMap["agent-${agentNumber}-worker-${i}"] = { workerNumber ->
       for(def j = 0; j < workerExecutions; j++) {

From 9befff1236b6c3a53449191fbf1df9d9e240fce7 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Thu, 9 Jan 2020 09:03:50 -0600
Subject: [PATCH 80/96] [APM] Fix service map license check and controls
 (#54286)

* Check for a trial license as well as platinum when loading the map
* Increase the z-index of the controls so clicking on them works
* Rename the styled component to `ControlsContainer` from `Container` to make a less ambiguous class name on the element
---
 .../apm/public/components/app/ServiceMap/Controls.tsx      | 7 ++++---
 .../plugins/apm/public/components/app/ServiceMap/index.tsx | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
index f7166bd0cec5c7..5b7ddc2b450d60 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
@@ -12,10 +12,11 @@ import { i18n } from '@kbn/i18n';
 import { CytoscapeContext } from './Cytoscape';
 import { FullscreenPanel } from './FullscreenPanel';
 
-const Container = styled('div')`
+const ControlsContainer = styled('div')`
   left: ${theme.gutterTypes.gutterMedium};
   position: absolute;
   top: ${theme.gutterTypes.gutterSmall};
+  z-index: 1; /* The element containing the cytoscape canvas has z-index = 0. */
 `;
 
 const Button = styled(EuiButtonIcon)`
@@ -83,7 +84,7 @@ export function Controls() {
   });
 
   return (
-    <Container>
+    <ControlsContainer>
       <ZoomPanel hasShadow={true} paddingSize="none">
         <ZoomInButton
           aria-label={zoomInLabel}
@@ -103,6 +104,6 @@ export function Controls() {
         />
       </ZoomPanel>
       <FullscreenPanel element={mapDomElement} />
-    </Container>
+    </ControlsContainer>
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
index 16a91116ae762b..cc09975a344b5e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
@@ -57,7 +57,8 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
   const elements = Array.isArray(data) ? data : [];
   const license = useLicense();
   const isValidPlatinumLicense =
-    license?.isActive && license?.type === 'platinum';
+    license?.isActive &&
+    (license?.type === 'platinum' || license?.type === 'trial');
 
   return isValidPlatinumLicense ? (
     <Cytoscape

From 36abed3496ed83d1c6e7a4b1debd8123b17bf677 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Thu, 9 Jan 2020 15:21:40 +0000
Subject: [PATCH 81/96] [ML] Categorization wizard (#53009)

* [ML] Categorization wizard

* fixing js prettier issues

* adding basic category field validation

* adding rare or count selection

* fixing types

* category examples changes

* improving results search

* adding analyzer editing

* improving callout

* updating callout text

* fixing import path

* resetting cat analyser json on flyout open

* disabling model plot by default

* minor refactoring

* fixing types

* hide estimate bucket span

* setting default bucket span

* removing ml_classic workaround

* changing style of detector selection

* fixing convert to advanced issue

* removing sparse data checkbox

* changes based on review

* use default mml

* fixing job cloning

* changes based on review

* removing categorization_analyzer from job if it is same as default

* fixing translations

* disabling model plot for rare jobs

* removing console.error in useResolver
---
 .../plugins/ml/common/constants/new_job.ts    |   8 +
 .../plugins/ml/common/types/categories.ts     |  25 ++
 .../job_creator/categorization_job_creator.ts | 159 ++++++++++
 .../jobs/new_job/common/job_creator/index.ts  |   2 +
 .../common/job_creator/job_creator_factory.ts |   4 +
 .../new_job/common/job_creator/type_guards.ts |  10 +-
 .../common/job_creator/util/general.ts        |   9 +-
 .../common/job_validator/job_validator.ts     |  26 +-
 .../categorization_examples_loader.ts         |  57 ++++
 .../new_job/common/results_loader/index.ts    |   1 +
 .../charts/anomaly_chart/anomaly_chart.tsx    |   2 +-
 .../{anomaly_chart => common}/anomalies.tsx   |   0
 .../components/charts/common/settings.ts      |   1 +
 .../event_rate_chart/event_rate_chart.tsx     |  13 +-
 .../loading_wrapper/loading_wrapper.tsx       |   4 +-
 .../edit_categorization_analyzer_flyout.tsx   | 147 +++++++++
 .../index.ts                                  |   6 +
 .../model_plot/model_plot_switch.tsx          |  16 +-
 .../components/advanced_view/settings.tsx     |  16 +-
 .../components/bucket_span/bucket_span.tsx    |  11 +-
 .../categorization_detector.tsx               |  64 ++++
 .../detector_cards.tsx                        |  59 ++++
 .../categorization_detector/index.ts          |   6 +
 .../categorization_field.tsx                  |   6 +-
 .../categorization_view.tsx                   |  42 +++
 .../examples_valid_callout.tsx                | 112 +++++++
 .../categorization_view/field_examples.tsx    |  65 ++++
 .../components/categorization_view/index.ts   |   7 +
 .../categorization_view/metric_selection.tsx  | 108 +++++++
 .../metric_selection_summary.tsx              |  78 +++++
 .../categorization_view/settings.tsx          |  26 ++
 .../categorization_view/top_categories.tsx    |  89 ++++++
 .../components/multi_metric_view/settings.tsx |  16 +-
 .../components/population_view/settings.tsx   |  16 +-
 .../single_metric_view/settings.tsx           |  15 +-
 .../pick_fields_step/pick_fields.tsx          |   8 +-
 .../detector_chart/detector_chart.tsx         |   2 +
 .../preconfigured_job_redirect.ts             |  25 +-
 .../jobs/new_job/pages/job_type/page.tsx      |  16 +
 .../jobs/new_job/pages/new_job/page.tsx       |  31 +-
 .../jobs/new_job/utils/new_job_utils.ts       |  10 +-
 .../routing/routes/new_job/wizard.tsx         |  18 ++
 .../application/routing/use_resolver.ts       |   2 -
 .../services/ml_api_service/index.d.ts        |  17 +-
 .../services/ml_api_service/jobs.js           |  37 +++
 .../application/services/ml_server_info.ts    |   8 +
 .../services/new_job_capabilities_service.ts  |   3 +-
 .../ml/public/application/util/index_utils.ts |   8 +-
 .../ml/server/client/elasticsearch_ml.js      |  25 ++
 .../ml/server/models/job_service/index.js     |   3 +-
 .../job_service/new_job/categorization.ts     | 294 ++++++++++++++++++
 .../models/job_service/new_job/charts.ts      |   2 +-
 .../models/job_service/new_job/index.ts       |   1 +
 .../models/job_service/new_job/line_chart.ts  |   3 +-
 .../job_service/new_job/population_chart.ts   |   3 +-
 .../ml/server/routes/anomaly_detectors.js     |  18 ++
 .../plugins/ml/server/routes/job_service.js   |  46 +++
 57 files changed, 1702 insertions(+), 104 deletions(-)
 create mode 100644 x-pack/legacy/plugins/ml/common/types/categories.ts
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
 rename x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/{anomaly_chart => common}/anomalies.tsx (100%)
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/common/edit_categorization_analyzer_flyout/edit_categorization_analyzer_flyout.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/common/edit_categorization_analyzer_flyout/index.ts
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/categorization_detector.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/detector_cards.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/index.ts
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/categorization_view.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/examples_valid_callout.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/field_examples.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/index.ts
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/settings.tsx
 create mode 100644 x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/top_categories.tsx
 create mode 100644 x-pack/legacy/plugins/ml/server/models/job_service/new_job/categorization.ts

diff --git a/x-pack/legacy/plugins/ml/common/constants/new_job.ts b/x-pack/legacy/plugins/ml/common/constants/new_job.ts
index 004824bef1c9d1..ccd108cd2698f4 100644
--- a/x-pack/legacy/plugins/ml/common/constants/new_job.ts
+++ b/x-pack/legacy/plugins/ml/common/constants/new_job.ts
@@ -9,16 +9,24 @@ export enum JOB_TYPE {
   MULTI_METRIC = 'multi_metric',
   POPULATION = 'population',
   ADVANCED = 'advanced',
+  CATEGORIZATION = 'categorization',
 }
 
 export enum CREATED_BY_LABEL {
   SINGLE_METRIC = 'single-metric-wizard',
   MULTI_METRIC = 'multi-metric-wizard',
   POPULATION = 'population-wizard',
+  CATEGORIZATION = 'categorization-wizard',
 }
 
 export const DEFAULT_MODEL_MEMORY_LIMIT = '10MB';
 export const DEFAULT_BUCKET_SPAN = '15m';
+export const DEFAULT_RARE_BUCKET_SPAN = '1h';
 export const DEFAULT_QUERY_DELAY = '60s';
 
 export const SHARED_RESULTS_INDEX_NAME = 'shared';
+
+export const NUMBER_OF_CATEGORY_EXAMPLES = 5;
+export const CATEGORY_EXAMPLES_MULTIPLIER = 20;
+export const CATEGORY_EXAMPLES_WARNING_LIMIT = 0.75;
+export const CATEGORY_EXAMPLES_ERROR_LIMIT = 0.2;
diff --git a/x-pack/legacy/plugins/ml/common/types/categories.ts b/x-pack/legacy/plugins/ml/common/types/categories.ts
new file mode 100644
index 00000000000000..6ccd13ed9a39ec
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/common/types/categories.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export type CategoryId = number;
+
+export interface Category {
+  job_id: string;
+  category_id: CategoryId;
+  terms: string;
+  regex: string;
+  max_matching_length: number;
+  examples: string[];
+  grok_pattern: string;
+}
+
+export interface Token {
+  token: string;
+  start_offset: number;
+  end_offset: number;
+  type: string;
+  position: number;
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
new file mode 100644
index 00000000000000..cea99eb5ec64c2
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
@@ -0,0 +1,159 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEqual } from 'lodash';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
+import { JobCreator } from './job_creator';
+import { Field, Aggregation, mlCategory } from '../../../../../../common/types/fields';
+import { Job, Datafeed, Detector } from './configs';
+import { createBasicDetector } from './util/default_configs';
+import {
+  JOB_TYPE,
+  CREATED_BY_LABEL,
+  DEFAULT_BUCKET_SPAN,
+  DEFAULT_RARE_BUCKET_SPAN,
+} from '../../../../../../common/constants/new_job';
+import { ML_JOB_AGGREGATION } from '../../../../../../common/constants/aggregation_types';
+import { getRichDetectors } from './util/general';
+import { CategorizationExamplesLoader, CategoryExample } from '../results_loader';
+import { CategorizationAnalyzer, getNewJobDefaults } from '../../../../services/ml_server_info';
+
+type CategorizationAnalyzerType = CategorizationAnalyzer | null;
+
+export class CategorizationJobCreator extends JobCreator {
+  protected _type: JOB_TYPE = JOB_TYPE.CATEGORIZATION;
+  private _createCountDetector: () => void = () => {};
+  private _createRareDetector: () => void = () => {};
+  private _examplesLoader: CategorizationExamplesLoader;
+  private _categoryFieldExamples: CategoryExample[] = [];
+  private _categoryFieldValid: number = 0;
+  private _detectorType: ML_JOB_AGGREGATION.COUNT | ML_JOB_AGGREGATION.RARE =
+    ML_JOB_AGGREGATION.COUNT;
+  private _categorizationAnalyzer: CategorizationAnalyzerType = null;
+  private _defaultCategorizationAnalyzer: CategorizationAnalyzerType;
+
+  constructor(
+    indexPattern: IndexPattern,
+    savedSearch: SavedSearchSavedObject | null,
+    query: object
+  ) {
+    super(indexPattern, savedSearch, query);
+    this.createdBy = CREATED_BY_LABEL.CATEGORIZATION;
+    this._examplesLoader = new CategorizationExamplesLoader(this, indexPattern, query);
+
+    const { anomaly_detectors: anomalyDetectors } = getNewJobDefaults();
+    this._defaultCategorizationAnalyzer = anomalyDetectors.categorization_analyzer || null;
+  }
+
+  public setDefaultDetectorProperties(
+    count: Aggregation | null,
+    rare: Aggregation | null,
+    eventRate: Field | null
+  ) {
+    if (count === null || rare === null || eventRate === null) {
+      return;
+    }
+
+    this._createCountDetector = () => {
+      this._createDetector(count, eventRate);
+    };
+    this._createRareDetector = () => {
+      this._createDetector(rare, eventRate);
+    };
+  }
+
+  private _createDetector(agg: Aggregation, field: Field) {
+    const dtr: Detector = createBasicDetector(agg, field);
+    dtr.by_field_name = mlCategory.id;
+    this._addDetector(dtr, agg, mlCategory);
+  }
+
+  public setDetectorType(type: ML_JOB_AGGREGATION.COUNT | ML_JOB_AGGREGATION.RARE) {
+    this._detectorType = type;
+    this.removeAllDetectors();
+    if (type === ML_JOB_AGGREGATION.COUNT) {
+      this._createCountDetector();
+      this.bucketSpan = DEFAULT_BUCKET_SPAN;
+    } else {
+      this._createRareDetector();
+      this.bucketSpan = DEFAULT_RARE_BUCKET_SPAN;
+      this.modelPlot = false;
+    }
+  }
+
+  public set categorizationFieldName(fieldName: string | null) {
+    if (fieldName !== null) {
+      this._job_config.analysis_config.categorization_field_name = fieldName;
+      this.setDetectorType(this._detectorType);
+      this.addInfluencer(mlCategory.id);
+    } else {
+      delete this._job_config.analysis_config.categorization_field_name;
+      this._categoryFieldExamples = [];
+      this._categoryFieldValid = 0;
+    }
+  }
+
+  public get categorizationFieldName(): string | null {
+    return this._job_config.analysis_config.categorization_field_name || null;
+  }
+
+  public async loadCategorizationFieldExamples() {
+    const { valid, examples } = await this._examplesLoader.loadExamples();
+    this._categoryFieldExamples = examples;
+    this._categoryFieldValid = valid;
+    return { valid, examples };
+  }
+
+  public get categoryFieldExamples() {
+    return this._categoryFieldExamples;
+  }
+
+  public get categoryFieldValid() {
+    return this._categoryFieldValid;
+  }
+
+  public get selectedDetectorType() {
+    return this._detectorType;
+  }
+
+  public set categorizationAnalyzer(analyzer: CategorizationAnalyzerType) {
+    this._categorizationAnalyzer = analyzer;
+
+    if (
+      analyzer === null ||
+      isEqual(this._categorizationAnalyzer, this._defaultCategorizationAnalyzer)
+    ) {
+      delete this._job_config.analysis_config.categorization_analyzer;
+    } else {
+      this._job_config.analysis_config.categorization_analyzer = analyzer;
+    }
+  }
+
+  public get categorizationAnalyzer() {
+    return this._categorizationAnalyzer;
+  }
+
+  public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
+    this._overrideConfigs(job, datafeed);
+    this.createdBy = CREATED_BY_LABEL.CATEGORIZATION;
+    const detectors = getRichDetectors(job, datafeed, this.scriptFields, false);
+
+    const dtr = detectors[0];
+    if (detectors.length && dtr.agg !== null && dtr.field !== null) {
+      this._detectorType =
+        dtr.agg.id === ML_JOB_AGGREGATION.COUNT
+          ? ML_JOB_AGGREGATION.COUNT
+          : ML_JOB_AGGREGATION.RARE;
+
+      const bs = job.analysis_config.bucket_span;
+      this.setDetectorType(this._detectorType);
+      // set the bucketspan back to the original value
+      // as setDetectorType applies a default
+      this.bucketSpan = bs;
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/index.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/index.ts
index 8422223ad91fb7..88bacdf49c38a0 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/index.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/index.ts
@@ -9,11 +9,13 @@ export { SingleMetricJobCreator } from './single_metric_job_creator';
 export { MultiMetricJobCreator } from './multi_metric_job_creator';
 export { PopulationJobCreator } from './population_job_creator';
 export { AdvancedJobCreator } from './advanced_job_creator';
+export { CategorizationJobCreator } from './categorization_job_creator';
 export {
   JobCreatorType,
   isSingleMetricJobCreator,
   isMultiMetricJobCreator,
   isPopulationJobCreator,
   isAdvancedJobCreator,
+  isCategorizationJobCreator,
 } from './type_guards';
 export { jobCreatorFactory } from './job_creator_factory';
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
index 868346d0188ea2..8655b83a244ad1 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
@@ -10,6 +10,7 @@ import { MultiMetricJobCreator } from './multi_metric_job_creator';
 import { PopulationJobCreator } from './population_job_creator';
 import { AdvancedJobCreator } from './advanced_job_creator';
 import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import { CategorizationJobCreator } from './categorization_job_creator';
 
 import { JOB_TYPE } from '../../../../../../common/constants/new_job';
 
@@ -32,6 +33,9 @@ export const jobCreatorFactory = (jobType: JOB_TYPE) => (
     case JOB_TYPE.ADVANCED:
       jc = AdvancedJobCreator;
       break;
+    case JOB_TYPE.CATEGORIZATION:
+      jc = CategorizationJobCreator;
+      break;
     default:
       jc = SingleMetricJobCreator;
       break;
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/type_guards.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/type_guards.ts
index 9feb0416dd267f..25ea80e18eeb3e 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/type_guards.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/type_guards.ts
@@ -8,13 +8,15 @@ import { SingleMetricJobCreator } from './single_metric_job_creator';
 import { MultiMetricJobCreator } from './multi_metric_job_creator';
 import { PopulationJobCreator } from './population_job_creator';
 import { AdvancedJobCreator } from './advanced_job_creator';
+import { CategorizationJobCreator } from './categorization_job_creator';
 import { JOB_TYPE } from '../../../../../../common/constants/new_job';
 
 export type JobCreatorType =
   | SingleMetricJobCreator
   | MultiMetricJobCreator
   | PopulationJobCreator
-  | AdvancedJobCreator;
+  | AdvancedJobCreator
+  | CategorizationJobCreator;
 
 export function isSingleMetricJobCreator(
   jobCreator: JobCreatorType
@@ -37,3 +39,9 @@ export function isPopulationJobCreator(
 export function isAdvancedJobCreator(jobCreator: JobCreatorType): jobCreator is AdvancedJobCreator {
   return jobCreator.type === JOB_TYPE.ADVANCED;
 }
+
+export function isCategorizationJobCreator(
+  jobCreator: JobCreatorType
+): jobCreator is CategorizationJobCreator {
+  return jobCreator.type === JOB_TYPE.CATEGORIZATION;
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
index 29af08b8826eed..22b727452dd8dc 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
@@ -19,7 +19,12 @@ import {
   mlCategory,
 } from '../../../../../../../common/types/fields';
 import { mlJobService } from '../../../../../services/job_service';
-import { JobCreatorType, isMultiMetricJobCreator, isPopulationJobCreator } from '../index';
+import {
+  JobCreatorType,
+  isMultiMetricJobCreator,
+  isPopulationJobCreator,
+  isCategorizationJobCreator,
+} from '../index';
 import { CREATED_BY_LABEL, JOB_TYPE } from '../../../../../../../common/constants/new_job';
 
 const getFieldByIdFactory = (scriptFields: Field[]) => (id: string) => {
@@ -251,6 +256,8 @@ export function convertToAdvancedJob(jobCreator: JobCreatorType) {
     jobType = JOB_TYPE.MULTI_METRIC;
   } else if (isPopulationJobCreator(jobCreator)) {
     jobType = JOB_TYPE.POPULATION;
+  } else if (isCategorizationJobCreator(jobCreator)) {
+    jobType = JOB_TYPE.CATEGORIZATION;
   }
 
   window.location.href = window.location.href.replace(jobType, JOB_TYPE.ADVANCED);
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
index 3c1f767aeaf9cb..976e94b377ae8b 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
@@ -12,10 +12,11 @@ import {
   basicDatafeedValidation,
 } from '../../../../../../common/util/job_utils';
 import { getNewJobLimits } from '../../../../services/ml_server_info';
-import { JobCreator, JobCreatorType } from '../job_creator';
+import { JobCreator, JobCreatorType, isCategorizationJobCreator } from '../job_creator';
 import { populateValidationMessages, checkForExistingJobAndGroupIds } from './util';
 import { ExistingJobsAndGroups } from '../../../../services/job_service';
 import { cardinalityValidator, CardinalityValidatorResult } from './validators';
+import { CATEGORY_EXAMPLES_ERROR_LIMIT } from '../../../../../../common/constants/new_job';
 
 // delay start of validation to allow the user to make changes
 // e.g. if they are typing in a new value, try not to validate
@@ -51,6 +52,10 @@ export interface BasicValidations {
   scrollSize: Validation;
 }
 
+export interface AdvancedValidations {
+  categorizationFieldValid: Validation;
+}
+
 export class JobValidator {
   private _jobCreator: JobCreatorType;
   private _validationSummary: ValidationSummary;
@@ -71,6 +76,9 @@ export class JobValidator {
     frequency: { valid: true },
     scrollSize: { valid: true },
   };
+  private _advancedValidations: AdvancedValidations = {
+    categorizationFieldValid: { valid: true },
+  };
   private _validating: boolean = false;
   private _basicValidationResult$ = new ReplaySubject<JobValidationResult>(2);
 
@@ -141,6 +149,7 @@ export class JobValidator {
       this._lastDatafeedConfig = formattedDatafeedConfig;
       this._validateTimeout = setTimeout(() => {
         this._runBasicValidation();
+        this._runAdvancedValidation();
 
         this._jobCreatorSubject$.next(this._jobCreator);
 
@@ -195,6 +204,13 @@ export class JobValidator {
     this._basicValidationResult$.next(this._basicValidations);
   }
 
+  private _runAdvancedValidation() {
+    if (isCategorizationJobCreator(this._jobCreator)) {
+      this._advancedValidations.categorizationFieldValid.valid =
+        this._jobCreator.categoryFieldValid > CATEGORY_EXAMPLES_ERROR_LIMIT;
+    }
+  }
+
   private _isOverallBasicValid() {
     return Object.values(this._basicValidations).some(v => v.valid === false) === false;
   }
@@ -246,4 +262,12 @@ export class JobValidator {
   public get validating(): boolean {
     return this._validating;
   }
+
+  public get categorizationField() {
+    return this._advancedValidations.categorizationFieldValid.valid;
+  }
+
+  public set categorizationField(valid: boolean) {
+    this._advancedValidations.categorizationFieldValid.valid = valid;
+  }
 }
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
new file mode 100644
index 00000000000000..16f127ae3d7283
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import { IndexPatternTitle } from '../../../../../../common/types/kibana';
+import { Token } from '../../../../../../common/types/categories';
+import { CategorizationJobCreator } from '../job_creator';
+import { ml } from '../../../../services/ml_api_service';
+import { NUMBER_OF_CATEGORY_EXAMPLES } from '../../../../../../common/constants/new_job';
+
+export interface CategoryExample {
+  text: string;
+  tokens: Token[];
+}
+
+export class CategorizationExamplesLoader {
+  private _jobCreator: CategorizationJobCreator;
+  private _indexPatternTitle: IndexPatternTitle = '';
+  private _timeFieldName: string = '';
+  private _query: object = {};
+
+  constructor(jobCreator: CategorizationJobCreator, indexPattern: IndexPattern, query: object) {
+    this._jobCreator = jobCreator;
+    this._indexPatternTitle = indexPattern.title;
+    this._query = query;
+
+    if (typeof indexPattern.timeFieldName === 'string') {
+      this._timeFieldName = indexPattern.timeFieldName;
+    }
+  }
+
+  public async loadExamples() {
+    const analyzer = this._jobCreator.categorizationAnalyzer;
+    const categorizationFieldName = this._jobCreator.categorizationFieldName;
+    if (categorizationFieldName === null) {
+      return { valid: 0, examples: [] };
+    }
+
+    const start = Math.floor(
+      this._jobCreator.start + (this._jobCreator.end - this._jobCreator.start) / 2
+    );
+    const resp = await ml.jobs.categorizationFieldExamples(
+      this._indexPatternTitle,
+      this._query,
+      NUMBER_OF_CATEGORY_EXAMPLES,
+      categorizationFieldName,
+      this._timeFieldName,
+      start,
+      0,
+      analyzer
+    );
+    return resp;
+  }
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/results_loader/index.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/results_loader/index.ts
index ef0b05f73fa31f..724c62f22e469f 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/results_loader/index.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/results_loader/index.ts
@@ -5,3 +5,4 @@
  */
 
 export { ResultsLoader, Results, ModelItem, Anomaly } from './results_loader';
+export { CategorizationExamplesLoader, CategoryExample } from './categorization_examples_loader';
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomaly_chart.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomaly_chart.tsx
index 728229fc3091db..e519b86278ed83 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomaly_chart.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomaly_chart.tsx
@@ -7,7 +7,7 @@
 import React, { FC } from 'react';
 import { Chart, Settings, TooltipType } from '@elastic/charts';
 import { ModelItem, Anomaly } from '../../../../common/results_loader';
-import { Anomalies } from './anomalies';
+import { Anomalies } from '../common/anomalies';
 import { ModelBounds } from './model_bounds';
 import { Line } from './line';
 import { Scatter } from './scatter';
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomalies.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/anomalies.tsx
similarity index 100%
rename from x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomalies.tsx
rename to x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/anomalies.tsx
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/settings.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/settings.ts
index b1852cbb259c17..7dec882429dce7 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/settings.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/settings.ts
@@ -20,6 +20,7 @@ const themeName = IS_DARK_THEME ? darkTheme : lightTheme;
 export const LINE_COLOR = themeName.euiColorPrimary;
 export const MODEL_COLOR = themeName.euiColorPrimary;
 export const EVENT_RATE_COLOR = themeName.euiColorPrimary;
+export const EVENT_RATE_COLOR_WITH_ANOMALIES = themeName.euiColorLightShade;
 
 export interface ChartSettings {
   width: string;
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
index 5423e80a82f153..ddbeb3f0f5b04a 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
@@ -8,24 +8,32 @@ import React, { FC } from 'react';
 import { BarSeries, Chart, ScaleType, Settings, TooltipType } from '@elastic/charts';
 import { Axes } from '../common/axes';
 import { LineChartPoint } from '../../../../common/chart_loader';
-import { EVENT_RATE_COLOR } from '../common/settings';
+import { Anomaly } from '../../../../common/results_loader';
+import { EVENT_RATE_COLOR, EVENT_RATE_COLOR_WITH_ANOMALIES } from '../common/settings';
 import { LoadingWrapper } from '../loading_wrapper';
+import { Anomalies } from '../common/anomalies';
 
 interface Props {
   eventRateChartData: LineChartPoint[];
+  anomalyData?: Anomaly[];
   height: string;
   width: string;
   showAxis?: boolean;
   loading?: boolean;
+  fadeChart?: boolean;
 }
 
 export const EventRateChart: FC<Props> = ({
   eventRateChartData,
+  anomalyData,
   height,
   width,
   showAxis,
   loading = false,
+  fadeChart,
 }) => {
+  const barColor = fadeChart ? EVENT_RATE_COLOR_WITH_ANOMALIES : EVENT_RATE_COLOR;
+
   return (
     <div
       style={{ width, height }}
@@ -36,6 +44,7 @@ export const EventRateChart: FC<Props> = ({
           {showAxis === true && <Axes />}
 
           <Settings tooltip={TooltipType.None} />
+          <Anomalies anomalyData={anomalyData} />
           <BarSeries
             id="event_rate"
             xScaleType={ScaleType.Time}
@@ -43,7 +52,7 @@ export const EventRateChart: FC<Props> = ({
             xAccessor={'time'}
             yAccessors={['value']}
             data={eventRateChartData}
-            customSeriesColors={[EVENT_RATE_COLOR]}
+            customSeriesColors={[barColor]}
           />
         </Chart>
       </LoadingWrapper>
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/loading_wrapper/loading_wrapper.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/loading_wrapper/loading_wrapper.tsx
index 1087fdc8d0fceb..b8600489a4bd97 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/loading_wrapper/loading_wrapper.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/loading_wrapper/loading_wrapper.tsx
@@ -9,7 +9,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
 
 interface Props {
   hasData: boolean;
-  height: string;
+  height?: string;
   loading?: boolean;
 }
 
@@ -31,7 +31,7 @@ export const LoadingWrapper: FC<Props> = ({ hasData, loading = false, height, ch
         <EuiFlexGroup
           justifyContent="spaceAround"
           alignItems="center"
-          style={{ height, marginTop: `-${height}` }}
+          style={height !== undefined ? { height, marginTop: `-${height}` } : {}}
         >
           <EuiFlexItem grow={false}>
             <EuiLoadingSpinner size="xl" />
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/common/edit_categorization_analyzer_flyout/edit_categorization_analyzer_flyout.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/common/edit_categorization_analyzer_flyout/edit_categorization_analyzer_flyout.tsx
new file mode 100644
index 00000000000000..a44cbf3d0c71ae
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/common/edit_categorization_analyzer_flyout/edit_categorization_analyzer_flyout.tsx
@@ -0,0 +1,147 @@
+/*
+ * 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, FC, useEffect, useState, useContext } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiFlyout,
+  EuiFlyoutFooter,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiTitle,
+  EuiFlyoutBody,
+  EuiSpacer,
+} from '@elastic/eui';
+import { MLJobEditor } from '../../../../../jobs_list/components/ml_job_editor';
+import { isValidJson } from '../../../../../../../../common/util/validation_utils';
+import { JobCreatorContext } from '../../job_creator_context';
+import { CategorizationJobCreator } from '../../../../common/job_creator';
+import { getNewJobDefaults } from '../../../../../../services/ml_server_info';
+
+const EDITOR_HEIGHT = '800px';
+
+export const EditCategorizationAnalyzerFlyout: FC = () => {
+  const { jobCreator: jc, jobCreatorUpdate } = useContext(JobCreatorContext);
+  const jobCreator = jc as CategorizationJobCreator;
+  const [showJsonFlyout, setShowJsonFlyout] = useState(false);
+  const [saveable, setSaveable] = useState(false);
+
+  const [categorizationAnalyzerString, setCategorizationAnalyzerString] = useState(
+    JSON.stringify(jobCreator.categorizationAnalyzer, null, 2)
+  );
+
+  useEffect(() => {
+    if (showJsonFlyout === true) {
+      setCategorizationAnalyzerString(JSON.stringify(jobCreator.categorizationAnalyzer, null, 2));
+    }
+  }, [showJsonFlyout]);
+
+  function toggleJsonFlyout() {
+    setSaveable(false);
+    setShowJsonFlyout(!showJsonFlyout);
+  }
+
+  function onJSONChange(json: string) {
+    setCategorizationAnalyzerString(json);
+    const valid = isValidJson(json);
+    setSaveable(valid);
+  }
+
+  function onSave() {
+    jobCreator.categorizationAnalyzer = JSON.parse(categorizationAnalyzerString);
+    jobCreatorUpdate();
+    setShowJsonFlyout(false);
+  }
+
+  function onUseDefault() {
+    const { anomaly_detectors: anomalyDetectors } = getNewJobDefaults();
+    const analyzerString = JSON.stringify(anomalyDetectors.categorization_analyzer!, null, 2);
+    onJSONChange(analyzerString);
+  }
+
+  return (
+    <Fragment>
+      <FlyoutButton onClick={toggleJsonFlyout} />
+
+      {showJsonFlyout === true && (
+        <EuiFlyout onClose={() => setShowJsonFlyout(false)} hideCloseButton size="m">
+          <EuiFlyoutBody>
+            <Contents
+              onChange={onJSONChange}
+              title={i18n.translate('xpack.ml.newJob.wizard.categorizationAnalyzerFlyout.title', {
+                defaultMessage: 'Edit categorization analyzer JSON',
+              })}
+              value={categorizationAnalyzerString}
+            />
+          </EuiFlyoutBody>
+          <EuiFlyoutFooter>
+            <EuiFlexGroup justifyContent="spaceBetween">
+              <EuiFlexItem grow={false}>
+                <EuiButtonEmpty
+                  iconType="cross"
+                  onClick={() => setShowJsonFlyout(false)}
+                  flush="left"
+                >
+                  <FormattedMessage
+                    id="xpack.ml.newJob.wizard.categorizationAnalyzerFlyout.closeButton"
+                    defaultMessage="Close"
+                  />
+                </EuiButtonEmpty>
+              </EuiFlexItem>
+              <EuiFlexItem grow={true} />
+              <EuiFlexItem grow={false}>
+                <EuiButtonEmpty onClick={onUseDefault}>
+                  <FormattedMessage
+                    id="xpack.ml.newJob.wizard.categorizationAnalyzerFlyout.useDefaultButton"
+                    defaultMessage="Use default ML analyzer"
+                  />
+                </EuiButtonEmpty>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiButton onClick={onSave} fill isDisabled={saveable === false}>
+                  <FormattedMessage
+                    id="xpack.ml.newJob.wizard.categorizationAnalyzerFlyout.saveButton"
+                    defaultMessage="Save"
+                  />
+                </EuiButton>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlyoutFooter>
+        </EuiFlyout>
+      )}
+    </Fragment>
+  );
+};
+
+const FlyoutButton: FC<{ onClick(): void }> = ({ onClick }) => {
+  return (
+    <EuiButtonEmpty onClick={onClick} flush="left" data-test-subj="mlJobWizardButtonPreviewJobJson">
+      <FormattedMessage
+        id="xpack.ml.newJob.wizard.editCategorizationAnalyzerFlyoutButton"
+        defaultMessage="Edit categorization analyzer"
+      />
+    </EuiButtonEmpty>
+  );
+};
+
+const Contents: FC<{
+  title: string;
+  value: string;
+  onChange(s: string): void;
+}> = ({ title, value, onChange }) => {
+  return (
+    <EuiFlexItem>
+      <EuiTitle size="s">
+        <h5>{title}</h5>
+      </EuiTitle>
+      <EuiSpacer size="s" />
+      <MLJobEditor value={value} height={EDITOR_HEIGHT} readOnly={false} onChange={onChange} />
+    </EuiFlexItem>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/common/edit_categorization_analyzer_flyout/index.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/common/edit_categorization_analyzer_flyout/index.ts
new file mode 100644
index 00000000000000..5bc89a695b6c84
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/common/edit_categorization_analyzer_flyout/index.ts
@@ -0,0 +1,6 @@
+/*
+ * 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 { EditCategorizationAnalyzerFlyout } from './edit_categorization_analyzer_flyout';
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/advanced_section/components/model_plot/model_plot_switch.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/advanced_section/components/model_plot/model_plot_switch.tsx
index 64f9f450ae08d2..a034bdcc2900f8 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/advanced_section/components/model_plot/model_plot_switch.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/advanced_section/components/model_plot/model_plot_switch.tsx
@@ -10,16 +10,29 @@ import { EuiSpacer, EuiSwitch } from '@elastic/eui';
 import { JobCreatorContext } from '../../../../../job_creator_context';
 import { Description } from './description';
 import { MMLCallout } from '../mml_callout';
+import { ML_JOB_AGGREGATION } from '../../../../../../../../../../../common/constants/aggregation_types';
+import { isCategorizationJobCreator } from '../../../../../../../common/job_creator';
 
 export const ModelPlotSwitch: FC = () => {
-  const { jobCreator, jobCreatorUpdate } = useContext(JobCreatorContext);
+  const { jobCreator, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
   const [modelPlotEnabled, setModelPlotEnabled] = useState(jobCreator.modelPlot);
+  const [enabled, setEnabled] = useState(false);
 
   useEffect(() => {
     jobCreator.modelPlot = modelPlotEnabled;
     jobCreatorUpdate();
   }, [modelPlotEnabled]);
 
+  useEffect(() => {
+    const aggs = [ML_JOB_AGGREGATION.RARE];
+    // disable model plot switch if the wizard is creating a categorization job
+    // and a rare detector is being used.
+    const isRareCategoryJob =
+      isCategorizationJobCreator(jobCreator) &&
+      jobCreator.aggregations.some(agg => aggs.includes(agg.id));
+    setEnabled(isRareCategoryJob === false);
+  }, [jobCreatorUpdated]);
+
   function toggleModelPlot() {
     setModelPlotEnabled(!modelPlotEnabled);
   }
@@ -29,6 +42,7 @@ export const ModelPlotSwitch: FC = () => {
       <Description>
         <EuiSwitch
           name="switch"
+          disabled={enabled === false}
           checked={modelPlotEnabled}
           onChange={toggleModelPlot}
           data-test-subj="mlJobWizardSwitchModelPlot"
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/settings.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/settings.tsx
index bae9767a390770..e5aee972567980 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/settings.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/settings.tsx
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, FC, useContext, useEffect, useState } from 'react';
+import React, { Fragment, FC } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { JobCreatorContext } from '../../../job_creator_context';
 import { BucketSpan } from '../bucket_span';
 import { Influencers } from '../influencers';
 import { ModelMemoryLimitInput } from '../../../common/model_memory_limit';
@@ -17,19 +16,6 @@ interface Props {
 }
 
 export const AdvancedSettings: FC<Props> = ({ setIsValid }) => {
-  const { jobCreator, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
-  const [bucketSpan, setBucketSpan] = useState(jobCreator.bucketSpan);
-
-  useEffect(() => {
-    jobCreator.bucketSpan = bucketSpan;
-    jobCreatorUpdate();
-    setIsValid(bucketSpan !== '');
-  }, [bucketSpan]);
-
-  useEffect(() => {
-    setBucketSpan(jobCreator.bucketSpan);
-  }, [jobCreatorUpdated]);
-
   return (
     <Fragment>
       <EuiFlexGroup gutterSize="xl">
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span/bucket_span.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span/bucket_span.tsx
index dfe9272984b814..216561bac2c626 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span/bucket_span.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span/bucket_span.tsx
@@ -14,9 +14,10 @@ import { BucketSpanEstimator } from '../bucket_span_estimator';
 
 interface Props {
   setIsValid: (proceed: boolean) => void;
+  hideEstimateButton?: boolean;
 }
 
-export const BucketSpan: FC<Props> = ({ setIsValid }) => {
+export const BucketSpan: FC<Props> = ({ setIsValid, hideEstimateButton = false }) => {
   const {
     jobCreator,
     jobCreatorUpdate,
@@ -56,9 +57,11 @@ export const BucketSpan: FC<Props> = ({ setIsValid }) => {
             disabled={estimating}
           />
         </EuiFlexItem>
-        <EuiFlexItem>
-          <BucketSpanEstimator setEstimating={setEstimating} />
-        </EuiFlexItem>
+        {hideEstimateButton === false && (
+          <EuiFlexItem>
+            <BucketSpanEstimator setEstimating={setEstimating} />
+          </EuiFlexItem>
+        )}
       </EuiFlexGroup>
     </Description>
   );
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/categorization_detector.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/categorization_detector.tsx
new file mode 100644
index 00000000000000..96ac1c3f0e325c
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/categorization_detector.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useContext, useEffect, useState } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiFlexGroup, EuiSpacer, EuiTitle } from '@elastic/eui';
+
+import { ML_JOB_AGGREGATION } from '../../../../../../../../../common/constants/aggregation_types';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { CategorizationJobCreator } from '../../../../../common/job_creator';
+import { CountCard, RareCard } from './detector_cards';
+
+export const CategorizationDetector: FC = () => {
+  const { jobCreator: jc, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const jobCreator = jc as CategorizationJobCreator;
+  const [categorizationDetectorType, setCategorizationDetectorType] = useState(
+    jobCreator.selectedDetectorType
+  );
+
+  useEffect(() => {
+    if (categorizationDetectorType !== jobCreator.selectedDetectorType) {
+      jobCreator.setDetectorType(categorizationDetectorType);
+      jobCreatorUpdate();
+    }
+  }, [categorizationDetectorType]);
+
+  useEffect(() => {
+    setCategorizationDetectorType(jobCreator.selectedDetectorType);
+  }, [jobCreatorUpdated]);
+
+  function onCountSelection() {
+    setCategorizationDetectorType(ML_JOB_AGGREGATION.COUNT);
+  }
+  function onRareSelection() {
+    setCategorizationDetectorType(ML_JOB_AGGREGATION.RARE);
+  }
+
+  return (
+    <>
+      <EuiTitle size="xs">
+        <h3>
+          <FormattedMessage
+            id="xpack.ml.newJob.wizard.pickFieldsStep.categorizationDetectorSelect.title"
+            defaultMessage="Categorization detector"
+          />
+        </h3>
+      </EuiTitle>
+      <EuiSpacer size="s" />
+      <EuiFlexGroup gutterSize="l" style={{ maxWidth: '824px' }}>
+        <CountCard
+          onClick={onCountSelection}
+          isSelected={categorizationDetectorType === ML_JOB_AGGREGATION.COUNT}
+        />
+        <RareCard
+          onClick={onRareSelection}
+          isSelected={categorizationDetectorType === ML_JOB_AGGREGATION.RARE}
+        />
+      </EuiFlexGroup>
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/detector_cards.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/detector_cards.tsx
new file mode 100644
index 00000000000000..68d5fc24a96e3c
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/detector_cards.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 React, { FC } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { EuiFlexItem, EuiCard } from '@elastic/eui';
+
+interface CardProps {
+  onClick: () => void;
+  isSelected: boolean;
+}
+
+export const CountCard: FC<CardProps> = ({ onClick, isSelected }) => (
+  <EuiFlexItem>
+    <EuiCard
+      title={i18n.translate(
+        'xpack.ml.newJob.wizard.pickFieldsStep.categorizationDetectorSelect.countCard.title',
+        {
+          defaultMessage: 'Count',
+        }
+      )}
+      description={
+        <>
+          <FormattedMessage
+            id="xpack.ml.newJob.wizard.pickFieldsStep.categorizationDetectorSelect.countCard.description"
+            defaultMessage="Look for anomalies in the event rate of a particular category."
+          />
+        </>
+      }
+      selectable={{ onClick, isSelected }}
+    />
+  </EuiFlexItem>
+);
+
+export const RareCard: FC<CardProps> = ({ onClick, isSelected }) => (
+  <EuiFlexItem>
+    <EuiCard
+      title={i18n.translate(
+        'xpack.ml.newJob.wizard.pickFieldsStep.categorizationDetectorSelect.rareCard.title',
+        {
+          defaultMessage: 'Rare',
+        }
+      )}
+      description={
+        <>
+          <FormattedMessage
+            id="xpack.ml.newJob.wizard.pickFieldsStep.categorizationDetectorSelect.rareCard.description"
+            defaultMessage="Look for categories that occur rarely in time."
+          />
+        </>
+      }
+      selectable={{ onClick, isSelected }}
+    />
+  </EuiFlexItem>
+);
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/index.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/index.ts
new file mode 100644
index 00000000000000..6a13d86d0db9a3
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_detector/index.ts
@@ -0,0 +1,6 @@
+/*
+ * 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 { CategorizationDetector } from './categorization_detector';
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_field/categorization_field.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_field/categorization_field.tsx
index f9edf79364c97d..015300debb1569 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_field/categorization_field.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_field/categorization_field.tsx
@@ -25,8 +25,10 @@ export const CategorizationField: FC = () => {
   );
 
   useEffect(() => {
-    jobCreator.categorizationFieldName = categorizationFieldName;
-    jobCreatorUpdate();
+    if (jobCreator.categorizationFieldName !== categorizationFieldName) {
+      jobCreator.categorizationFieldName = categorizationFieldName;
+      jobCreatorUpdate();
+    }
   }, [categorizationFieldName]);
 
   useEffect(() => {
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/categorization_view.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/categorization_view.tsx
new file mode 100644
index 00000000000000..5017b0c3239e84
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/categorization_view.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 React, { FC, useEffect, useState } from 'react';
+import { EuiHorizontalRule } from '@elastic/eui';
+
+import { CategorizationDetectors } from './metric_selection';
+import { CategorizationDetectorsSummary } from './metric_selection_summary';
+import { CategorizationSettings } from './settings';
+
+interface Props {
+  isActive: boolean;
+  setCanProceed?: (proceed: boolean) => void;
+}
+
+export const CategorizationView: FC<Props> = ({ isActive, setCanProceed }) => {
+  const [categoryFieldValid, setCategoryFieldValid] = useState(false);
+  const [settingsValid, setSettingsValid] = useState(false);
+
+  useEffect(() => {
+    if (typeof setCanProceed === 'function') {
+      setCanProceed(categoryFieldValid && settingsValid);
+    }
+  }, [categoryFieldValid, settingsValid]);
+
+  return isActive === false ? (
+    <CategorizationDetectorsSummary />
+  ) : (
+    <>
+      <CategorizationDetectors setIsValid={setCategoryFieldValid} />
+      {categoryFieldValid && (
+        <>
+          <EuiHorizontalRule margin="l" />
+          <CategorizationSettings setIsValid={setSettingsValid} />
+        </>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/examples_valid_callout.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/examples_valid_callout.tsx
new file mode 100644
index 00000000000000..04934d2dc9a36d
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/examples_valid_callout.tsx
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { EuiCallOut, EuiSpacer, EuiCallOutProps } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { CategorizationAnalyzer } from '../../../../../../../services/ml_server_info';
+import { EditCategorizationAnalyzerFlyout } from '../../../common/edit_categorization_analyzer_flyout';
+import {
+  NUMBER_OF_CATEGORY_EXAMPLES,
+  CATEGORY_EXAMPLES_MULTIPLIER,
+  CATEGORY_EXAMPLES_ERROR_LIMIT,
+  CATEGORY_EXAMPLES_WARNING_LIMIT,
+} from '../../../../../../../../../common/constants/new_job';
+
+type CategorizationAnalyzerType = CategorizationAnalyzer | null;
+
+interface Props {
+  examplesValid: number;
+  categorizationAnalyzer: CategorizationAnalyzerType;
+}
+
+export const ExamplesValidCallout: FC<Props> = ({ examplesValid, categorizationAnalyzer }) => {
+  const percentageText = <PercentageText examplesValid={examplesValid} />;
+  const analyzerUsed = <AnalyzerUsed categorizationAnalyzer={categorizationAnalyzer} />;
+
+  let color: EuiCallOutProps['color'] = 'success';
+  let title = i18n.translate(
+    'xpack.ml.newJob.wizard.pickFieldsStep.categorizationFieldCalloutTitle.valid',
+    {
+      defaultMessage: 'Selected category field is valid',
+    }
+  );
+
+  if (examplesValid < CATEGORY_EXAMPLES_ERROR_LIMIT) {
+    color = 'danger';
+    title = i18n.translate(
+      'xpack.ml.newJob.wizard.pickFieldsStep.categorizationFieldCalloutTitle.invalid',
+      {
+        defaultMessage: 'Selected category field is invalid',
+      }
+    );
+  } else if (examplesValid < CATEGORY_EXAMPLES_WARNING_LIMIT) {
+    color = 'warning';
+    title = i18n.translate(
+      'xpack.ml.newJob.wizard.pickFieldsStep.categorizationFieldCalloutTitle.possiblyInvalid',
+      {
+        defaultMessage: 'Selected category field is possibly invalid',
+      }
+    );
+  }
+
+  return (
+    <EuiCallOut color={color} title={title}>
+      {percentageText}
+      <EuiSpacer size="s" />
+      {analyzerUsed}
+    </EuiCallOut>
+  );
+};
+
+const PercentageText: FC<{ examplesValid: number }> = ({ examplesValid }) => (
+  <div>
+    <FormattedMessage
+      id="xpack.ml.newJob.wizard.pickFieldsStep.categorizationFieldPercentage"
+      defaultMessage="{number} field values analyzed, {percentage}% contain valid tokens."
+      values={{
+        number: NUMBER_OF_CATEGORY_EXAMPLES * CATEGORY_EXAMPLES_MULTIPLIER,
+        percentage: Math.floor(examplesValid * 100),
+      }}
+    />
+  </div>
+);
+
+const AnalyzerUsed: FC<{ categorizationAnalyzer: CategorizationAnalyzerType }> = ({
+  categorizationAnalyzer,
+}) => {
+  let analyzer = '';
+  if (typeof categorizationAnalyzer === null) {
+    return null;
+  }
+
+  if (typeof categorizationAnalyzer === 'string') {
+    analyzer = categorizationAnalyzer;
+  } else {
+    if (categorizationAnalyzer?.tokenizer !== undefined) {
+      analyzer = categorizationAnalyzer?.tokenizer!;
+    } else if (categorizationAnalyzer?.analyzer !== undefined) {
+      analyzer = categorizationAnalyzer?.analyzer!;
+    }
+  }
+
+  return (
+    <>
+      <div>
+        <FormattedMessage
+          id="xpack.ml.newJob.wizard.pickFieldsStep.categorizationFieldAnalyzer"
+          defaultMessage="Analyzer used: {analyzer}"
+          values={{ analyzer }}
+        />
+      </div>
+      <div>
+        <EditCategorizationAnalyzerFlyout />
+      </div>
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/field_examples.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/field_examples.tsx
new file mode 100644
index 00000000000000..7f9b2e43b90050
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/field_examples.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiBasicTable, EuiText } from '@elastic/eui';
+import { CategoryExample } from '../../../../../common/results_loader';
+
+interface Props {
+  fieldExamples: CategoryExample[] | null;
+}
+
+const TOKEN_HIGHLIGHT_COLOR = '#b0ccf7';
+
+export const FieldExamples: FC<Props> = ({ fieldExamples }) => {
+  if (fieldExamples === null || fieldExamples.length === 0) {
+    return null;
+  }
+
+  const columns = [
+    {
+      field: 'example',
+      name: i18n.translate(
+        'xpack.ml.newJob.wizard.pickFieldsStep.categorizationFieldExamples.title',
+        {
+          defaultMessage: 'Examples',
+        }
+      ),
+      render: (example: any) => (
+        <EuiText size="s">
+          <code>{example}</code>
+        </EuiText>
+      ),
+    },
+  ];
+  const items = fieldExamples.map((example, i) => {
+    const txt = [];
+    let tokenCounter = 0;
+    let buffer = '';
+    let charCount = 0;
+    while (charCount < example.text.length) {
+      const token = example.tokens[tokenCounter];
+      if (token && charCount === token.start_offset) {
+        txt.push(buffer);
+        buffer = '';
+        txt.push(<Token key={`${i}${charCount}`}>{token.token}</Token>);
+        charCount += token.end_offset - token.start_offset;
+        tokenCounter++;
+      } else {
+        buffer += example.text[charCount];
+        charCount++;
+      }
+    }
+    txt.push(buffer);
+    return { example: txt };
+  });
+  return <EuiBasicTable columns={columns} items={items} />;
+};
+
+const Token: FC = ({ children }) => (
+  <span style={{ backgroundColor: TOKEN_HIGHLIGHT_COLOR }}>{children}</span>
+);
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/index.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/index.ts
new file mode 100644
index 00000000000000..f61dfd88a37bb6
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/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 { CategorizationView } from './categorization_view';
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection.tsx
new file mode 100644
index 00000000000000..fda0066f9cd379
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection.tsx
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useContext, useEffect, useState } from 'react';
+import { EuiHorizontalRule } from '@elastic/eui';
+
+import { JobCreatorContext } from '../../../job_creator_context';
+import { CategorizationJobCreator } from '../../../../../common/job_creator';
+import { CategorizationField } from '../categorization_field';
+import { CategorizationDetector } from '../categorization_detector';
+import { FieldExamples } from './field_examples';
+import { ExamplesValidCallout } from './examples_valid_callout';
+import { CategoryExample } from '../../../../../common/results_loader';
+import { LoadingWrapper } from '../../../charts/loading_wrapper';
+
+interface Props {
+  setIsValid: (na: boolean) => void;
+}
+
+export const CategorizationDetectors: FC<Props> = ({ setIsValid }) => {
+  const { jobCreator: jc, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const jobCreator = jc as CategorizationJobCreator;
+
+  const [loadingData, setLoadingData] = useState(false);
+  const [start, setStart] = useState(jobCreator.start);
+  const [end, setEnd] = useState(jobCreator.end);
+  const [categorizationAnalyzerString, setCategorizationAnalyzerString] = useState(
+    JSON.stringify(jobCreator.categorizationAnalyzer)
+  );
+  const [fieldExamples, setFieldExamples] = useState<CategoryExample[] | null>(null);
+  const [examplesValid, setExamplesValid] = useState(0);
+
+  const [categorizationFieldName, setCategorizationFieldName] = useState(
+    jobCreator.categorizationFieldName
+  );
+
+  useEffect(() => {
+    if (jobCreator.categorizationFieldName !== categorizationFieldName) {
+      jobCreator.categorizationFieldName = categorizationFieldName;
+      jobCreatorUpdate();
+    }
+    loadFieldExamples();
+  }, [categorizationFieldName]);
+
+  useEffect(() => {
+    let updateExamples = false;
+    if (jobCreator.start !== start || jobCreator.end !== end) {
+      setStart(jobCreator.start);
+      setEnd(jobCreator.end);
+      updateExamples = true;
+    }
+    const tempCategorizationAnalyzerString = JSON.stringify(jobCreator.categorizationAnalyzer);
+    if (tempCategorizationAnalyzerString !== categorizationAnalyzerString) {
+      setCategorizationAnalyzerString(tempCategorizationAnalyzerString);
+      updateExamples = true;
+    }
+
+    if (updateExamples) {
+      loadFieldExamples();
+    }
+    if (jobCreator.categorizationFieldName !== categorizationFieldName) {
+      setCategorizationFieldName(jobCreator.categorizationFieldName);
+    }
+  }, [jobCreatorUpdated]);
+
+  async function loadFieldExamples() {
+    if (categorizationFieldName !== null) {
+      setLoadingData(true);
+      const { valid, examples } = await jobCreator.loadCategorizationFieldExamples();
+      setFieldExamples(examples);
+      setExamplesValid(valid);
+      setLoadingData(false);
+    } else {
+      setFieldExamples(null);
+      setExamplesValid(0);
+    }
+    setIsValid(categorizationFieldName !== null);
+  }
+
+  useEffect(() => {
+    jobCreatorUpdate();
+  }, [examplesValid]);
+
+  return (
+    <>
+      <CategorizationDetector />
+      <EuiHorizontalRule />
+      <CategorizationField />
+      {loadingData === true && (
+        <LoadingWrapper hasData={false} loading={true}>
+          <div />
+        </LoadingWrapper>
+      )}
+      {fieldExamples !== null && loadingData === false && (
+        <>
+          <ExamplesValidCallout
+            examplesValid={examplesValid}
+            categorizationAnalyzer={jobCreator.categorizationAnalyzer}
+          />
+          <FieldExamples fieldExamples={fieldExamples} />
+        </>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
new file mode 100644
index 00000000000000..768d8c394fb8f4
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useContext, useEffect, useState } from 'react';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { CategorizationJobCreator } from '../../../../../common/job_creator';
+import { Results, Anomaly } from '../../../../../common/results_loader';
+import { LineChartPoint } from '../../../../../common/chart_loader';
+import { EventRateChart } from '../../../charts/event_rate_chart';
+import { TopCategories } from './top_categories';
+
+const DTR_IDX = 0;
+
+export const CategorizationDetectorsSummary: FC = () => {
+  const { jobCreator: jc, chartLoader, resultsLoader, chartInterval } = useContext(
+    JobCreatorContext
+  );
+  const jobCreator = jc as CategorizationJobCreator;
+
+  const [loadingData, setLoadingData] = useState(false);
+  const [anomalyData, setAnomalyData] = useState<Anomaly[]>([]);
+  const [eventRateChartData, setEventRateChartData] = useState<LineChartPoint[]>([]);
+  const [jobIsRunning, setJobIsRunning] = useState(false);
+
+  function setResultsWrapper(results: Results) {
+    const anomalies = results.anomalies[DTR_IDX];
+    if (anomalies !== undefined) {
+      setAnomalyData(anomalies);
+    }
+  }
+
+  function watchProgress(progress: number) {
+    setJobIsRunning(progress > 0);
+  }
+
+  useEffect(() => {
+    // subscribe to progress and results
+    const resultsSubscription = resultsLoader.subscribeToResults(setResultsWrapper);
+    jobCreator.subscribeToProgress(watchProgress);
+    loadChart();
+    return () => {
+      resultsSubscription.unsubscribe();
+    };
+  }, []);
+
+  async function loadChart() {
+    setLoadingData(true);
+    try {
+      const resp = await chartLoader.loadEventRateChart(
+        jobCreator.start,
+        jobCreator.end,
+        chartInterval.getInterval().asMilliseconds()
+      );
+      setEventRateChartData(resp);
+    } catch (error) {
+      setEventRateChartData([]);
+    }
+    setLoadingData(false);
+  }
+
+  return (
+    <>
+      <EventRateChart
+        eventRateChartData={eventRateChartData}
+        anomalyData={anomalyData}
+        height="300px"
+        width="100%"
+        showAxis={true}
+        loading={loadingData}
+        fadeChart={jobIsRunning}
+      />
+      <TopCategories />
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/settings.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/settings.tsx
new file mode 100644
index 00000000000000..55db3d495707d4
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/settings.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+import { BucketSpan } from '../bucket_span';
+
+interface Props {
+  setIsValid: (proceed: boolean) => void;
+}
+
+export const CategorizationSettings: FC<Props> = ({ setIsValid }) => {
+  return (
+    <>
+      <EuiFlexGroup gutterSize="xl">
+        <EuiFlexItem>
+          <BucketSpan setIsValid={setIsValid} hideEstimateButton={true} />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/top_categories.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/top_categories.tsx
new file mode 100644
index 00000000000000..3bade07250b464
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/top_categories.tsx
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useContext, useEffect, useState } from 'react';
+import { EuiBasicTable, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { CategorizationJobCreator } from '../../../../../common/job_creator';
+import { Results } from '../../../../../common/results_loader';
+import { ml } from '../../../../../../../services/ml_api_service';
+import { NUMBER_OF_CATEGORY_EXAMPLES } from '../../../../../../../../../common/constants/new_job';
+
+export const TopCategories: FC = () => {
+  const { jobCreator: jc, resultsLoader } = useContext(JobCreatorContext);
+  const jobCreator = jc as CategorizationJobCreator;
+
+  const [tableRow, setTableRow] = useState<Array<{ count?: number; example: string }>>([]);
+  const [totalCategories, setTotalCategories] = useState(0);
+
+  function setResultsWrapper(results: Results) {
+    loadTopCats();
+  }
+
+  async function loadTopCats() {
+    const results = await ml.jobs.topCategories(jobCreator.jobId, NUMBER_OF_CATEGORY_EXAMPLES);
+    setTableRow(
+      results.categories.map(c => ({
+        count: c.count,
+        example: c.category.examples?.length ? c.category.examples[0] : '',
+      }))
+    );
+    setTotalCategories(results.total);
+  }
+
+  useEffect(() => {
+    // subscribe to result updates
+    const resultsSubscription = resultsLoader.subscribeToResults(setResultsWrapper);
+    return () => {
+      resultsSubscription.unsubscribe();
+    };
+  }, []);
+
+  const columns = [
+    // only include counts if model plot is enabled
+    ...(jobCreator.modelPlot
+      ? [
+          {
+            field: 'count',
+            name: 'count',
+            width: '100px',
+            render: (count: any) => (
+              <EuiText size="s">
+                <code>{count}</code>
+              </EuiText>
+            ),
+          },
+        ]
+      : []),
+    {
+      field: 'example',
+      name: 'Example',
+      render: (example: any) => (
+        <EuiText size="s">
+          <code>{example}</code>
+        </EuiText>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      {totalCategories > 0 && (
+        <>
+          <div>
+            <FormattedMessage
+              id="xpack.ml.newJob.wizard.pickFieldsStep.categorizationTotalCategories"
+              defaultMessage="Total categories: {totalCategories}"
+              values={{ totalCategories }}
+            />
+          </div>
+          <EuiBasicTable columns={columns} items={tableRow} />
+        </>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/settings.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/settings.tsx
index 5e800de755f26c..b28a9d3da81dcb 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/settings.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/settings.tsx
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, FC, useContext, useEffect, useState } from 'react';
+import React, { Fragment, FC } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { JobCreatorContext } from '../../../job_creator_context';
 import { BucketSpan } from '../bucket_span';
 import { SplitFieldSelector } from '../split_field';
 import { Influencers } from '../influencers';
@@ -18,19 +17,6 @@ interface Props {
 }
 
 export const MultiMetricSettings: FC<Props> = ({ setIsValid }) => {
-  const { jobCreator, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
-  const [bucketSpan, setBucketSpan] = useState(jobCreator.bucketSpan);
-
-  useEffect(() => {
-    jobCreator.bucketSpan = bucketSpan;
-    jobCreatorUpdate();
-    setIsValid(bucketSpan !== '');
-  }, [bucketSpan]);
-
-  useEffect(() => {
-    setBucketSpan(jobCreator.bucketSpan);
-  }, [jobCreatorUpdated]);
-
   return (
     <Fragment>
       <EuiFlexGroup gutterSize="xl">
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/settings.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/settings.tsx
index 46cdf44ce0f7da..b9de755e6c9469 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/settings.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/settings.tsx
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, FC, useContext, useEffect, useState } from 'react';
+import React, { Fragment, FC } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { JobCreatorContext } from '../../../job_creator_context';
 import { BucketSpan } from '../bucket_span';
 import { Influencers } from '../influencers';
 
@@ -16,19 +15,6 @@ interface Props {
 }
 
 export const PopulationSettings: FC<Props> = ({ setIsValid }) => {
-  const { jobCreator, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
-  const [bucketSpan, setBucketSpan] = useState(jobCreator.bucketSpan);
-
-  useEffect(() => {
-    jobCreator.bucketSpan = bucketSpan;
-    jobCreatorUpdate();
-    setIsValid(bucketSpan !== '');
-  }, [bucketSpan]);
-
-  useEffect(() => {
-    setBucketSpan(jobCreator.bucketSpan);
-  }, [jobCreatorUpdated]);
-
   return (
     <Fragment>
       <EuiFlexGroup gutterSize="xl">
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/settings.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/settings.tsx
index c750235051a6fa..f8e7275cf15bb3 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/settings.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/settings.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, FC, useContext, useEffect, useState } from 'react';
+import React, { Fragment, FC, useContext } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 
@@ -19,18 +19,7 @@ interface Props {
 }
 
 export const SingleMetricSettings: FC<Props> = ({ setIsValid }) => {
-  const { jobCreator, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
-  const [bucketSpan, setBucketSpan] = useState(jobCreator.bucketSpan);
-
-  useEffect(() => {
-    jobCreator.bucketSpan = bucketSpan;
-    jobCreatorUpdate();
-    setIsValid(bucketSpan !== '');
-  }, [bucketSpan]);
-
-  useEffect(() => {
-    setBucketSpan(jobCreator.bucketSpan);
-  }, [jobCreatorUpdated]);
+  const { jobCreator } = useContext(JobCreatorContext);
 
   const convertToMultiMetric = () => {
     convertToMultiMetricJob(jobCreator);
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/pick_fields.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/pick_fields.tsx
index 795dfc30f954a4..bfec49678bc34b 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/pick_fields.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/pick_fields.tsx
@@ -15,6 +15,7 @@ import { SingleMetricView } from './components/single_metric_view';
 import { MultiMetricView } from './components/multi_metric_view';
 import { PopulationView } from './components/population_view';
 import { AdvancedView } from './components/advanced_view';
+import { CategorizationView } from './components/categorization_view';
 import { JsonEditorFlyout, EDITOR_MODE } from '../common/json_editor_flyout';
 import { DatafeedPreviewFlyout } from '../common/datafeed_preview_flyout';
 
@@ -30,7 +31,9 @@ export const PickFieldsStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
         (jobCreator.type === JOB_TYPE.ADVANCED && jobValidator.modelMemoryLimit.valid)) &&
       jobValidator.bucketSpan.valid &&
       jobValidator.duplicateDetectors.valid &&
-      jobValidator.validating === false;
+      jobValidator.validating === false &&
+      (jobCreator.type !== JOB_TYPE.CATEGORIZATION ||
+        (jobCreator.type === JOB_TYPE.CATEGORIZATION && jobValidator.categorizationField));
     setNextActive(active);
   }, [jobValidatorUpdated]);
 
@@ -50,6 +53,9 @@ export const PickFieldsStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
           {jobType === JOB_TYPE.ADVANCED && (
             <AdvancedView isActive={isCurrentStep} setCanProceed={setNextActive} />
           )}
+          {jobType === JOB_TYPE.CATEGORIZATION && (
+            <CategorizationView isActive={isCurrentStep} setCanProceed={setNextActive} />
+          )}
           <WizardNav
             previous={() =>
               setCurrentStep(
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/summary_step/components/detector_chart/detector_chart.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/summary_step/components/detector_chart/detector_chart.tsx
index f72ff6cf985e56..564228604d71ec 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/summary_step/components/detector_chart/detector_chart.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/summary_step/components/detector_chart/detector_chart.tsx
@@ -11,6 +11,7 @@ import { SingleMetricView } from '../../../pick_fields_step/components/single_me
 import { MultiMetricView } from '../../../pick_fields_step/components/multi_metric_view';
 import { PopulationView } from '../../../pick_fields_step/components/population_view';
 import { AdvancedView } from '../../../pick_fields_step/components/advanced_view';
+import { CategorizationView } from '../../../pick_fields_step/components/categorization_view';
 
 export const DetectorChart: FC = () => {
   const { jobCreator } = useContext(JobCreatorContext);
@@ -21,6 +22,7 @@ export const DetectorChart: FC = () => {
       {jobCreator.type === JOB_TYPE.MULTI_METRIC && <MultiMetricView isActive={false} />}
       {jobCreator.type === JOB_TYPE.POPULATION && <PopulationView isActive={false} />}
       {jobCreator.type === JOB_TYPE.ADVANCED && <AdvancedView isActive={false} />}
+      {jobCreator.type === JOB_TYPE.CATEGORIZATION && <CategorizationView isActive={false} />}
     </Fragment>
   );
 };
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
index 8500279e742b78..51fc226751ae2a 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
@@ -32,15 +32,24 @@ function getWizardUrlFromCloningJob(job: CombinedJob) {
   const created = job?.custom_settings?.created_by;
   let page = '';
 
-  if (created === CREATED_BY_LABEL.SINGLE_METRIC) {
-    page = JOB_TYPE.SINGLE_METRIC;
-  } else if (created === CREATED_BY_LABEL.MULTI_METRIC) {
-    page = JOB_TYPE.MULTI_METRIC;
-  } else if (created === CREATED_BY_LABEL.POPULATION) {
-    page = JOB_TYPE.POPULATION;
-  } else {
-    page = JOB_TYPE.ADVANCED;
+  switch (created) {
+    case CREATED_BY_LABEL.SINGLE_METRIC:
+      page = JOB_TYPE.SINGLE_METRIC;
+      break;
+    case CREATED_BY_LABEL.MULTI_METRIC:
+      page = JOB_TYPE.MULTI_METRIC;
+      break;
+    case CREATED_BY_LABEL.POPULATION:
+      page = JOB_TYPE.POPULATION;
+      break;
+    case CREATED_BY_LABEL.CATEGORIZATION:
+      page = JOB_TYPE.CATEGORIZATION;
+      break;
+    default:
+      page = JOB_TYPE.ADVANCED;
+      break;
   }
+
   const indexPatternId = getIndexPatternIdFromName(job.datafeed_config.indices[0]);
 
   return `jobs/new_job/${page}?index=${indexPatternId}&_g=()`;
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx
index dbae1948cbe0f6..9a44d561c2d944 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx
@@ -151,6 +151,22 @@ export const Page: FC = () => {
       }),
       id: 'mlJobTypeLinkAdvancedJob',
     },
+    {
+      href: getUrl('#jobs/new_job/categorization'),
+      icon: {
+        type: 'createAdvancedJob',
+        ariaLabel: i18n.translate('xpack.ml.newJob.wizard.jobType.categorizationAriaLabel', {
+          defaultMessage: 'Categorization job',
+        }),
+      },
+      title: i18n.translate('xpack.ml.newJob.wizard.jobType.categorizationTitle', {
+        defaultMessage: 'Categorization',
+      }),
+      description: i18n.translate('xpack.ml.newJob.wizard.jobType.categorizationDescription', {
+        defaultMessage: 'Group log messages into categories and detect anomalies within them.',
+      }),
+      id: 'mlJobTypeLinkCategorizationJob',
+    },
   ];
 
   return (
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
index 2e025c49318181..3a37934e6203af 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
@@ -19,8 +19,12 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Wizard } from './wizard';
 import { WIZARD_STEPS } from '../components/step_types';
-import { jobCreatorFactory, isAdvancedJobCreator } from '../../common/job_creator';
 import { getJobCreatorTitle } from '../../common/job_creator/util/general';
+import {
+  jobCreatorFactory,
+  isAdvancedJobCreator,
+  isCategorizationJobCreator,
+} from '../../common/job_creator';
 import {
   JOB_TYPE,
   DEFAULT_MODEL_MEMORY_LIMIT,
@@ -34,6 +38,9 @@ import { getTimeFilterRange } from '../../../../components/full_time_range_selec
 import { TimeBuckets } from '../../../../util/time_buckets';
 import { ExistingJobsAndGroups, mlJobService } from '../../../../services/job_service';
 import { expandCombinedJobConfig } from '../../common/job_creator/configs';
+import { newJobCapsService } from '../../../../services/new_job_capabilities_service';
+import { EVENT_RATE_FIELD_ID } from '../../../../../../common/types/fields';
+import { getNewJobDefaults } from '../../../../services/ml_server_info';
 
 const PAGE_WIDTH = 1200; // document.querySelector('.single-metric-job-container').width();
 const BAR_TARGET = PAGE_WIDTH > 2000 ? 1000 : PAGE_WIDTH / 2;
@@ -66,6 +73,7 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
     // cloning a job
     const clonedJob = mlJobService.cloneJob(mlJobService.tempJobCloningObjects.job);
     const { job, datafeed } = expandCombinedJobConfig(clonedJob);
+    initCategorizationSettings();
     jobCreator.cloneFromExistingJob(job, datafeed);
 
     // if we're not skipping the time range, this is a standard job clone, so wipe the jobId
@@ -103,7 +111,11 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
     // creating a new job
     jobCreator.bucketSpan = DEFAULT_BUCKET_SPAN;
 
-    if (jobCreator.type !== JOB_TYPE.POPULATION && jobCreator.type !== JOB_TYPE.ADVANCED) {
+    if (
+      jobCreator.type !== JOB_TYPE.POPULATION &&
+      jobCreator.type !== JOB_TYPE.ADVANCED &&
+      jobCreator.type !== JOB_TYPE.CATEGORIZATION
+    ) {
       // for all other than population or advanced, use 10MB
       jobCreator.modelMemoryLimit = DEFAULT_MODEL_MEMORY_LIMIT;
     }
@@ -120,6 +132,7 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
 
     // auto set the time range if creating a new advanced job
     autoSetTimeRange = isAdvancedJobCreator(jobCreator);
+    initCategorizationSettings();
   }
 
   if (autoSetTimeRange && isAdvancedJobCreator(jobCreator)) {
@@ -137,6 +150,20 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
     }
   }
 
+  function initCategorizationSettings() {
+    if (isCategorizationJobCreator(jobCreator)) {
+      // categorization job will always use a count agg, so give it
+      // to the job creator now
+      const count = newJobCapsService.getAggById('count');
+      const rare = newJobCapsService.getAggById('rare');
+      const eventRate = newJobCapsService.getFieldById(EVENT_RATE_FIELD_ID);
+      jobCreator.setDefaultDetectorProperties(count, rare, eventRate);
+
+      const { anomaly_detectors: anomalyDetectors } = getNewJobDefaults();
+      jobCreator.categorizationAnalyzer = anomalyDetectors.categorization_analyzer!;
+    }
+  }
+
   const chartInterval = new TimeBuckets();
   chartInterval.setBarTarget(BAR_TARGET);
   chartInterval.setMaxBars(MAX_BARS);
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
index d1e81c1c344de0..0f19451b232632 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
@@ -4,12 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  IndexPattern,
-  esQuery,
-  Query,
-  esKuery,
-} from '../../../../../../../../../src/plugins/data/public';
+import { esQuery, Query, esKuery } from '../../../../../../../../../src/plugins/data/public';
+import { IIndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns';
 import { KibanaConfigTypeFix } from '../../../contexts/kibana';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../common/constants/search';
 import { SavedSearchSavedObject } from '../../../../../common/types/kibana';
@@ -19,7 +15,7 @@ import { getQueryFromSavedSearch } from '../../../util/index_utils';
 
 export function createSearchItems(
   kibanaConfig: KibanaConfigTypeFix,
-  indexPattern: IndexPattern,
+  indexPattern: IIndexPattern,
   savedSearch: SavedSearchSavedObject | null
 ) {
   // query is only used by the data visualizer as it needs
diff --git a/x-pack/legacy/plugins/ml/public/application/routing/routes/new_job/wizard.tsx b/x-pack/legacy/plugins/ml/public/application/routing/routes/new_job/wizard.tsx
index ea1baefdce0d1b..99c0511cd09ce7 100644
--- a/x-pack/legacy/plugins/ml/public/application/routing/routes/new_job/wizard.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/routing/routes/new_job/wizard.tsx
@@ -72,6 +72,16 @@ const advancedBreadcrumbs = [
   },
 ];
 
+const categorizationBreadcrumbs = [
+  ...baseBreadcrumbs,
+  {
+    text: i18n.translate('xpack.ml.jobsBreadcrumbs.categorizationLabel', {
+      defaultMessage: 'Categorization',
+    }),
+    href: '',
+  },
+];
+
 export const singleMetricRoute: MlRoute = {
   path: '/jobs/new_job/single_metric',
   render: (props, config, deps) => (
@@ -104,6 +114,14 @@ export const advancedRoute: MlRoute = {
   breadcrumbs: advancedBreadcrumbs,
 };
 
+export const categorizationRoute: MlRoute = {
+  path: '/jobs/new_job/categorization',
+  render: (props, config, deps) => (
+    <PageWrapper config={config} {...props} jobType={JOB_TYPE.CATEGORIZATION} deps={deps} />
+  ),
+  breadcrumbs: categorizationBreadcrumbs,
+};
+
 const PageWrapper: FC<WizardPageProps> = ({ location, config, jobType, deps }) => {
   const { index, savedSearchId } = queryString.parse(location.search);
   const { context, results } = useResolver(index, savedSearchId, config, {
diff --git a/x-pack/legacy/plugins/ml/public/application/routing/use_resolver.ts b/x-pack/legacy/plugins/ml/public/application/routing/use_resolver.ts
index f74260c06567e0..3716b9715bb5bf 100644
--- a/x-pack/legacy/plugins/ml/public/application/routing/use_resolver.ts
+++ b/x-pack/legacy/plugins/ml/public/application/routing/use_resolver.ts
@@ -60,8 +60,6 @@ export const useResolver = (
         }
       } catch (error) {
         // quietly fail. Let the resolvers handle the redirection if any fail to resolve
-        // eslint-disable-next-line no-console
-        console.error('ML page loading resolver', error);
       }
     })();
   }, []);
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 58692754d95d70..2ad2a148f05d1a 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
@@ -7,6 +7,7 @@
 import { Observable } from 'rxjs';
 import { Annotation } from '../../../../common/types/annotations';
 import { AggFieldNamePair } from '../../../../common/types/fields';
+import { Category } from '../../../../common/types/categories';
 import { ExistingJobsAndGroups } from '../job_service';
 import { PrivilegesResponse } from '../../../../common/types/privileges';
 import { MlSummaryJobs } from '../../../../common/types/jobs';
@@ -107,7 +108,7 @@ declare interface Ml {
   checkManageMLPrivileges(): Promise<PrivilegesResponse>;
   getJobStats(obj: object): Promise<any>;
   getDatafeedStats(obj: object): Promise<any>;
-  esSearch(obj: object): any;
+  esSearch(obj: object): Promise<any>;
   esSearch$(obj: object): Observable<any>;
   getIndices(): Promise<EsIndex[]>;
   dataRecognizerModuleJobsExist(obj: { moduleId: string }): Promise<any>;
@@ -171,6 +172,20 @@ declare interface Ml {
       start: number,
       end: number
     ): Promise<{ progress: number; isRunning: boolean; isJobClosed: boolean }>;
+    categorizationFieldExamples(
+      indexPatternTitle: string,
+      query: object,
+      size: number,
+      field: string,
+      timeField: string | undefined,
+      start: number,
+      end: number,
+      analyzer: any
+    ): Promise<{ valid: number; examples: any[] }>;
+    topCategories(
+      jobId: string,
+      count: number
+    ): Promise<{ total: number; categories: Array<{ count?: number; category: Category }> }>;
   };
 
   estimateBucketSpan(data: BucketSpanEstimatorData): Promise<BucketSpanEstimatorResponse>;
diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/jobs.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/jobs.js
index 4bec070b2cfdf2..05d98dc1a1e644 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/jobs.js
+++ b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/jobs.js
@@ -206,4 +206,41 @@ export const jobs = {
       },
     });
   },
+
+  categorizationFieldExamples(
+    indexPatternTitle,
+    query,
+    size,
+    field,
+    timeField,
+    start,
+    end,
+    analyzer
+  ) {
+    return http({
+      url: `${basePath}/jobs/categorization_field_examples`,
+      method: 'POST',
+      data: {
+        indexPatternTitle,
+        query,
+        size,
+        field,
+        timeField,
+        start,
+        end,
+        analyzer,
+      },
+    });
+  },
+
+  topCategories(jobId, count) {
+    return http({
+      url: `${basePath}/jobs/top_categories`,
+      method: 'POST',
+      data: {
+        jobId,
+        count,
+      },
+    });
+  },
 };
diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_server_info.ts b/x-pack/legacy/plugins/ml/public/application/services/ml_server_info.ts
index 95d670eda8a4f1..6bf5a7b0c97433 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/ml_server_info.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/ml_server_info.ts
@@ -11,10 +11,18 @@ export interface MlServerDefaults {
     categorization_examples_limit?: number;
     model_memory_limit?: string;
     model_snapshot_retention_days?: number;
+    categorization_analyzer?: CategorizationAnalyzer;
   };
   datafeeds: { scroll_size?: number };
 }
 
+export interface CategorizationAnalyzer {
+  char_filter?: any[];
+  tokenizer?: string;
+  filter?: any[];
+  analyzer?: string;
+}
+
 export interface MlServerLimits {
   max_model_memory_limit?: string;
 }
diff --git a/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts b/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts
index d78c9298c60736..051973d35d8deb 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities_service.ts
@@ -15,7 +15,6 @@ import {
 import {
   ES_FIELD_TYPES,
   IIndexPattern,
-  IndexPattern,
   IndexPatternsContract,
 } from '../../../../../../../src/plugins/data/public';
 import { ml } from './ml_api_service';
@@ -31,7 +30,7 @@ export function loadNewJobCapabilities(
   return new Promise(async (resolve, reject) => {
     if (indexPatternId !== undefined) {
       // index pattern is being used
-      const indexPattern: IndexPattern = await indexPatterns.get(indexPatternId);
+      const indexPattern: IIndexPattern = await indexPatterns.get(indexPatternId);
       await newJobCapsService.initializeFromIndexPattern(indexPattern);
       resolve(newJobCapsService.newJobCaps);
     } else if (savedSearchId !== undefined) {
diff --git a/x-pack/legacy/plugins/ml/public/application/util/index_utils.ts b/x-pack/legacy/plugins/ml/public/application/util/index_utils.ts
index 2b8838c04cf696..2e176b00443144 100644
--- a/x-pack/legacy/plugins/ml/public/application/util/index_utils.ts
+++ b/x-pack/legacy/plugins/ml/public/application/util/index_utils.ts
@@ -8,7 +8,11 @@ import { toastNotifications } from 'ui/notify';
 import { i18n } from '@kbn/i18n';
 import chrome from 'ui/chrome';
 import { Query } from 'src/plugins/data/public';
-import { IndexPattern, IndexPatternsContract } from '../../../../../../../src/plugins/data/public';
+import {
+  IndexPattern,
+  IIndexPattern,
+  IndexPatternsContract,
+} from '../../../../../../../src/plugins/data/public';
 import { IndexPatternSavedObject, SavedSearchSavedObject } from '../../../common/types/kibana';
 
 let indexPatternCache: IndexPatternSavedObject[] = [];
@@ -71,7 +75,7 @@ export function getIndexPatternIdFromName(name: string) {
 }
 
 export async function getIndexPatternAndSavedSearch(savedSearchId: string) {
-  const resp: { savedSearch: SavedSearchSavedObject | null; indexPattern: IndexPattern | null } = {
+  const resp: { savedSearch: SavedSearchSavedObject | null; indexPattern: IIndexPattern | null } = {
     savedSearch: null,
     indexPattern: null,
   };
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 2ca21efb0bd6ae..cf13d329182ba6 100644
--- a/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js
+++ b/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js
@@ -753,4 +753,29 @@ export const elasticsearchJsPlugin = (Client, config, components) => {
     ],
     method: 'GET',
   });
+
+  ml.categories = ca({
+    urls: [
+      {
+        fmt: '/_xpack/ml/anomaly_detectors/<%=jobId%>/results/categories/<%=categoryId%>',
+        req: {
+          jobId: {
+            type: 'string',
+          },
+          categoryId: {
+            type: 'string',
+          },
+        },
+      },
+      {
+        fmt: '/_xpack/ml/anomaly_detectors/<%=jobId%>/results/categories',
+        req: {
+          jobId: {
+            type: 'string',
+          },
+        },
+      },
+    ],
+    method: 'GET',
+  });
 };
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/index.js b/x-pack/legacy/plugins/ml/server/models/job_service/index.js
index 78d099dad6606a..186bcbae84546f 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/index.js
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/index.js
@@ -8,7 +8,7 @@ import { datafeedsProvider } from './datafeeds';
 import { jobsProvider } from './jobs';
 import { groupsProvider } from './groups';
 import { newJobCapsProvider } from './new_job_caps';
-import { newJobChartsProvider } from './new_job';
+import { newJobChartsProvider, categorizationExamplesProvider } from './new_job';
 
 export function jobServiceProvider(callWithRequest, request) {
   return {
@@ -17,5 +17,6 @@ export function jobServiceProvider(callWithRequest, request) {
     ...groupsProvider(callWithRequest),
     ...newJobCapsProvider(callWithRequest, request),
     ...newJobChartsProvider(callWithRequest, request),
+    ...categorizationExamplesProvider(callWithRequest, request),
   };
 }
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/categorization.ts b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/categorization.ts
new file mode 100644
index 00000000000000..34e871a936088c
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/categorization.ts
@@ -0,0 +1,294 @@
+/*
+ * 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 { ML_RESULTS_INDEX_PATTERN } from '../../../../common/constants/index_patterns';
+import { CATEGORY_EXAMPLES_MULTIPLIER } from '../../../../common/constants/new_job';
+import { CategoryId, Category, Token } from '../../../../common/types/categories';
+import { callWithRequestType } from '../../../../common/types/kibana';
+
+export function categorizationExamplesProvider(callWithRequest: callWithRequestType) {
+  async function categorizationExamples(
+    indexPatternTitle: string,
+    query: any,
+    size: number,
+    categorizationFieldName: string,
+    timeField: string | undefined,
+    start: number,
+    end: number,
+    analyzer?: any
+  ) {
+    if (timeField !== undefined) {
+      const range = {
+        range: {
+          [timeField]: {
+            gte: start,
+            format: 'epoch_millis',
+          },
+        },
+      };
+
+      if (query.bool === undefined) {
+        query.bool = {};
+      }
+      if (query.bool.filter === undefined) {
+        query.bool.filter = range;
+      } else {
+        if (Array.isArray(query.bool.filter)) {
+          query.bool.filter.push(range);
+        } else {
+          query.bool.filter.range = range;
+        }
+      }
+    }
+
+    const results = await callWithRequest('search', {
+      index: indexPatternTitle,
+      size,
+      body: {
+        _source: categorizationFieldName,
+        query,
+      },
+    });
+    const examples: string[] = results.hits?.hits
+      ?.map((doc: any) => doc._source[categorizationFieldName])
+      .filter((example: string | undefined) => example !== undefined);
+
+    let tokens: Token[] = [];
+    try {
+      const { tokens: tempTokens } = await callWithRequest('indices.analyze', {
+        body: {
+          ...getAnalyzer(analyzer),
+          text: examples,
+        },
+      });
+      tokens = tempTokens;
+    } catch (error) {
+      // fail silently, the tokens could not be loaded
+      // an empty list of tokens will be returned for each example
+    }
+
+    const lengths = examples.map(e => e.length);
+    const sumLengths = lengths.map((s => (a: number) => (s += a))(0));
+
+    const tokensPerExample: Token[][] = examples.map(e => []);
+
+    tokens.forEach((t, i) => {
+      for (let g = 0; g < sumLengths.length; g++) {
+        if (t.start_offset <= sumLengths[g] + g) {
+          const offset = g > 0 ? sumLengths[g - 1] + g : 0;
+          tokensPerExample[g].push({
+            ...t,
+            start_offset: t.start_offset - offset,
+            end_offset: t.end_offset - offset,
+          });
+          break;
+        }
+      }
+    });
+
+    return examples.map((e, i) => ({ text: e, tokens: tokensPerExample[i] }));
+  }
+
+  function getAnalyzer(analyzer: any) {
+    if (typeof analyzer === 'object' && analyzer.tokenizer !== undefined) {
+      return analyzer;
+    } else {
+      return { analyzer: 'standard' };
+    }
+  }
+
+  async function validateCategoryExamples(
+    indexPatternTitle: string,
+    query: any,
+    size: number,
+    categorizationFieldName: string,
+    timeField: string | undefined,
+    start: number,
+    end: number,
+    analyzer?: any
+  ) {
+    const examples = await categorizationExamples(
+      indexPatternTitle,
+      query,
+      size * CATEGORY_EXAMPLES_MULTIPLIER,
+      categorizationFieldName,
+      timeField,
+      start,
+      end,
+      analyzer
+    );
+
+    const sortedExamples = examples
+      .map((e, i) => ({ ...e, origIndex: i }))
+      .sort((a, b) => b.tokens.length - a.tokens.length);
+    const validExamples = sortedExamples.filter(e => e.tokens.length > 1);
+
+    return {
+      valid: sortedExamples.length === 0 ? 0 : validExamples.length / sortedExamples.length,
+      examples: sortedExamples
+        .filter(
+          (e, i) =>
+            i / CATEGORY_EXAMPLES_MULTIPLIER - Math.floor(i / CATEGORY_EXAMPLES_MULTIPLIER) === 0
+        )
+        .sort((a, b) => a.origIndex - b.origIndex)
+        .map(e => ({ text: e.text, tokens: e.tokens })),
+    };
+  }
+
+  async function getTotalCategories(jobId: string): Promise<{ total: number }> {
+    const totalResp = await callWithRequest('search', {
+      index: ML_RESULTS_INDEX_PATTERN,
+      size: 0,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {
+                term: {
+                  job_id: jobId,
+                },
+              },
+              {
+                exists: {
+                  field: 'category_id',
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+    return totalResp?.hits?.total?.value ?? 0;
+  }
+
+  async function getTopCategoryCounts(jobId: string, numberOfCategories: number) {
+    const top = await callWithRequest('search', {
+      index: ML_RESULTS_INDEX_PATTERN,
+      size: 0,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {
+                term: {
+                  job_id: jobId,
+                },
+              },
+              {
+                term: {
+                  result_type: 'model_plot',
+                },
+              },
+              {
+                term: {
+                  by_field_name: 'mlcategory',
+                },
+              },
+            ],
+          },
+        },
+        aggs: {
+          cat_count: {
+            terms: {
+              field: 'by_field_value',
+              size: numberOfCategories,
+            },
+          },
+        },
+      },
+    });
+
+    const catCounts: Array<{
+      id: CategoryId;
+      count: number;
+    }> = top.aggregations?.cat_count?.buckets.map((c: any) => ({
+      id: c.key,
+      count: c.doc_count,
+    }));
+    return catCounts || [];
+  }
+
+  async function getCategories(
+    jobId: string,
+    catIds: CategoryId[],
+    size: number
+  ): Promise<Category[]> {
+    const categoryFilter = catIds.length
+      ? {
+          terms: {
+            category_id: catIds,
+          },
+        }
+      : {
+          exists: {
+            field: 'category_id',
+          },
+        };
+    const result = await callWithRequest('search', {
+      index: ML_RESULTS_INDEX_PATTERN,
+      size,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {
+                term: {
+                  job_id: jobId,
+                },
+              },
+              categoryFilter,
+            ],
+          },
+        },
+      },
+    });
+
+    return result.hits.hits?.map((c: { _source: Category }) => c._source) || [];
+  }
+
+  async function topCategories(jobId: string, numberOfCategories: number) {
+    const catCounts = await getTopCategoryCounts(jobId, numberOfCategories);
+    const categories = await getCategories(
+      jobId,
+      catCounts.map(c => c.id),
+      catCounts.length || numberOfCategories
+    );
+
+    const catsById = categories.reduce((p, c) => {
+      p[c.category_id] = c;
+      return p;
+    }, {} as { [id: number]: Category });
+
+    const total = await getTotalCategories(jobId);
+
+    if (catCounts.length) {
+      return {
+        total,
+        categories: catCounts.map(({ id, count }) => {
+          return {
+            count,
+            category: catsById[id] ?? null,
+          };
+        }),
+      };
+    } else {
+      return {
+        total,
+        categories: categories.map(category => {
+          return {
+            category,
+          };
+        }),
+      };
+    }
+  }
+
+  return {
+    categorizationExamples,
+    validateCategoryExamples,
+    topCategories,
+  };
+}
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/charts.ts b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/charts.ts
index a8b6ba494a070a..88ae8caa91e4a1 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/charts.ts
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/charts.ts
@@ -6,7 +6,7 @@
 
 import { newJobLineChartProvider } from './line_chart';
 import { newJobPopulationChartProvider } from './population_chart';
-export type callWithRequestType = (action: string, params: any) => Promise<any>;
+import { callWithRequestType } from '../../../../common/types/kibana';
 
 export function newJobChartsProvider(callWithRequest: callWithRequestType) {
   const { newJobLineChart } = newJobLineChartProvider(callWithRequest);
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/index.ts b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/index.ts
index 758b834ed7b3a9..da23efa67d0b5c 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/index.ts
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/index.ts
@@ -5,3 +5,4 @@
  */
 
 export { newJobChartsProvider } from './charts';
+export { categorizationExamplesProvider } from './categorization';
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/line_chart.ts b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/line_chart.ts
index 5bb0f399821466..c1a5ad5e38ecc9 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/line_chart.ts
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/line_chart.ts
@@ -6,10 +6,9 @@
 
 import { get } from 'lodash';
 import { AggFieldNamePair, EVENT_RATE_FIELD_ID } from '../../../../common/types/fields';
+import { callWithRequestType } from '../../../../common/types/kibana';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
 
-export type callWithRequestType = (action: string, params: any) => Promise<any>;
-
 type DtrIndex = number;
 type TimeStamp = number;
 type Value = number | undefined | null;
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/population_chart.ts b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/population_chart.ts
index 812a135f6cf08a..ee35f13c44ee60 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/new_job/population_chart.ts
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/new_job/population_chart.ts
@@ -6,10 +6,9 @@
 
 import { get } from 'lodash';
 import { AggFieldNamePair, EVENT_RATE_FIELD_ID } from '../../../../common/types/fields';
+import { callWithRequestType } from '../../../../common/types/kibana';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
 
-export type callWithRequestType = (action: string, params: any) => Promise<any>;
-
 const OVER_FIELD_EXAMPLES_COUNT = 40;
 
 type DtrIndex = number;
diff --git a/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.js b/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.js
index 4205027eb5ce26..54d447c2881515 100644
--- a/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.js
+++ b/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.js
@@ -181,4 +181,22 @@ export function jobRoutes({ commonRouteConfig, elasticsearchPlugin, route }) {
       ...commonRouteConfig,
     },
   });
+
+  route({
+    method: 'GET',
+    path: '/api/ml/anomaly_detectors/{jobId}/results/categories/{categoryId}',
+    handler(request, reply) {
+      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
+      const options = {
+        jobId: request.params.jobId,
+        categoryId: request.params.categoryId,
+      };
+      return callWithRequest('ml.categories', options)
+        .then(resp => reply(resp))
+        .catch(resp => reply(wrapError(resp)));
+    },
+    config: {
+      ...commonRouteConfig,
+    },
+  });
 }
diff --git a/x-pack/legacy/plugins/ml/server/routes/job_service.js b/x-pack/legacy/plugins/ml/server/routes/job_service.js
index 78c57670b7ab3e..a83b4fa403f65c 100644
--- a/x-pack/legacy/plugins/ml/server/routes/job_service.js
+++ b/x-pack/legacy/plugins/ml/server/routes/job_service.js
@@ -270,4 +270,50 @@ export function jobServiceRoutes({ commonRouteConfig, elasticsearchPlugin, route
       ...commonRouteConfig,
     },
   });
+
+  route({
+    method: 'POST',
+    path: '/api/ml/jobs/categorization_field_examples',
+    handler(request) {
+      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
+      const { validateCategoryExamples } = jobServiceProvider(callWithRequest);
+      const {
+        indexPatternTitle,
+        timeField,
+        query,
+        size,
+        field,
+        start,
+        end,
+        analyzer,
+      } = request.payload;
+      return validateCategoryExamples(
+        indexPatternTitle,
+        query,
+        size,
+        field,
+        timeField,
+        start,
+        end,
+        analyzer
+      ).catch(resp => wrapError(resp));
+    },
+    config: {
+      ...commonRouteConfig,
+    },
+  });
+
+  route({
+    method: 'POST',
+    path: '/api/ml/jobs/top_categories',
+    handler(request) {
+      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
+      const { topCategories } = jobServiceProvider(callWithRequest);
+      const { jobId, count } = request.payload;
+      return topCategories(jobId, count).catch(resp => wrapError(resp));
+    },
+    config: {
+      ...commonRouteConfig,
+    },
+  });
 }

From 459cad534c37984cf24191672b88420271a62905 Mon Sep 17 00:00:00 2001
From: cachedout <mike.place@elastic.co>
Date: Thu, 9 Jan 2020 15:30:58 +0000
Subject: [PATCH 82/96] [Monitoring] h1 elements for accessibility (#52276)

* Add header element to indices page for WCAG

* Add h1 element for WCAG to node page

* Add h1 element for WCAG to stack monitoring overview page

* Add h1 to advanced nodes page in stack monitoring

* Add h1 to nodes page in stack monitoring

* Add h1 header for index advanced page in stack monitoring

* Standarize more on ide for h1 tag

* Give heading element to beats overview

* Update Beats listing page for H1 compat with WAVE

* Modified beat page to comply with heading rules from WCAG

* Kibana instance listing page updated for header WCAG

* Add WCAG header fix to logstash listing page

* Added headings for WCAG to logstash overview page

* Update pipeline listing page for WCAG A headings

* Fix WCAG heading problems in pipeline viewer

* Fix screen reader heading for APM overview page

* Update APM instances page for screen reader headings

* Update APM instance page for screen reader heading

* Update ccr page for screen reader headings

* More a11y fixes for headings in stack monitoring

* Fixup

* Consistant captalization per review

* Removed help text per review comment

* Include Elasticsearch node into screen reader message, per review feedback

* Update snapshots

* Linting

* Implement review suggestion for i8n compat

* Revert back to just plain string

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../components/apm/instance/instance.js       | 10 +++++++
 .../components/apm/instances/instances.js     | 18 ++++++++++-
 .../public/components/apm/overview/index.js   | 10 +++++++
 .../public/components/beats/beat/beat.js      |  7 +++++
 .../components/beats/listing/listing.js       | 18 ++++++++++-
 .../__snapshots__/overview.test.js.snap       | 30 +++++++++++++++----
 .../components/beats/overview/overview.js     | 21 +++++++++----
 .../cluster/overview/alerts_panel.js          |  4 +--
 .../components/cluster/overview/index.js      | 11 ++++++-
 .../ccr/__snapshots__/ccr.test.js.snap        |  9 ++++++
 .../components/elasticsearch/ccr/ccr.js       |  9 ++++++
 .../__snapshots__/ccr_shard.test.js.snap      |  4 +--
 .../elasticsearch/ccr_shard/ccr_shard.js      |  2 +-
 .../elasticsearch/index/advanced.js           | 10 +++++++
 .../elasticsearch/indices/indices.js          |  9 ++++++
 .../components/elasticsearch/node/advanced.js | 10 +++++++
 .../components/elasticsearch/node/node.js     | 11 ++++++-
 .../components/elasticsearch/nodes/nodes.js   | 10 +++++++
 .../components/kibana/instances/instances.js  |  9 ++++++
 .../public/components/license/index.js        |  6 ++++
 .../components/logstash/listing/listing.js    | 18 ++++++++++-
 .../components/logstash/overview/overview.js  | 10 +++++++
 .../pipeline_listing/pipeline_listing.js      | 10 +++++++
 .../pipeline_viewer.test.js.snap              | 18 +++++++++++
 .../statement_list_heading.test.js.snap       |  4 +--
 .../pipeline_viewer/views/pipeline_viewer.js  | 11 ++++++-
 .../views/statement_list_heading.js           |  2 +-
 .../__snapshots__/no_data.test.js.snap        | 10 +++++++
 .../public/components/no_data/no_data.js      | 17 +++++++++++
 29 files changed, 292 insertions(+), 26 deletions(-)

diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js b/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js
index 47e8bc3b46474e..cb7187a8c0753d 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js
@@ -14,8 +14,10 @@ import {
   EuiPageBody,
   EuiFlexGroup,
   EuiPageContent,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { Status } from './status';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export function ApmServerInstance({ summary, metrics, ...props }) {
   const seriesToShow = [
@@ -45,6 +47,14 @@ export function ApmServerInstance({ summary, metrics, ...props }) {
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.apm.instance.heading"
+              defaultMessage="APM Instance"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPageContent>
           <Status stats={summary} />
           <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/instances/instances.js b/x-pack/legacy/plugins/monitoring/public/components/apm/instances/instances.js
index cd9ee6c9433d03..f3a888bf9e905b 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/apm/instances/instances.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/apm/instances/instances.js
@@ -8,7 +8,14 @@ import React, { Fragment } from 'react';
 import moment from 'moment';
 import { uniq, get } from 'lodash';
 import { EuiMonitoringTable } from '../../table';
-import { EuiLink, EuiPage, EuiPageBody, EuiPageContent, EuiSpacer } from '@elastic/eui';
+import {
+  EuiLink,
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiSpacer,
+  EuiScreenReaderOnly,
+} from '@elastic/eui';
 import { Status } from './status';
 import { formatMetric } from '../../../lib/format_number';
 import { formatTimestampToDuration } from '../../../../common';
@@ -16,6 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { APM_SYSTEM_ID } from '../../../../common/constants';
 import { ListingCallOut } from '../../setup_mode/listing_callout';
 import { SetupModeBadge } from '../../setup_mode/badge';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 function getColumns(setupMode) {
   return [
@@ -133,6 +141,14 @@ export function ApmServerInstances({ apms, setupMode }) {
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.apm.instances.heading"
+              defaultMessage="APM Instances"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPageContent>
           <Status stats={data.stats} />
           <EuiSpacer size="m" />
diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js b/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js
index 8ef996d4d725d7..c053edc805611b 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js
@@ -14,8 +14,10 @@ import {
   EuiPageBody,
   EuiPanel,
   EuiPageContent,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { Status } from '../instances/status';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export function ApmOverview({ stats, metrics, ...props }) {
   const seriesToShow = [
@@ -45,6 +47,14 @@ export function ApmOverview({ stats, metrics, ...props }) {
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.apm.overview.heading"
+              defaultMessage="APM Overview"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPageContent>
           <Status stats={stats} />
           <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/monitoring/public/components/beats/beat/beat.js b/x-pack/legacy/plugins/monitoring/public/components/beats/beat/beat.js
index f3391965be145b..3fe211c0f2edc4 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/beats/beat/beat.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/beats/beat/beat.js
@@ -15,9 +15,11 @@ import {
   EuiSpacer,
   EuiPageContent,
   EuiPanel,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { SummaryStatus } from '../../summary_status';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export function Beat({ summary, metrics, ...props }) {
   const metricsToShow = [
@@ -137,6 +139,11 @@ export function Beat({ summary, metrics, ...props }) {
         </EuiPanel>
         <EuiSpacer size="m" />
         <EuiPageContent>
+          <EuiScreenReaderOnly>
+            <h1>
+              <FormattedMessage id="xpack.monitoring.beats.beat.heading" defaultMessage="Beat" />
+            </h1>
+          </EuiScreenReaderOnly>
           <EuiFlexGrid columns={2} gutterSize="s">
             {metricsToShow.map((metric, index) => (
               <EuiFlexItem key={index}>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/beats/listing/listing.js b/x-pack/legacy/plugins/monitoring/public/components/beats/listing/listing.js
index 66af12af3db8fd..dfc9117ef48bcb 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/beats/listing/listing.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/beats/listing/listing.js
@@ -6,7 +6,14 @@
 
 import React, { PureComponent } from 'react';
 import { uniq, get } from 'lodash';
-import { EuiPage, EuiPageBody, EuiPageContent, EuiSpacer, EuiLink } from '@elastic/eui';
+import {
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiSpacer,
+  EuiLink,
+  EuiScreenReaderOnly,
+} from '@elastic/eui';
 import { Stats } from 'plugins/monitoring/components/beats';
 import { formatMetric } from 'plugins/monitoring/lib/format_number';
 import { EuiMonitoringTable } from 'plugins/monitoring/components/table';
@@ -14,6 +21,7 @@ import { i18n } from '@kbn/i18n';
 import { BEATS_SYSTEM_ID } from '../../../../common/constants';
 import { ListingCallOut } from '../../setup_mode/listing_callout';
 import { SetupModeBadge } from '../../setup_mode/badge';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export class Listing extends PureComponent {
   getColumns() {
@@ -139,6 +147,14 @@ export class Listing extends PureComponent {
     return (
       <EuiPage>
         <EuiPageBody>
+          <EuiScreenReaderOnly>
+            <h1>
+              <FormattedMessage
+                id="xpack.monitoring.beats.listing.heading"
+                defaultMessage="Beats listing"
+              />
+            </h1>
+          </EuiScreenReaderOnly>
           <EuiPageContent>
             <Stats stats={stats} />
             <EuiSpacer size="m" />
diff --git a/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
index 8065cb8a3fa306..22d012a2ccca76 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
@@ -3,6 +3,15 @@
 exports[`Overview that overview page renders normally 1`] = `
 <EuiPage>
   <EuiPageBody>
+    <EuiScreenReaderOnly>
+      <h1>
+        <FormattedMessage
+          defaultMessage="Beats Overview"
+          id="xpack.monitoring.beats.overview.heading"
+          values={Object {}}
+        />
+      </h1>
+    </EuiScreenReaderOnly>
     <EuiPageContent>
       <Stats
         stats={Array []}
@@ -15,13 +24,13 @@ exports[`Overview that overview page renders normally 1`] = `
             <EuiTitle
               size="s"
             >
-              <h3>
+              <h2>
                 <FormattedMessage
                   defaultMessage="Active Beats in Last Day"
                   id="xpack.monitoring.beats.overview.activeBeatsInLastDayTitle"
                   values={Object {}}
                 />
-              </h3>
+              </h2>
             </EuiTitle>
             <EuiSpacer
               size="s"
@@ -59,13 +68,13 @@ exports[`Overview that overview page renders normally 1`] = `
             <EuiTitle
               size="s"
             >
-              <h3>
+              <h2>
                 <FormattedMessage
                   defaultMessage="Top 5 Beat Types in Last Day"
                   id="xpack.monitoring.beats.overview.top5BeatTypesInLastDayTitle"
                   values={Object {}}
                 />
-              </h3>
+              </h2>
             </EuiTitle>
             <EuiSpacer
               size="s"
@@ -95,13 +104,13 @@ exports[`Overview that overview page renders normally 1`] = `
             <EuiTitle
               size="s"
             >
-              <h3>
+              <h2>
                 <FormattedMessage
                   defaultMessage="Top 5 Versions in Last Day"
                   id="xpack.monitoring.beats.overview.top5VersionsInLastDayTitle"
                   values={Object {}}
                 />
-              </h3>
+              </h2>
             </EuiTitle>
             <EuiSpacer
               size="s"
@@ -194,6 +203,15 @@ exports[`Overview that overview page renders normally 1`] = `
 exports[`Overview that overview page shows a message if there is no beats data 1`] = `
 <EuiPage>
   <EuiPageBody>
+    <EuiScreenReaderOnly>
+      <h1>
+        <FormattedMessage
+          defaultMessage="Beats Overview"
+          id="xpack.monitoring.beats.overview.heading"
+          values={Object {}}
+        />
+      </h1>
+    </EuiScreenReaderOnly>
     <EuiPageContent>
       <Stats
         stats={Array []}
diff --git a/x-pack/legacy/plugins/monitoring/public/components/beats/overview/overview.js b/x-pack/legacy/plugins/monitoring/public/components/beats/overview/overview.js
index 02bffc32d31eab..83f92ea1b481cd 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/beats/overview/overview.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/beats/overview/overview.js
@@ -20,6 +20,7 @@ import {
   EuiPageBody,
   EuiPanel,
   EuiPageContent,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
@@ -31,12 +32,12 @@ function renderLatestActive(latestActive, latestTypes, latestVersions) {
         <EuiFlexItem>
           <EuiPanel>
             <EuiTitle size="s">
-              <h3>
+              <h2>
                 <FormattedMessage
                   id="xpack.monitoring.beats.overview.activeBeatsInLastDayTitle"
                   defaultMessage="Active Beats in Last Day"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
             <EuiSpacer size="s" />
             <LatestActive latestActive={latestActive} />
@@ -45,12 +46,12 @@ function renderLatestActive(latestActive, latestTypes, latestVersions) {
         <EuiFlexItem>
           <EuiPanel>
             <EuiTitle size="s">
-              <h3>
+              <h2>
                 <FormattedMessage
                   id="xpack.monitoring.beats.overview.top5BeatTypesInLastDayTitle"
                   defaultMessage="Top 5 Beat Types in Last Day"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
             <EuiSpacer size="s" />
             <LatestTypes latestTypes={latestTypes} />
@@ -59,12 +60,12 @@ function renderLatestActive(latestActive, latestTypes, latestVersions) {
         <EuiFlexItem>
           <EuiPanel>
             <EuiTitle size="s">
-              <h3>
+              <h2>
                 <FormattedMessage
                   id="xpack.monitoring.beats.overview.top5VersionsInLastDayTitle"
                   defaultMessage="Top 5 Versions in Last Day"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
             <EuiSpacer size="s" />
             <LatestVersions latestVersions={latestVersions} />
@@ -109,6 +110,14 @@ export function BeatsOverview({
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.beats.overview.heading"
+              defaultMessage="Beats Overview"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPageContent>
           <Stats stats={stats} />
           {renderLatestActive(latestActive, latestTypes, latestVersions)}
diff --git a/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/alerts_panel.js b/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/alerts_panel.js
index e65aec8602f400..33b26c7ec56e00 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/alerts_panel.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/alerts_panel.js
@@ -91,12 +91,12 @@ export function AlertsPanel({ alerts, changeUrl }) {
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle size="s">
-            <h4>
+            <h2>
               <FormattedMessage
                 id="xpack.monitoring.cluster.overview.alertsPanel.topClusterTitle"
                 defaultMessage="Top cluster alerts"
               />
-            </h4>
+            </h2>
           </EuiTitle>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/index.js b/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/index.js
index 3014a741601075..cad4bbf411c347 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/index.js
@@ -11,9 +11,10 @@ import { LogstashPanel } from './logstash_panel';
 import { AlertsPanel } from './alerts_panel';
 import { BeatsPanel } from './beats_panel';
 
-import { EuiPage, EuiPageBody } from '@elastic/eui';
+import { EuiPage, EuiPageBody, EuiScreenReaderOnly } from '@elastic/eui';
 import { ApmPanel } from './apm_panel';
 import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../../common/constants';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export function Overview(props) {
   const isFromStandaloneCluster = props.cluster.cluster_uuid === STANDALONE_CLUSTER_CLUSTER_UUID;
@@ -21,6 +22,14 @@ export function Overview(props) {
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.overview.heading"
+              defaultMessage="Stack Monitoring Overview"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <AlertsPanel alerts={props.cluster.alerts} changeUrl={props.changeUrl} />
 
         {!isFromStandaloneCluster ? (
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap
index bb765d0ab7b4ed..37e0039c94ec4c 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap
@@ -3,6 +3,15 @@
 exports[`Ccr that it renders normally 1`] = `
 <EuiPage>
   <EuiPageBody>
+    <EuiScreenReaderOnly>
+      <h1>
+        <FormattedMessage
+          defaultMessage="CCR"
+          id="xpack.monitoring.elasticsearch.ccr.heading"
+          values={Object {}}
+        />
+      </h1>
+    </EuiScreenReaderOnly>
     <EuiPageContent>
       <EuiPageContentBody>
         <EuiInMemoryTable
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js
index f0ec92a5a07072..8e87e94943ee47 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js
@@ -15,6 +15,7 @@ import {
   EuiIcon,
   EuiIconTip,
   EuiTextColor,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 
 import './ccr.css';
@@ -270,6 +271,14 @@ export class Ccr extends Component {
     return (
       <EuiPage>
         <EuiPageBody>
+          <EuiScreenReaderOnly>
+            <h1>
+              <FormattedMessage
+                id="xpack.monitoring.elasticsearch.ccr.heading"
+                defaultMessage="CCR"
+              />
+            </h1>
+          </EuiScreenReaderOnly>
           <EuiPageContent>
             <EuiPageContentBody>{this.renderTable()}</EuiPageContentBody>
           </EuiPageContent>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
index 3d03d13dde1e15..02e42b8647c03a 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
@@ -145,9 +145,9 @@ exports[`CcrShard that it renders normally 1`] = `
       <EuiTitle
         size="s"
       >
-        <h4>
+        <h2>
           September 27, 2018 9:32:09 AM
-        </h4>
+        </h2>
       </EuiTitle>
       <EuiHorizontalRule />
       <EuiCodeBlock
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
index 027918b15e5ca2..68c87b386da499 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
@@ -110,7 +110,7 @@ export class CcrShard extends PureComponent {
       >
         <Fragment>
           <EuiTitle size="s">
-            <h4>{formatDateTimeLocal(timestamp)}</h4>
+            <h2>{formatDateTimeLocal(timestamp)}</h2>
           </EuiTitle>
           <EuiHorizontalRule />
           <EuiCodeBlock language="json">{JSON.stringify(stat, null, 2)}</EuiCodeBlock>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/index/advanced.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/index/advanced.js
index 9e4c70307bec72..a0a339fabef92b 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/index/advanced.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/index/advanced.js
@@ -13,9 +13,11 @@ import {
   EuiSpacer,
   EuiFlexGrid,
   EuiFlexItem,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { IndexDetailStatus } from '../index_detail_status';
 import { MonitoringTimeseriesContainer } from '../../chart';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export const AdvancedIndex = ({ indexSummary, metrics, ...props }) => {
   const metricsToShow = [
@@ -35,6 +37,14 @@ export const AdvancedIndex = ({ indexSummary, metrics, ...props }) => {
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.elasticsearch.index.advanced.heading"
+              defaultMessage="Elasticsearch index advanced view"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPanel>
           <IndexDetailStatus stats={indexSummary} />
         </EuiPanel>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/indices/indices.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/indices/indices.js
index 232815e930388e..f8dd7b0af7a17e 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/indices/indices.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/indices/indices.js
@@ -19,6 +19,7 @@ import {
   EuiPanel,
   EuiSwitch,
   EuiSpacer,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -130,6 +131,14 @@ export const ElasticsearchIndices = ({
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.elasticsearch.indices.heading"
+              defaultMessage="Elasticsearch indices"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPanel>
           <ClusterStatus stats={clusterStatus} />
         </EuiPanel>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node/advanced.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node/advanced.js
index cc4d25c2e2edac..6fea34ed9c9016 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node/advanced.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node/advanced.js
@@ -13,9 +13,11 @@ import {
   EuiSpacer,
   EuiFlexGrid,
   EuiFlexItem,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { NodeDetailStatus } from '../node_detail_status';
 import { MonitoringTimeseriesContainer } from '../../chart';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export const AdvancedNode = ({ nodeSummary, metrics, ...props }) => {
   const metricsToShow = [
@@ -39,6 +41,14 @@ export const AdvancedNode = ({ nodeSummary, metrics, ...props }) => {
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.elasticsearch.nodes.advanced.heading"
+              defaultMessage="Elasticsearch node advanced"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPanel>
           <NodeDetailStatus stats={nodeSummary} />
         </EuiPanel>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node/node.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node/node.js
index b585de23c62541..e8b3ef7e680f88 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node/node.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/node/node.js
@@ -13,11 +13,13 @@ import {
   EuiFlexGrid,
   EuiFlexItem,
   EuiPanel,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { NodeDetailStatus } from '../node_detail_status';
 import { Logs } from '../../logs/';
 import { MonitoringTimeseriesContainer } from '../../chart';
 import { ShardAllocation } from '../shard_allocation/shard_allocation';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export const Node = ({
   nodeSummary,
@@ -38,10 +40,17 @@ export const Node = ({
     metrics.node_latency,
     metrics.node_segment_count,
   ];
-
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.elasticsearch.node.heading"
+              defaultMessage="Elasticsearch node"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPanel>
           <NodeDetailStatus stats={nodeSummary} />
         </EuiPanel>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
index 428da4ca913aa3..d9cf29f73ce0db 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
@@ -23,10 +23,12 @@ import {
   EuiCallOut,
   EuiButton,
   EuiText,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
 import { ELASTICSEARCH_SYSTEM_ID } from '../../../../common/constants';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { ListingCallOut } from '../../setup_mode/listing_callout';
 
 const getNodeTooltip = node => {
@@ -399,6 +401,14 @@ export function ElasticsearchNodes({ clusterStatus, showCgroupMetricsElasticsear
   return (
     <EuiPage>
       <EuiPageBody>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.elasticsearch.nodes.heading"
+              defaultMessage="Elasticsearch nodes"
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         {renderClusterStatus()}
         {setupModeCallout}
         <EuiPageContent>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/kibana/instances/instances.js b/x-pack/legacy/plugins/monitoring/public/components/kibana/instances/instances.js
index b9cd53ef9fe122..053130076fa77e 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/kibana/instances/instances.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/kibana/instances/instances.js
@@ -13,6 +13,7 @@ import {
   EuiSpacer,
   EuiLink,
   EuiCallOut,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { capitalize, get } from 'lodash';
 import { ClusterStatus } from '../cluster_status';
@@ -247,6 +248,14 @@ export class KibanaInstances extends PureComponent {
     return (
       <EuiPage>
         <EuiPageBody>
+          <EuiScreenReaderOnly>
+            <h1>
+              <FormattedMessage
+                id="xpack.monitoring.kibana.instances.heading"
+                defaultMessage="Kibana instances"
+              />
+            </h1>
+          </EuiScreenReaderOnly>
           <EuiPanel>
             <ClusterStatus stats={clusterStatus} />
           </EuiPanel>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/license/index.js b/x-pack/legacy/plugins/monitoring/public/components/license/index.js
index 0e92cda66bc625..75534da6fbef34 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/license/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/license/index.js
@@ -15,6 +15,7 @@ import {
   EuiLink,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { LicenseStatus, AddLicense } from 'plugins/xpack_main/components';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -61,6 +62,11 @@ export function License(props) {
   const { status, type, isExpired, expiryDate } = props;
   return (
     <EuiPage>
+      <EuiScreenReaderOnly>
+        <h1>
+          <FormattedMessage id="xpack.monitoring.license.heading" defaultMessage="License" />
+        </h1>
+      </EuiScreenReaderOnly>
       <EuiPageBody>
         <LicenseStatus isExpired={isExpired} status={status} type={type} expiryDate={expiryDate} />
         <EuiSpacer />
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/listing/listing.js b/x-pack/legacy/plugins/monitoring/public/components/logstash/listing/listing.js
index 073fc7fc61bcc9..7efe5863479703 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/listing/listing.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/listing/listing.js
@@ -6,7 +6,15 @@
 
 import React, { PureComponent } from 'react';
 import { get } from 'lodash';
-import { EuiPage, EuiLink, EuiPageBody, EuiPageContent, EuiPanel, EuiSpacer } from '@elastic/eui';
+import {
+  EuiPage,
+  EuiLink,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPanel,
+  EuiSpacer,
+  EuiScreenReaderOnly,
+} from '@elastic/eui';
 import { formatPercentageUsage, formatNumber } from '../../../lib/format_number';
 import { ClusterStatus } from '..//cluster_status';
 import { EuiMonitoringTable } from '../../table';
@@ -165,6 +173,14 @@ export class Listing extends PureComponent {
     return (
       <EuiPage>
         <EuiPageBody>
+          <EuiScreenReaderOnly>
+            <h1>
+              <FormattedMessage
+                id="xpack.monitoring.logstash.instances.heading"
+                defaultMessage="Logstash instances"
+              />
+            </h1>
+          </EuiScreenReaderOnly>
           <EuiPanel>
             <ClusterStatus stats={stats} />
           </EuiPanel>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/overview/overview.js b/x-pack/legacy/plugins/monitoring/public/components/logstash/overview/overview.js
index 9ed644aa043d69..ed9769b460d921 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/overview/overview.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/overview/overview.js
@@ -13,9 +13,11 @@ import {
   EuiSpacer,
   EuiFlexGrid,
   EuiFlexItem,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { ClusterStatus } from '../cluster_status';
 import { MonitoringTimeseriesContainer } from '../../chart';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export class Overview extends PureComponent {
   render() {
@@ -29,6 +31,14 @@ export class Overview extends PureComponent {
     return (
       <EuiPage>
         <EuiPageBody>
+          <EuiScreenReaderOnly>
+            <h1>
+              <FormattedMessage
+                id="xpack.monitoring.logstash.overview.heading"
+                defaultMessage="Logstash Overview"
+              />
+            </h1>
+          </EuiScreenReaderOnly>
           <EuiPanel>
             <ClusterStatus stats={stats} />
           </EuiPanel>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
index 32bd1303cdfa0f..72ef7a3b0ec5c3 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
@@ -16,12 +16,14 @@ import {
   EuiSpacer,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { formatMetric } from '../../../lib/format_number';
 import { ClusterStatus } from '../cluster_status';
 import { Sparkline } from 'plugins/monitoring/components/sparkline';
 import { EuiMonitoringSSPTable } from '../../table';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export class PipelineListing extends Component {
   tooltipXValueFormatter(xValue, dateFormat) {
@@ -148,6 +150,14 @@ export class PipelineListing extends Component {
     return (
       <EuiPage>
         <EuiPageBody>
+          <EuiScreenReaderOnly>
+            <h1>
+              <FormattedMessage
+                id="xpack.monitoring.logstash.pipline_listing.heading"
+                defaultMessage="Logstash pipelines"
+              />
+            </h1>
+          </EuiScreenReaderOnly>
           <EuiPanel>{this.renderStats()}</EuiPanel>
           <EuiSpacer size="m" />
           <EuiPageContent>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/pipeline_viewer.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/pipeline_viewer.test.js.snap
index b19560df7e951b..6b46371e0ee502 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/pipeline_viewer.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/pipeline_viewer.test.js.snap
@@ -3,6 +3,15 @@
 exports[`PipelineViewer component passes expected props 1`] = `
 <EuiPage>
   <EuiPageBody>
+    <EuiScreenReaderOnly>
+      <h1>
+        <FormattedMessage
+          defaultMessage="Logstash pipelines"
+          id="xpack.monitoring.logstash.pipeline_viewer.heading"
+          values={Object {}}
+        />
+      </h1>
+    </EuiScreenReaderOnly>
     <EuiPageContent
       className="monPipelineViewer"
       horizontalPosition="center"
@@ -71,6 +80,15 @@ exports[`PipelineViewer component passes expected props 1`] = `
 exports[`PipelineViewer component renders DetailDrawer when selected vertex is not null 1`] = `
 <EuiPage>
   <EuiPageBody>
+    <EuiScreenReaderOnly>
+      <h1>
+        <FormattedMessage
+          defaultMessage="Logstash pipelines"
+          id="xpack.monitoring.logstash.pipeline_viewer.heading"
+          values={Object {}}
+        />
+      </h1>
+    </EuiScreenReaderOnly>
     <EuiPageContent
       className="monPipelineViewer"
       horizontalPosition="center"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/statement_list_heading.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/statement_list_heading.test.js.snap
index 474e710b419769..acddd74cb91573 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/statement_list_heading.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/statement_list_heading.test.js.snap
@@ -19,9 +19,9 @@ exports[`StatementListHeading component renders title and icon type 1`] = `
     <EuiTitle
       size="s"
     >
-      <h4>
+      <h2>
         Filters
-      </h4>
+      </h2>
     </EuiTitle>
   </EuiFlexItem>
 </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/pipeline_viewer.js b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/pipeline_viewer.js
index d96a9c535dde70..0a3f2d143d2737 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/pipeline_viewer.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/pipeline_viewer.js
@@ -10,7 +10,8 @@ import { DetailDrawer } from './detail_drawer';
 import { Queue } from './queue';
 import { StatementSection } from './statement_section';
 import { i18n } from '@kbn/i18n';
-import { EuiSpacer, EuiPage, EuiPageContent, EuiPageBody } from '@elastic/eui';
+import { EuiSpacer, EuiPage, EuiPageContent, EuiPageBody, EuiScreenReaderOnly } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 export class PipelineViewer extends React.Component {
   constructor() {
@@ -42,6 +43,14 @@ export class PipelineViewer extends React.Component {
     return (
       <EuiPage>
         <EuiPageBody>
+          <EuiScreenReaderOnly>
+            <h1>
+              <FormattedMessage
+                id="xpack.monitoring.logstash.pipeline_viewer.heading"
+                defaultMessage="Logstash pipelines"
+              />
+            </h1>
+          </EuiScreenReaderOnly>
           <EuiPageContent
             verticalPosition="center"
             horizontalPosition="center"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/statement_list_heading.js b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/statement_list_heading.js
index c05bbab1cfc771..9a031ccbd212fb 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/statement_list_heading.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/statement_list_heading.js
@@ -16,7 +16,7 @@ export function StatementListHeading({ iconType, title }) {
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
         <EuiTitle size="s">
-          <h4>{title}</h4>
+          <h2>{title}</h2>
         </EuiTitle>
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
index cf096ed1f79142..95dd580775f314 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
@@ -4,6 +4,11 @@ exports[`NoData should show a default message if reason is unknown 1`] = `
 <div
   class="euiPage"
 >
+  <h1
+    class="euiScreenReaderOnly"
+  >
+    No monitoring data found.
+  </h1>
   <main
     class="euiPageBody euiPageBody--restrictWidth-custom"
     style="max-width:600px"
@@ -96,6 +101,11 @@ exports[`NoData should show text next to the spinner while checking a setting 1`
 <div
   class="euiPage"
 >
+  <h1
+    class="euiScreenReaderOnly"
+  >
+    No monitoring data found.
+  </h1>
   <main
     class="euiPageBody euiPageBody--restrictWidth-custom"
     style="max-width:600px"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/no_data/no_data.js b/x-pack/legacy/plugins/monitoring/public/components/no_data/no_data.js
index ca5be8adf3ef84..77329b6299376e 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/no_data/no_data.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/no_data/no_data.js
@@ -20,6 +20,7 @@ import {
   EuiTitle,
   EuiTextColor,
   EuiButtonEmpty,
+  EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { toggleSetupMode } from '../../lib/setup_mode';
@@ -54,6 +55,14 @@ export function NoData(props) {
   if (useInternalCollection) {
     return (
       <EuiPage>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.no_data.internal_collection.heading"
+              defaultMessage="No monitoring data found."
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPageBody restrictWidth={600}>
           <EuiPageContent
             verticalPosition="center"
@@ -88,6 +97,14 @@ export function NoData(props) {
 
   return (
     <EuiPage>
+      <EuiScreenReaderOnly>
+        <h1>
+          <FormattedMessage
+            id="xpack.monitoring.no_data.heading"
+            defaultMessage="No monitoring data found."
+          />
+        </h1>
+      </EuiScreenReaderOnly>
       <EuiPageBody restrictWidth={600}>
         <EuiPageContent
           verticalPosition="center"

From d4f584e0cb97809e5fd2579ae9fa62c6e0fc4821 Mon Sep 17 00:00:00 2001
From: Marta Bondyra <marta.bondyra@elastic.co>
Date: Thu, 9 Jan 2020 17:07:44 +0100
Subject: [PATCH 83/96] =?UTF-8?q?Fix=20eslint=20rule=20for=20vis=5Ftype=5F?=
 =?UTF-8?q?metric=20`jsx-a11y/click-events-hav=E2=80=A6=20(#54279)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                             | 6 ------
 .../public/components/metric_vis_value.js                | 9 ++++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 9719d1b35548ea..bdab4e0cebbe50 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -94,12 +94,6 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['src/legacy/core_plugins/vis_type_metric/**/*.{js,ts,tsx}'],
-      rules: {
-        'jsx-a11y/click-events-have-key-events': 'off',
-      },
-    },
     {
       files: ['src/legacy/core_plugins/vis_type_table/**/*.{js,ts,tsx}'],
       rules: {
diff --git a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_value.js b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_value.js
index ca5ab209572819..0776dd13a98685 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_value.js
+++ b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_value.js
@@ -21,13 +21,19 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-import { EuiKeyboardAccessible } from '@elastic/eui';
+import { EuiKeyboardAccessible, keyCodes } from '@elastic/eui';
 
 class MetricVisValue extends Component {
   onClick = () => {
     this.props.onFilter(this.props.metric);
   };
 
+  onKeyPress = e => {
+    if (e.keyCode === keyCodes.ENTER) {
+      this.onClick();
+    }
+  };
+
   render() {
     const { fontSize, metric, onFilter, showLabel } = this.props;
     const hasFilter = !!onFilter;
@@ -47,6 +53,7 @@ class MetricVisValue extends Component {
         className={containerClassName}
         style={{ backgroundColor: metric.bgColor }}
         onClick={hasFilter ? this.onClick : null}
+        onKeyPress={hasFilter ? this.onKeyPress : null}
         tabIndex={hasFilter ? 0 : null}
         role={hasFilter ? 'button' : null}
       >

From 599a470f544c061a2ebfc1f18a27f6aeeb7f1ca4 Mon Sep 17 00:00:00 2001
From: Pedro Luiz Cabral Salomon Prado <pedroprado010@users.noreply.github.com>
Date: Thu, 9 Jan 2020 13:10:55 -0300
Subject: [PATCH 84/96] Added space char (#49997)

added space to improve readability

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/legacy/plugins/canvas/i18n/functions/dict/map_column.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_column.ts b/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_column.ts
index e16a2ac67a54e0..589dd9b1dad873 100644
--- a/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_column.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_column.ts
@@ -14,7 +14,7 @@ export const help: FunctionHelp<FunctionFactory<typeof mapColumn>> = {
   help: i18n.translate('xpack.canvas.functions.mapColumnHelpText', {
     defaultMessage:
       'Adds a column calculated as the result of other columns. ' +
-      'Changes are made only when you provide arguments.' +
+      'Changes are made only when you provide arguments. ' +
       'See also {mapColumnFn} and {staticColumnFn}.',
     values: {
       mapColumnFn: '`mapColumn`',

From c2362d48070ff919a9df2b9d2c1e2b6a03726b58 Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Thu, 9 Jan 2020 10:13:22 -0700
Subject: [PATCH 85/96] [Reporting] Update some runtime validations (#53975)

* [Reporting] Update some runtime validations

* fix unit test

* i18n

* make warning logging of encryptionKey possible

* update snapshot

* revert unrelated config change
---
 docs/settings/reporting-settings.asciidoc     |  8 +++++
 x-pack/legacy/plugins/reporting/config.ts     |  2 +-
 ...e_config.js => validate_encryption_key.js} |  7 ++---
 .../__tests__/validate_server_host.ts         | 30 +++++++++++++++++++
 .../reporting/server/lib/validate/index.ts    | 20 ++++++++++---
 ...e_config.ts => validate_encryption_key.ts} | 14 +++++++--
 .../validate/validate_max_content_length.ts   |  1 +
 .../lib/validate/validate_server_host.ts      | 27 +++++++++++++++++
 8 files changed, 97 insertions(+), 12 deletions(-)
 rename x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/{validate_config.js => validate_encryption_key.js} (79%)
 create mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts
 rename x-pack/legacy/plugins/reporting/server/lib/validate/{validate_config.ts => validate_encryption_key.ts} (55%)
 create mode 100644 x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts

diff --git a/docs/settings/reporting-settings.asciidoc b/docs/settings/reporting-settings.asciidoc
index a754f91e9f22a1..a9fa2bd18d3154 100644
--- a/docs/settings/reporting-settings.asciidoc
+++ b/docs/settings/reporting-settings.asciidoc
@@ -54,6 +54,14 @@ The protocol for accessing Kibana, typically `http` or `https`.
 `xpack.reporting.kibanaServer.hostname`::
 The hostname for accessing {kib}, if different from the `server.host` value.
 
+[NOTE]
+============
+Reporting authenticates requests on the Kibana page only when the hostname matches the
+`xpack.reporting.kibanaServer.hostname` setting. Therefore Reporting would fail if the
+set value redirects to another server. For that reason, `"0"` is an invalid setting
+because, in the Reporting browser, it becomes an automatic redirect to `"0.0.0.0"`.
+============
+
 
 [float]
 [[reporting-job-queue-settings]]
diff --git a/x-pack/legacy/plugins/reporting/config.ts b/x-pack/legacy/plugins/reporting/config.ts
index 8b1d6f6f198054..34fc1f452fbc06 100644
--- a/x-pack/legacy/plugins/reporting/config.ts
+++ b/x-pack/legacy/plugins/reporting/config.ts
@@ -14,7 +14,7 @@ export async function config(Joi: any) {
     enabled: Joi.boolean().default(true),
     kibanaServer: Joi.object({
       protocol: Joi.string().valid(['http', 'https']),
-      hostname: Joi.string(),
+      hostname: Joi.string().invalid('0'),
       port: Joi.number().integer(),
     }).default(),
     queue: Joi.object({
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_config.js b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
similarity index 79%
rename from x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_config.js
rename to x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
index 8b5d6f4591ff5f..10980f702d8493 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_config.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_encryption_key.js
@@ -6,10 +6,9 @@
 
 import expect from '@kbn/expect';
 import sinon from 'sinon';
-import { validateConfig } from '../validate_config';
+import { validateEncryptionKey } from '../validate_encryption_key';
 
-// FAILING: https://github.com/elastic/kibana/issues/51373
-describe.skip('Reporting: Validate config', () => {
+describe('Reporting: Validate config', () => {
   const logger = {
     warning: sinon.spy(),
   };
@@ -25,7 +24,7 @@ describe.skip('Reporting: Validate config', () => {
         set: sinon.stub(),
       };
 
-      expect(() => validateConfig(config, logger)).not.to.throwError();
+      expect(() => validateEncryptionKey({ config: () => config }, logger)).not.to.throwError();
 
       sinon.assert.calledWith(config.set, 'xpack.reporting.encryptionKey');
       sinon.assert.calledWithMatch(logger.warning, /Generating a random key/);
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.ts
new file mode 100644
index 00000000000000..04f998fd3e5a5d
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_server_host.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 expect from '@kbn/expect';
+import sinon from 'sinon';
+import { ServerFacade } from '../../../../types';
+import { validateServerHost } from '../validate_server_host';
+
+const configKey = 'xpack.reporting.kibanaServer.hostname';
+
+describe('Reporting: Validate server host setting', () => {
+  it(`should log a warning and set ${configKey} if server.host is "0"`, () => {
+    const getStub = sinon.stub();
+    getStub.withArgs('server.host').returns('0');
+    getStub.withArgs(configKey).returns(undefined);
+    const config = {
+      get: getStub,
+      set: sinon.stub(),
+    };
+
+    expect(() =>
+      validateServerHost(({ config: () => config } as unknown) as ServerFacade)
+    ).to.throwError();
+
+    sinon.assert.calledWith(config.set, configKey);
+  });
+});
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
index 672f90358aba49..79a64bd82d0228 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
@@ -4,11 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { i18n } from '@kbn/i18n';
 import { ServerFacade, Logger } from '../../../types';
 import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_factory';
 import { validateBrowser } from './validate_browser';
-import { validateConfig } from './validate_config';
+import { validateEncryptionKey } from './validate_encryption_key';
 import { validateMaxContentLength } from './validate_max_content_length';
+import { validateServerHost } from './validate_server_host';
 
 export async function runValidations(
   server: ServerFacade,
@@ -18,13 +20,23 @@ export async function runValidations(
   try {
     await Promise.all([
       validateBrowser(server, browserFactory, logger),
-      validateConfig(server, logger),
+      validateEncryptionKey(server, logger),
       validateMaxContentLength(server, logger),
+      validateServerHost(server),
     ]);
-    logger.debug(`Reporting plugin self-check ok!`);
+    logger.debug(
+      i18n.translate('xpack.reporting.selfCheck.ok', {
+        defaultMessage: `Reporting plugin self-check ok!`,
+      })
+    );
   } catch (err) {
     logger.warning(
-      `Reporting plugin self-check failed. Please check the Kibana Reporting settings. ${err}`
+      i18n.translate('xpack.reporting.selfCheck.warning', {
+        defaultMessage: `Reporting plugin self-check generated a warning: {err}`,
+        values: {
+          err,
+        },
+      })
     );
   }
 }
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_config.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
similarity index 55%
rename from x-pack/legacy/plugins/reporting/server/lib/validate/validate_config.ts
rename to x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
index a1eb7be6ecae42..e0af94cbdc29cf 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_config.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_encryption_key.ts
@@ -4,17 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { i18n } from '@kbn/i18n';
 import crypto from 'crypto';
 import { ServerFacade, Logger } from '../../../types';
 
-export function validateConfig(serverFacade: ServerFacade, logger: Logger) {
+export function validateEncryptionKey(serverFacade: ServerFacade, logger: Logger) {
   const config = serverFacade.config();
 
   const encryptionKey = config.get('xpack.reporting.encryptionKey');
   if (encryptionKey == null) {
+    // TODO this should simply throw an error and let the handler conver it to a warning mesasge. See validateServerHost.
     logger.warning(
-      `Generating a random key for xpack.reporting.encryptionKey. To prevent pending reports from failing on restart, please set ` +
-        `xpack.reporting.encryptionKey in kibana.yml`
+      i18n.translate('xpack.reporting.selfCheckEncryptionKey.warning', {
+        defaultMessage:
+          `Generating a random key for {setting}. To prevent pending reports ` +
+          `from failing on restart, please set {setting} in kibana.yml`,
+        values: {
+          setting: 'xpack.reporting.encryptionKey',
+        },
+      })
     );
 
     // @ts-ignore: No set() method on KibanaConfig, just get() and has()
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
index ca38ce5d635c6a..f91cd40bfd3c73 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.ts
@@ -25,6 +25,7 @@ export async function validateMaxContentLength(server: ServerFacade, logger: Log
   const kibanaMaxContentBytes: number = config.get(KIBANA_MAX_SIZE_BYTES_PATH);
 
   if (kibanaMaxContentBytes > elasticSearchMaxContentBytes) {
+    // TODO this should simply throw an error and let the handler conver it to a warning mesasge. See validateServerHost.
     logger.warning(
       `${KIBANA_MAX_SIZE_BYTES_PATH} (${kibanaMaxContentBytes}) is higher than ElasticSearch's ${ES_MAX_SIZE_BYTES_PATH} (${elasticSearchMaxContentBytes}). ` +
         `Please set ${ES_MAX_SIZE_BYTES_PATH} in ElasticSearch to match, or lower your ${KIBANA_MAX_SIZE_BYTES_PATH} in Kibana to avoid this warning.`
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts
new file mode 100644
index 00000000000000..f4f4d61246b6ae
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_server_host.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ServerFacade } from '../../../types';
+
+const configKey = 'xpack.reporting.kibanaServer.hostname';
+
+export function validateServerHost(serverFacade: ServerFacade) {
+  const config = serverFacade.config();
+
+  const serverHost = config.get('server.host');
+  const reportingKibanaHostName = config.get(configKey);
+
+  if (!reportingKibanaHostName && serverHost === '0') {
+    // @ts-ignore: No set() method on KibanaConfig, just get() and has()
+    config.set(configKey, '0.0.0.0'); // update config in memory to allow Reporting to work
+
+    throw new Error(
+      `Found 'server.host: "0"' in settings. This is incompatible with Reporting. ` +
+        `To enable Reporting to work, '${configKey}: 0.0.0.0' is being automatically to the configuration. ` +
+        `You can change to 'server.host: 0.0.0.0' or add '${configKey}: 0.0.0.0' in kibana.yml to prevent this message.`
+    );
+  }
+}

From 31a0bfd540e4780b169c6c9f2329e46e3a50a1cf Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Thu, 9 Jan 2020 18:23:44 +0100
Subject: [PATCH 86/96] [Uptime] Monitor details page left side title (#53529)

* update API

* update query

* hide layer control and added loc tags

* update test

* remove unused comment

* update API

* remove capitalization

* style fix

* update types

* added location status number on details page

* useref instead of createRef

* update interface

* update import

* removed redundant file

* fix header for empty data

* refactor for most recent check

* remove redundant code

* remone unused translation

* update status bar

* update styling

* update snaps

* added API tests

* fix types

* fixing integration tests and a typo

* remove unused translations

* update tests

* fixed PR feedback

* update feedback

* update messaging

* update snap

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/legacy/plugins/uptime/README.md        |  4 +-
 .../uptime/common/graphql/introspection.json  | 58 ------------
 .../plugins/uptime/common/graphql/types.ts    | 22 +----
 .../uptime/common/runtime_types/index.ts      |  3 +-
 .../{monitor_details.ts => details.ts}        |  1 +
 .../runtime_types/monitor}/index.ts           |  4 +-
 .../{monitor_locations.ts => locations.ts}    |  0
 .../empty_status_bar.test.tsx.snap            | 29 ------
 .../monitor_ssl_certificate.test.tsx.snap     | 18 ++--
 .../monitor_status.bar.test.tsx.snap          | 57 +++++-------
 .../uptime_date_picker.test.tsx.snap          | 44 ++-------
 .../__tests__/empty_status_bar.test.tsx       | 21 -----
 .../monitor_ssl_certificate.test.tsx          |  2 +-
 .../__tests__/monitor_status.bar.test.tsx     | 61 +++++++++----
 .../__tests__/uptime_date_picker.test.tsx     | 27 +-----
 .../__snapshots__/data_missing.test.tsx.snap  |  2 +-
 .../__snapshots__/empty_state.test.tsx.snap   | 23 ++---
 .../__tests__/data_missing.test.tsx           |  2 +-
 .../__tests__/empty_state.test.tsx            | 12 +--
 .../functional/empty_state/data_missing.tsx   | 83 ++++++++---------
 .../functional/empty_state/empty_state.tsx    |  5 +-
 .../functional/empty_status_bar.tsx           | 31 -------
 .../public/components/functional/index.ts     |  4 +-
 .../embeddables/__tests__/map_config.test.ts  |  8 +-
 .../location_map/embeddables/embedded_map.tsx | 25 ++++--
 .../location_map/embeddables/map_config.ts    |  3 +-
 .../functional/location_map/location_map.tsx  |  4 +-
 .../functional/monitor_page_title.tsx         | 38 --------
 .../monitor_status_bar/monitor_status_bar.tsx | 80 -----------------
 .../status_by_location.test.tsx.snap          | 51 +++++++++++
 .../__test__/status_by_location.test.tsx      | 81 +++++++++++++++++
 .../monitor_status_details/index.ts           |  6 +-
 .../monitor_status_bar/index.ts               | 50 +++++++++++
 .../monitor_ssl_certificate.tsx               | 44 ++++-----
 .../monitor_status_bar/monitor_status_bar.tsx | 79 ++++++++++++++++
 .../monitor_status_bar/status_by_location.tsx | 70 +++++++++++++++
 .../monitor_status_bar/translations.ts        |  0
 .../monitor_status_details.tsx                |  9 +-
 .../public/components/functional/snapshot.tsx |  2 +-
 .../functional/uptime_date_picker.tsx         | 11 ++-
 .../contexts/uptime_settings_context.ts       |  6 +-
 .../plugins/uptime/public/pages/index.ts      |  1 +
 .../plugins/uptime/public/pages/monitor.tsx   | 49 +++-------
 .../plugins/uptime/public/pages/overview.tsx  | 30 ++-----
 .../uptime/public/pages/page_header.tsx       | 85 ++++++++++++++++++
 .../plugins/uptime/public/queries/index.ts    |  2 -
 .../queries/monitor_page_title_query.ts       | 20 -----
 .../queries/monitor_status_bar_query.ts       | 41 ---------
 .../legacy/plugins/uptime/public/routes.tsx   | 32 +++++++
 .../uptime/public/state/actions/index.ts      |  1 +
 .../public/state/actions/monitor_status.ts    | 15 ++++
 .../uptime/public/state/actions/types.ts      |  2 +
 .../plugins/uptime/public/state/api/index.ts  |  1 +
 .../uptime/public/state/api/monitor_status.ts | 49 ++++++++++
 .../uptime/public/state/effects/index.ts      |  2 +
 .../public/state/effects/monitor_status.ts    | 53 +++++++++++
 .../uptime/public/state/reducers/index.ts     |  3 +-
 .../uptime/public/state/reducers/monitor.ts   |  4 +-
 .../public/state/reducers/monitor_status.ts   | 67 ++++++++++++++
 .../state/selectors/__tests__/index.test.ts   |  9 +-
 .../uptime/public/state/selectors/index.ts    | 10 ++-
 .../plugins/uptime/public/uptime_app.tsx      | 59 +++---------
 .../server/graphql/monitors/resolvers.ts      | 40 ---------
 .../server/graphql/monitors/schema.gql.ts     |  8 --
 .../lib/adapters/monitors/adapter_types.ts    |  8 +-
 .../elasticsearch_monitors_adapter.ts         | 43 +--------
 .../elasticsearch_pings_adapter.test.ts       | 21 +++--
 .../lib/adapters/pings/adapter_types.ts       | 12 +--
 .../pings/elasticsearch_pings_adapter.ts      | 60 +++++++++----
 .../plugins/uptime/server/rest_api/index.ts   |  9 +-
 .../uptime/server/rest_api/monitors/index.ts  |  1 +
 .../uptime/server/rest_api/monitors/status.ts | 60 +++++++++++++
 .../translations/translations/ja-JP.json      |  2 -
 .../translations/translations/zh-CN.json      |  2 -
 .../graphql/fixtures/monitor_page_title.json  |  7 --
 .../fixtures/monitor_status_by_id.json        | 20 -----
 .../graphql/helpers/expect_fixture_eql.ts     |  7 +-
 .../apis/uptime/graphql/index.js              |  2 -
 .../apis/uptime/graphql/monitor_page_title.ts | 37 --------
 .../apis/uptime/graphql/monitor_status_bar.js | 58 ------------
 .../rest/fixtures/monitor_latest_status.json  | 89 +++++++++++++++++++
 .../rest/fixtures/selected_monitor.json       | 28 ++++++
 .../api_integration/apis/uptime/rest/index.ts |  2 +
 .../apis/uptime/rest/monitor_latest_status.ts | 25 ++++++
 .../apis/uptime/rest/selected_monitor.ts      | 23 +++++
 85 files changed, 1202 insertions(+), 977 deletions(-)
 rename x-pack/legacy/plugins/uptime/common/runtime_types/monitor/{monitor_details.ts => details.ts} (99%)
 rename x-pack/legacy/plugins/uptime/{public/components/functional/monitor_status_bar => common/runtime_types/monitor}/index.ts (61%)
 rename x-pack/legacy/plugins/uptime/common/runtime_types/monitor/{monitor_locations.ts => locations.ts} (100%)
 delete mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/empty_status_bar.test.tsx.snap
 delete mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/__tests__/empty_status_bar.test.tsx
 delete mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/empty_status_bar.tsx
 delete mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_page_title.tsx
 delete mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/monitor_status_bar.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/__snapshots__/status_by_location.test.tsx.snap
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/status_by_location.test.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/index.ts
 rename x-pack/legacy/plugins/uptime/public/components/functional/{ => monitor_status_details}/monitor_status_bar/monitor_ssl_certificate.tsx (53%)
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_status_bar.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/status_by_location.tsx
 rename x-pack/legacy/plugins/uptime/public/components/functional/{ => monitor_status_details}/monitor_status_bar/translations.ts (100%)
 create mode 100644 x-pack/legacy/plugins/uptime/public/pages/page_header.tsx
 delete mode 100644 x-pack/legacy/plugins/uptime/public/queries/monitor_page_title_query.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/queries/monitor_status_bar_query.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/routes.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/effects/monitor_status.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts
 create mode 100644 x-pack/legacy/plugins/uptime/server/rest_api/monitors/status.ts
 delete mode 100644 x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_page_title.json
 delete mode 100644 x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_status_by_id.json
 delete mode 100644 x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts
 delete mode 100644 x-pack/test/api_integration/apis/uptime/graphql/monitor_status_bar.js
 create mode 100644 x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
 create mode 100644 x-pack/test/api_integration/apis/uptime/rest/fixtures/selected_monitor.json
 create mode 100644 x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
 create mode 100644 x-pack/test/api_integration/apis/uptime/rest/selected_monitor.ts

diff --git a/x-pack/legacy/plugins/uptime/README.md b/x-pack/legacy/plugins/uptime/README.md
index 37e030c44db37e..308f78ecdc3689 100644
--- a/x-pack/legacy/plugins/uptime/README.md
+++ b/x-pack/legacy/plugins/uptime/README.md
@@ -3,7 +3,7 @@
 ## Purpose
 
 The purpose of this plugin is to provide users of Heartbeat more visibility of what's happening
-in their infrasturcture. It's primarily built using React and Apollo's GraphQL tools.
+in their infrastructure. It's primarily built using React and Apollo's GraphQL tools.
 
 ## Layout
 
@@ -44,7 +44,7 @@ From `~/kibana/x-pack`, run `node scripts/jest.js`.
 ### Functional tests
 
 In one shell, from **~/kibana/x-pack**:
-`node scripts/functional_tests-server.js`
+`node scripts/functional_tests_server.js`
 
 In another shell, from **~kibana/x-pack**:
 `node ../scripts/functional_test_runner.js --grep="{TEST_NAME}"`.
diff --git a/x-pack/legacy/plugins/uptime/common/graphql/introspection.json b/x-pack/legacy/plugins/uptime/common/graphql/introspection.json
index 29e8435e61b7b5..19d9cf19cc7f84 100644
--- a/x-pack/legacy/plugins/uptime/common/graphql/introspection.json
+++ b/x-pack/legacy/plugins/uptime/common/graphql/introspection.json
@@ -352,25 +352,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "getMonitorPageTitle",
-            "description": "",
-            "args": [
-              {
-                "name": "monitorId",
-                "description": "",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-                },
-                "defaultValue": null
-              }
-            ],
-            "type": { "kind": "OBJECT", "name": "MonitorPageTitle", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "getMonitorStates",
             "description": "Fetches the current state of Uptime monitors for the given parameters.",
@@ -2549,45 +2530,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "OBJECT",
-        "name": "MonitorPageTitle",
-        "description": "",
-        "fields": [
-          {
-            "name": "id",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "url",
-            "description": "",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "name",
-            "description": "",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
       {
         "kind": "OBJECT",
         "name": "MonitorSummaryResult",
diff --git a/x-pack/legacy/plugins/uptime/common/graphql/types.ts b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
index 9998720d5e378e..080ce34c09f3c7 100644
--- a/x-pack/legacy/plugins/uptime/common/graphql/types.ts
+++ b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
@@ -32,7 +32,6 @@ export interface Query {
 
   getFilterBar?: FilterBar | null;
 
-  getMonitorPageTitle?: MonitorPageTitle | null;
   /** Fetches the current state of Uptime monitors for the given parameters. */
   getMonitorStates?: MonitorSummaryResult | null;
   /** Fetches details about the uptime index. */
@@ -484,13 +483,6 @@ export interface FilterBar {
   urls?: string[] | null;
 }
 
-export interface MonitorPageTitle {
-  id: string;
-
-  url?: string | null;
-
-  name?: string | null;
-}
 /** The primary object returned for monitor states. */
 export interface MonitorSummaryResult {
   /** Used to go to the next page of results */
@@ -736,24 +728,12 @@ export interface GetMonitorChartsDataQueryArgs {
 
   location?: string | null;
 }
-export interface GetLatestMonitorsQueryArgs {
-  /** The lower limit of the date range. */
-  dateRangeStart: string;
-  /** The upper limit of the date range. */
-  dateRangeEnd: string;
-  /** Optional: a specific monitor ID filter. */
-  monitorId?: string | null;
-  /** Optional: a specific instance location filter. */
-  location?: string | null;
-}
 export interface GetFilterBarQueryArgs {
   dateRangeStart: string;
 
   dateRangeEnd: string;
 }
-export interface GetMonitorPageTitleQueryArgs {
-  monitorId: string;
-}
+
 export interface GetMonitorStatesQueryArgs {
   dateRangeStart: string;
 
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts
index 224892eb917839..c74bc81ae2549b 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts
@@ -6,5 +6,4 @@
 
 export * from './common';
 export * from './snapshot';
-export * from './monitor/monitor_details';
-export * from './monitor/monitor_locations';
+export * from './monitor';
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/monitor_details.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/details.ts
similarity index 99%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/monitor/monitor_details.ts
rename to x-pack/legacy/plugins/uptime/common/runtime_types/monitor/details.ts
index 0a57a67b898e07..bf81c91bae6339 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/monitor_details.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/details.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 t from 'io-ts';
 
 // IO type for validation
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/index.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts
similarity index 61%
rename from x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/index.ts
rename to x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts
index 7087407407c557..80b48d09dc5b80 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { MonitorSSLCertificate } from './monitor_ssl_certificate';
-export { MonitorStatusBar, MonitorStatusBarComponent } from './monitor_status_bar';
+export * from './details';
+export * from './locations';
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/monitor_locations.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/locations.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/monitor/monitor_locations.ts
rename to x-pack/legacy/plugins/uptime/common/runtime_types/monitor/locations.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/empty_status_bar.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/empty_status_bar.test.tsx.snap
deleted file mode 100644
index e18846e960122a..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/empty_status_bar.test.tsx.snap
+++ /dev/null
@@ -1,29 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`EmptyStatusBar component renders a default message when no message provided 1`] = `
-<EuiPanel>
-  <EuiFlexGroup
-    gutterSize="l"
-  >
-    <EuiFlexItem
-      grow={false}
-    >
-      No data found for monitor id mon_id
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</EuiPanel>
-`;
-
-exports[`EmptyStatusBar component renders a message when provided 1`] = `
-<EuiPanel>
-  <EuiFlexGroup
-    gutterSize="l"
-  >
-    <EuiFlexItem
-      grow={false}
-    >
-      foobarbaz
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</EuiPanel>
-`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_ssl_certificate.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_ssl_certificate.test.tsx.snap
index 45c24fd11194df..d731a168225b7b 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_ssl_certificate.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_ssl_certificate.test.tsx.snap
@@ -5,22 +5,14 @@ Array [
   <div
     class="euiSpacer euiSpacer--s"
   />,
-  .c0 {
-  margin-left: 20px;
-}
-
-<div
-    class="c0"
+  <div
+    aria-label="SSL certificate expires"
+    class="euiText euiText--small euiText--constrainedWidth"
   >
     <div
-      aria-label="SSL certificate expires"
-      class="euiText euiText--small euiText--constrainedWidth"
+      class="euiTextColor euiTextColor--subdued"
     >
-      <div
-        class="euiTextColor euiTextColor--subdued"
-      >
-        SSL certificate expires in 2 months
-      </div>
+      SSL certificate expires in 2 months
     </div>
   </div>,
 ]
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_status.bar.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_status.bar.test.tsx.snap
index e53235b1ed6f70..17588ae53ed00d 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_status.bar.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_status.bar.test.tsx.snap
@@ -2,46 +2,24 @@
 
 exports[`MonitorStatusBar component renders duration in ms, not us 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+  class="euiFlexGroup euiFlexGroup--directionColumn euiFlexGroup--responsive"
 >
   <div
     class="euiFlexItem euiFlexItem--flexGrowZero"
   >
     <div
-      aria-label="Monitor status"
-      class="euiHealth"
-      style="line-height:inherit"
+      class="euiText euiText--medium"
     >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <svg
-            aria-hidden="true"
-            class="euiIcon euiIcon--medium euiIcon--success euiIcon-isLoading"
-            focusable="false"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
-            xmlns="http://www.w3.org/2000/svg"
-          />
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          Up
-        </div>
-      </div>
+      <h2>
+        Up in 2 Locations
+      </h2>
     </div>
   </div>
   <div
     class="euiFlexItem euiFlexItem--flexGrowZero"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiText euiText--medium"
     >
       <a
         aria-label="Monitor URL link"
@@ -55,16 +33,23 @@ exports[`MonitorStatusBar component renders duration in ms, not us 1`] = `
     </div>
   </div>
   <div
-    aria-label="Monitor duration in milliseconds"
-    class="euiFlexItem euiFlexItem--flexGrowZero"
-  >
-    1234ms
-  </div>
-  <div
-    aria-label="Time since last check"
     class="euiFlexItem"
   >
-    15 minutes ago
+    <span
+      class="euiTextColor euiTextColor--subdued euiTitle euiTitle--xsmall"
+    >
+      <h1
+        data-test-subj="monitor-page-title"
+      >
+        id1
+      </h1>
+    </span>
   </div>
+  <div
+    class="euiSpacer euiSpacer--l"
+  />
+  <div
+    class="euiFlexItem euiFlexItem--flexGrowZero"
+  />
 </div>
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
index a38ca85a3e9e75..9a4cb2e04f59b0 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
@@ -227,54 +227,24 @@ exports[`UptimeDatePicker component validates props with shallow render 1`] = `
   commonlyUsedRanges={
     Array [
       Object {
-        "end": "now/d",
+        "end": "now",
         "label": "Today",
         "start": "now/d",
       },
-      Object {
-        "end": "now/w",
-        "label": "This week",
-        "start": "now/w",
-      },
-      Object {
-        "end": "now",
-        "label": "Last 15 minutes",
-        "start": "now-15m",
-      },
-      Object {
-        "end": "now",
-        "label": "Last 30 minutes",
-        "start": "now-30m",
-      },
       Object {
         "end": "now",
-        "label": "Last 1 hour",
-        "start": "now-1h",
-      },
-      Object {
-        "end": "now",
-        "label": "Last 24 hours",
-        "start": "now-24h",
-      },
-      Object {
-        "end": "now",
-        "label": "Last 7 days",
-        "start": "now-7d",
-      },
-      Object {
-        "end": "now",
-        "label": "Last 30 days",
-        "start": "now-30d",
+        "label": "Week to date",
+        "start": "now/w",
       },
       Object {
         "end": "now",
-        "label": "Last 90 days",
-        "start": "now-90d",
+        "label": "Month to date",
+        "start": "now/M",
       },
       Object {
         "end": "now",
-        "label": "Last 2 year",
-        "start": "now-1y",
+        "label": "Year to date",
+        "start": "now/y",
       },
     ]
   }
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/empty_status_bar.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/empty_status_bar.test.tsx
deleted file mode 100644
index b815f0e38b8e27..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/empty_status_bar.test.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { EmptyStatusBar } from '../empty_status_bar';
-
-describe('EmptyStatusBar component', () => {
-  it('renders a message when provided', () => {
-    const component = shallowWithIntl(<EmptyStatusBar message="foobarbaz" monitorId="mon_id" />);
-    expect(component).toMatchSnapshot();
-  });
-
-  it('renders a default message when no message provided', () => {
-    const component = shallowWithIntl(<EmptyStatusBar monitorId="mon_id" />);
-    expect(component).toMatchSnapshot();
-  });
-});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/monitor_ssl_certificate.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/monitor_ssl_certificate.test.tsx
index c4063208d046ec..03eb252aa8c097 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/monitor_ssl_certificate.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/monitor_ssl_certificate.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import moment from 'moment';
 import { renderWithIntl } from 'test_utils/enzyme_helpers';
 import { PingTls } from '../../../../common/graphql/types';
-import { MonitorSSLCertificate } from '../monitor_status_bar';
+import { MonitorSSLCertificate } from '../monitor_status_details/monitor_status_bar';
 
 describe('MonitorStatusBar component', () => {
   let monitorTls: PingTls;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/monitor_status.bar.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/monitor_status.bar.test.tsx
index 761dd8a65238fd..545405f91d5374 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/monitor_status.bar.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/monitor_status.bar.test.tsx
@@ -8,34 +8,59 @@ import moment from 'moment';
 import React from 'react';
 import { renderWithIntl } from 'test_utils/enzyme_helpers';
 import { Ping } from '../../../../common/graphql/types';
-import { MonitorStatusBarComponent } from '../monitor_status_bar';
+import { MonitorStatusBarComponent } from '../monitor_status_details/monitor_status_bar';
 
 describe('MonitorStatusBar component', () => {
-  let monitorStatus: Ping[];
+  let monitorStatus: Ping;
+  let monitorLocations: any;
+  let dateStart: string;
+  let dateEnd: string;
 
   beforeEach(() => {
-    monitorStatus = [
-      {
-        id: 'id1',
-        timestamp: moment(new Date())
-          .subtract(15, 'm')
-          .toString(),
-        monitor: {
-          duration: {
-            us: 1234567,
-          },
-          status: 'up',
-        },
-        url: {
-          full: 'https://www.example.com/',
+    monitorStatus = {
+      id: 'id1',
+      timestamp: moment(new Date())
+        .subtract(15, 'm')
+        .toString(),
+      monitor: {
+        duration: {
+          us: 1234567,
         },
+        status: 'up',
+      },
+      url: {
+        full: 'https://www.example.com/',
       },
-    ];
+    };
+
+    monitorLocations = {
+      monitorId: 'secure-avc',
+      locations: [
+        {
+          summary: { up: 4, down: 0 },
+          geo: { name: 'Berlin', location: { lat: '52.487448', lon: ' 13.394798' } },
+        },
+        {
+          summary: { up: 4, down: 0 },
+          geo: { name: 'st-paul', location: { lat: '52.487448', lon: ' 13.394798' } },
+        },
+      ],
+    };
+
+    dateStart = moment('01-01-2010').toString();
+    dateEnd = moment('10-10-2010').toString();
   });
 
   it('renders duration in ms, not us', () => {
     const component = renderWithIntl(
-      <MonitorStatusBarComponent loading={false} data={{ monitorStatus }} monitorId="foo" />
+      <MonitorStatusBarComponent
+        monitorStatus={monitorStatus}
+        monitorId="id1"
+        dateStart={dateStart}
+        dateEnd={dateEnd}
+        monitorLocations={monitorLocations}
+        loadMonitorStatus={jest.fn()}
+      />
     );
     expect(component).toMatchSnapshot();
   });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/uptime_date_picker.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/uptime_date_picker.test.tsx
index 93fa0b505a891f..e3ca1a87850c8a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/uptime_date_picker.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/uptime_date_picker.test.tsx
@@ -6,37 +6,16 @@
 
 import { shallowWithIntl, renderWithIntl } from 'test_utils/enzyme_helpers';
 import React from 'react';
-import { UptimeDatePicker, CommonlyUsedRange } from '../uptime_date_picker';
+import { UptimeDatePicker } from '../uptime_date_picker';
 
 describe('UptimeDatePicker component', () => {
-  let commonlyUsedRange: CommonlyUsedRange[];
-
-  beforeEach(() => {
-    commonlyUsedRange = [
-      { from: 'now/d', to: 'now/d', display: 'Today' },
-      { from: 'now/w', to: 'now/w', display: 'This week' },
-      { from: 'now-15m', to: 'now', display: 'Last 15 minutes' },
-      { from: 'now-30m', to: 'now', display: 'Last 30 minutes' },
-      { from: 'now-1h', to: 'now', display: 'Last 1 hour' },
-      { from: 'now-24h', to: 'now', display: 'Last 24 hours' },
-      { from: 'now-7d', to: 'now', display: 'Last 7 days' },
-      { from: 'now-30d', to: 'now', display: 'Last 30 days' },
-      { from: 'now-90d', to: 'now', display: 'Last 90 days' },
-      { from: 'now-1y', to: 'now', display: 'Last 2 year' },
-    ];
-  });
-
   it('validates props with shallow render', () => {
-    const component = shallowWithIntl(
-      <UptimeDatePicker commonlyUsedRanges={commonlyUsedRange} refreshApp={jest.fn()} />
-    );
+    const component = shallowWithIntl(<UptimeDatePicker refreshApp={jest.fn()} />);
     expect(component).toMatchSnapshot();
   });
 
   it('renders properly with mock data', () => {
-    const component = renderWithIntl(
-      <UptimeDatePicker commonlyUsedRanges={commonlyUsedRange} refreshApp={jest.fn()} />
-    );
+    const component = renderWithIntl(<UptimeDatePicker refreshApp={jest.fn()} />);
     expect(component).toMatchSnapshot();
   });
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/data_missing.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/data_missing.test.tsx.snap
index 4dfc837c29b55c..36c54758cf116b 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/data_missing.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/data_missing.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`DataMissing component renders basePath and headingMessage 1`] = `
               values={
                 Object {
                   "configureHeartbeatLink": <ForwardRef
-                    href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                    href="/app/kibana#/home/tutorial/uptimeMonitors"
                     target="_blank"
                   >
                     <FormattedMessage
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index ac966ddba9b153..8fa7a581b99b26 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -2,7 +2,6 @@
 
 exports[`EmptyState component does not render empty state with appropriate base path and no docs 1`] = `
 <EmptyStateComponent
-  basePath="foo"
   data={
     Object {
       "statesIndexStatus": Object {
@@ -118,7 +117,6 @@ exports[`EmptyState component does not render empty state with appropriate base
   loading={false}
 >
   <DataMissing
-    basePath="foo"
     headingMessage="No uptime data found"
   >
     <EuiFlexGroup
@@ -153,7 +151,7 @@ exports[`EmptyState component does not render empty state with appropriate base
                         values={
                           Object {
                             "configureHeartbeatLink": <ForwardRef
-                              href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                              href="/app/kibana#/home/tutorial/uptimeMonitors"
                               target="_blank"
                             >
                               <FormattedMessage
@@ -249,7 +247,7 @@ exports[`EmptyState component does not render empty state with appropriate base
                                 values={
                                   Object {
                                     "configureHeartbeatLink": <ForwardRef
-                                      href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                                      href="/app/kibana#/home/tutorial/uptimeMonitors"
                                       target="_blank"
                                     >
                                       <FormattedMessage
@@ -262,12 +260,12 @@ exports[`EmptyState component does not render empty state with appropriate base
                                 }
                               >
                                 <EuiLink
-                                  href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                                  href="/app/kibana#/home/tutorial/uptimeMonitors"
                                   target="_blank"
                                 >
                                   <a
                                     className="euiLink euiLink--primary"
-                                    href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                                    href="/app/kibana#/home/tutorial/uptimeMonitors"
                                     rel="noopener noreferrer"
                                     target="_blank"
                                   >
@@ -301,7 +299,6 @@ exports[`EmptyState component does not render empty state with appropriate base
 
 exports[`EmptyState component doesn't render child components when count is falsey 1`] = `
 <EmptyStateComponent
-  basePath=""
   intl={
     Object {
       "defaultFormats": Object {},
@@ -470,7 +467,6 @@ exports[`EmptyState component doesn't render child components when count is fals
 
 exports[`EmptyState component notifies when index does not exist 1`] = `
 <EmptyStateComponent
-  basePath="foo"
   data={
     Object {
       "statesIndexStatus": Object {
@@ -586,7 +582,6 @@ exports[`EmptyState component notifies when index does not exist 1`] = `
   loading={false}
 >
   <DataMissing
-    basePath="foo"
     headingMessage="Uptime index not found"
   >
     <EuiFlexGroup
@@ -621,7 +616,7 @@ exports[`EmptyState component notifies when index does not exist 1`] = `
                         values={
                           Object {
                             "configureHeartbeatLink": <ForwardRef
-                              href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                              href="/app/kibana#/home/tutorial/uptimeMonitors"
                               target="_blank"
                             >
                               <FormattedMessage
@@ -717,7 +712,7 @@ exports[`EmptyState component notifies when index does not exist 1`] = `
                                 values={
                                   Object {
                                     "configureHeartbeatLink": <ForwardRef
-                                      href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                                      href="/app/kibana#/home/tutorial/uptimeMonitors"
                                       target="_blank"
                                     >
                                       <FormattedMessage
@@ -730,12 +725,12 @@ exports[`EmptyState component notifies when index does not exist 1`] = `
                                 }
                               >
                                 <EuiLink
-                                  href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                                  href="/app/kibana#/home/tutorial/uptimeMonitors"
                                   target="_blank"
                                 >
                                   <a
                                     className="euiLink euiLink--primary"
-                                    href="foo/app/kibana#/home/tutorial/uptimeMonitors"
+                                    href="/app/kibana#/home/tutorial/uptimeMonitors"
                                     rel="noopener noreferrer"
                                     target="_blank"
                                   >
@@ -783,7 +778,6 @@ exports[`EmptyState component renders child components when count is truthy 1`]
 
 exports[`EmptyState component renders error message when an error occurs 1`] = `
 <EmptyStateComponent
-  basePath=""
   errors={
     Array [
       Object {
@@ -1043,7 +1037,6 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
 
 exports[`EmptyState component renders loading state if no errors or doc count 1`] = `
 <EmptyStateComponent
-  basePath=""
   intl={
     Object {
       "defaultFormats": Object {},
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/data_missing.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/data_missing.test.tsx
index 2e972b1397ecc7..8605d2966aaaec 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/data_missing.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/data_missing.test.tsx
@@ -10,7 +10,7 @@ import { DataMissing } from '../data_missing';
 
 describe('DataMissing component', () => {
   it('renders basePath and headingMessage', () => {
-    const component = shallowWithIntl(<DataMissing basePath="foo" headingMessage="bar" />);
+    const component = shallowWithIntl(<DataMissing headingMessage="bar" />);
     expect(component).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
index 0077292d91a467..32d55519acf276 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
@@ -24,7 +24,7 @@ describe('EmptyState component', () => {
 
   it('renders child components when count is truthy', () => {
     const component = shallowWithIntl(
-      <EmptyStateComponent basePath="" data={{ statesIndexStatus }} loading={false}>
+      <EmptyStateComponent data={{ statesIndexStatus }} loading={false}>
         <div>Foo</div>
         <div>Bar</div>
         <div>Baz</div>
@@ -35,7 +35,7 @@ describe('EmptyState component', () => {
 
   it(`doesn't render child components when count is falsey`, () => {
     const component = mountWithIntl(
-      <EmptyStateComponent basePath="" data={undefined} loading={false}>
+      <EmptyStateComponent data={undefined} loading={false}>
         <div>Shouldn&apos;t be rendered</div>
       </EmptyStateComponent>
     );
@@ -57,7 +57,7 @@ describe('EmptyState component', () => {
       },
     ];
     const component = mountWithIntl(
-      <EmptyStateComponent basePath="" data={undefined} errors={errors} loading={false}>
+      <EmptyStateComponent data={undefined} errors={errors} loading={false}>
         <div>Shouldn&apos;t appear...</div>
       </EmptyStateComponent>
     );
@@ -66,7 +66,7 @@ describe('EmptyState component', () => {
 
   it('renders loading state if no errors or doc count', () => {
     const component = mountWithIntl(
-      <EmptyStateComponent basePath="" loading={true}>
+      <EmptyStateComponent loading={true}>
         <div>Should appear even while loading...</div>
       </EmptyStateComponent>
     );
@@ -81,7 +81,7 @@ describe('EmptyState component', () => {
       indexExists: true,
     };
     const component = mountWithIntl(
-      <EmptyStateComponent basePath="foo" data={{ statesIndexStatus }} loading={false}>
+      <EmptyStateComponent data={{ statesIndexStatus }} loading={false}>
         <div>If this is in the snapshot the test should fail</div>
       </EmptyStateComponent>
     );
@@ -91,7 +91,7 @@ describe('EmptyState component', () => {
   it('notifies when index does not exist', () => {
     statesIndexStatus.indexExists = false;
     const component = mountWithIntl(
-      <EmptyStateComponent basePath="foo" data={{ statesIndexStatus }} loading={false}>
+      <EmptyStateComponent data={{ statesIndexStatus }} loading={false}>
         <div>This text should not render</div>
       </EmptyStateComponent>
     );
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/data_missing.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/data_missing.tsx
index 023edec023ddf8..f8110953f61460 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/data_missing.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/data_missing.tsx
@@ -14,48 +14,51 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
+import React, { useContext } from 'react';
+import { UptimeSettingsContext } from '../../../contexts';
 
 interface DataMissingProps {
-  basePath: string;
   headingMessage: string;
 }
 
-export const DataMissing = ({ basePath, headingMessage }: DataMissingProps) => (
-  <EuiFlexGroup justifyContent="center">
-    <EuiFlexItem grow={false}>
-      <EuiSpacer size="xs" />
-      <EuiPanel>
-        <EuiEmptyPrompt
-          iconType="uptimeApp"
-          title={
-            <EuiTitle size="l">
-              <h3>{headingMessage}</h3>
-            </EuiTitle>
-          }
-          body={
-            <p>
-              <FormattedMessage
-                id="xpack.uptime.emptyState.configureHeartbeatToGetStartedMessage"
-                defaultMessage="{configureHeartbeatLink} to start logging uptime data."
-                values={{
-                  configureHeartbeatLink: (
-                    <EuiLink
-                      target="_blank"
-                      href={`${basePath}/app/kibana#/home/tutorial/uptimeMonitors`}
-                    >
-                      <FormattedMessage
-                        id="xpack.uptime.emptyState.configureHeartbeatLinkText"
-                        defaultMessage="Configure Heartbeat"
-                      />
-                    </EuiLink>
-                  ),
-                }}
-              />
-            </p>
-          }
-        />
-      </EuiPanel>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-);
+export const DataMissing = ({ headingMessage }: DataMissingProps) => {
+  const { basePath } = useContext(UptimeSettingsContext);
+  return (
+    <EuiFlexGroup justifyContent="center">
+      <EuiFlexItem grow={false}>
+        <EuiSpacer size="xs" />
+        <EuiPanel>
+          <EuiEmptyPrompt
+            iconType="uptimeApp"
+            title={
+              <EuiTitle size="l">
+                <h3>{headingMessage}</h3>
+              </EuiTitle>
+            }
+            body={
+              <p>
+                <FormattedMessage
+                  id="xpack.uptime.emptyState.configureHeartbeatToGetStartedMessage"
+                  defaultMessage="{configureHeartbeatLink} to start logging uptime data."
+                  values={{
+                    configureHeartbeatLink: (
+                      <EuiLink
+                        target="_blank"
+                        href={`${basePath}/app/kibana#/home/tutorial/uptimeMonitors`}
+                      >
+                        <FormattedMessage
+                          id="xpack.uptime.emptyState.configureHeartbeatLinkText"
+                          defaultMessage="Configure Heartbeat"
+                        />
+                      </EuiLink>
+                    ),
+                  }}
+                />
+              </p>
+            }
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
index 2a39226c5b746e..d2d46dff3b9f52 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
@@ -18,13 +18,12 @@ interface EmptyStateQueryResult {
 }
 
 interface EmptyStateProps {
-  basePath: string;
   children: JSX.Element[] | JSX.Element;
 }
 
 type Props = UptimeGraphQLQueryProps<EmptyStateQueryResult> & EmptyStateProps;
 
-export const EmptyStateComponent = ({ basePath, children, data, errors }: Props) => {
+export const EmptyStateComponent = ({ children, data, errors }: Props) => {
   if (errors) {
     return <EmptyStateError errors={errors} />;
   }
@@ -33,7 +32,6 @@ export const EmptyStateComponent = ({ basePath, children, data, errors }: Props)
     if (!indexExists) {
       return (
         <DataMissing
-          basePath={basePath}
           headingMessage={i18n.translate('xpack.uptime.emptyState.noIndexTitle', {
             defaultMessage: 'Uptime index not found',
           })}
@@ -42,7 +40,6 @@ export const EmptyStateComponent = ({ basePath, children, data, errors }: Props)
     } else if (indexExists && docCount && docCount.count === 0) {
       return (
         <DataMissing
-          basePath={basePath}
           headingMessage={i18n.translate('xpack.uptime.emptyState.noDataMessage', {
             defaultMessage: 'No uptime data found',
           })}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_status_bar.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_status_bar.tsx
deleted file mode 100644
index 748c7350a7f0d0..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_status_bar.tsx
+++ /dev/null
@@ -1,31 +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 { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React from 'react';
-
-interface Props {
-  monitorId: string;
-  message?: string;
-}
-
-export const EmptyStatusBar = ({ message, monitorId }: Props) => (
-  <EuiPanel>
-    <EuiFlexGroup gutterSize="l">
-      <EuiFlexItem grow={false}>
-        {!message
-          ? i18n.translate('xpack.uptime.emptyStatusBar.defaultMessage', {
-              defaultMessage: 'No data found for monitor id {monitorId}',
-              description:
-                'This is the default message we display in a status bar when there is no data available for an uptime monitor.',
-              values: { monitorId },
-            })
-          : message}
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPanel>
-);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
index 42316fca99f34e..7370faa12f3939 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
@@ -6,14 +6,12 @@
 
 export { DonutChart } from './charts/donut_chart';
 export { EmptyState } from './empty_state';
-export { EmptyStatusBar } from './empty_status_bar';
+export { MonitorStatusBar } from './monitor_status_details';
 export { FilterGroup } from './filter_group';
 export { IntegrationLink } from './integration_link';
 export { KueryBar } from './kuery_bar';
 export { MonitorCharts } from './monitor_charts';
 export { MonitorList } from './monitor_list';
-export { MonitorPageTitle } from './monitor_page_title';
-export { MonitorStatusBar } from './monitor_status_bar';
 export { OverviewPageParsingErrorCallout } from './overview_page_parsing_error_callout';
 export { PingList } from './ping_list';
 export { Snapshot } from './snapshot';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
index 263c3fc787da91..7d53d784ff3387 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
@@ -7,6 +7,7 @@
 import { getLayerList } from '../map_config';
 import { mockLayerList } from './__mocks__/mock';
 import { LocationPoint } from '../embedded_map';
+import { UptimeAppColors } from '../../../../../uptime_app';
 
 jest.mock('uuid', () => {
   return {
@@ -17,6 +18,7 @@ jest.mock('uuid', () => {
 describe('map_config', () => {
   let upPoints: LocationPoint[];
   let downPoints: LocationPoint[];
+  let colors: Pick<UptimeAppColors, 'gray' | 'danger'>;
 
   beforeEach(() => {
     upPoints = [
@@ -29,11 +31,15 @@ describe('map_config', () => {
       { lat: '55.487239', lon: '13.399262' },
       { lat: '54.487239', lon: '14.399262' },
     ];
+    colors = {
+      danger: '#BC261E',
+      gray: '#000',
+    };
   });
 
   describe('#getLayerList', () => {
     test('it returns the low poly layer', () => {
-      const layerList = getLayerList(upPoints, downPoints, { danger: '#BC261E', gray: '#000' });
+      const layerList = getLayerList(upPoints, downPoints, colors);
       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 fe8a1a0bad7ec6..9b20651fadb86b 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, useContext } from 'react';
+import React, { useEffect, useState, useContext, useRef } from 'react';
 import uuid from 'uuid';
 import styled from 'styled-components';
 
@@ -48,19 +48,31 @@ 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 embeddableRoot: React.RefObject<HTMLDivElement> = useRef<HTMLDivElement>(null);
   const factory = start.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE);
 
   const input = {
     id: uuid.v4(),
     filters: [],
     hidePanelTitles: true,
-    query: { query: '', language: 'kuery' },
-    refreshConfig: { value: 0, pause: false },
+    query: {
+      query: '',
+      language: 'kuery',
+    },
+    refreshConfig: {
+      value: 0,
+      pause: false,
+    },
     viewMode: 'view',
     isLayerTOCOpen: false,
     hideFilterActions: true,
-    mapCenter: { lon: 11, lat: 20, zoom: 0 },
+    // Zoom Lat/Lon values are set to make sure map is in center in the panel
+    // It wil also omit Greenland/Antarctica etc
+    mapCenter: {
+      lon: 11,
+      lat: 20,
+      zoom: 0,
+    },
     disableInteractive: true,
     disableTooltipControl: true,
     hideToolbarOverlay: true,
@@ -80,16 +92,19 @@ export const EmbeddedMap = ({ upPoints, downPoints }: EmbeddedMapProps) => {
       setEmbeddable(embeddableObject);
     }
     setupEmbeddable();
+
     // we want this effect to execute exactly once after the component mounts
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  // update map layers based on points
   useEffect(() => {
     if (embeddable) {
       embeddable.setLayerList(getLayerList(upPoints, downPoints, colors));
     }
   }, [upPoints, downPoints, embeddable, colors]);
 
+  // We can only render after embeddable has already initialized
   useEffect(() => {
     if (embeddableRoot.current && embeddable) {
       embeddable.render(embeddableRoot.current);
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 b423b8baf41bf6..d4601baefdf30c 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
@@ -6,6 +6,7 @@
 
 import lowPolyLayerFeatures from './low_poly_layer.json';
 import { LocationPoint } from './embedded_map';
+import { UptimeAppColors } from '../../../../uptime_app';
 
 /**
  * Returns `Source/Destination Point-to-point` Map LayerList configuration, with a source,
@@ -15,7 +16,7 @@ import { LocationPoint } from './embedded_map';
 export const getLayerList = (
   upPoints: LocationPoint[],
   downPoints: LocationPoint[],
-  { gray, danger }: { gray: string; danger: string }
+  { gray, danger }: Pick<UptimeAppColors, 'gray' | 'danger'>
 ) => {
   return [getLowPolyLayer(), getDownPointsLayer(downPoints, danger), getUpPointsLayer(upPoints)];
 };
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 f70d145ec05c38..9a9bf3fe71dc17 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
@@ -11,10 +11,12 @@ import { LocationStatusTags } from './location_status_tags';
 import { EmbeddedMap, LocationPoint } from './embeddables/embedded_map';
 import { MonitorLocations } from '../../../../common/runtime_types';
 
+// These height/width values are used to make sure map is in center of panel
+// And to make sure, it doesn't take too much space
 const MapPanel = styled.div`
   height: 240px;
   width: 520px;
-  margin-right: 10px;
+  margin-right: 20px;
 `;
 
 interface LocationMapProps {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_page_title.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_page_title.tsx
deleted file mode 100644
index 9e30a3adbd776a..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_page_title.tsx
+++ /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 { EuiTextColor, EuiTitle } from '@elastic/eui';
-import { EuiLoadingSpinner } from '@elastic/eui';
-import React from 'react';
-import { MonitorPageTitle as TitleType } from '../../../common/graphql/types';
-import { UptimeGraphQLQueryProps, withUptimeGraphQL } from '../higher_order';
-import { monitorPageTitleQuery } from '../../queries';
-
-interface MonitorPageTitleQueryResult {
-  monitorPageTitle?: TitleType;
-}
-
-interface MonitorPageTitleProps {
-  monitorId: string;
-}
-
-type Props = MonitorPageTitleProps & UptimeGraphQLQueryProps<MonitorPageTitleQueryResult>;
-
-export const MonitorPageTitleComponent = ({ data }: Props) =>
-  data && data.monitorPageTitle ? (
-    <EuiTitle size="xxs">
-      <EuiTextColor color="subdued">
-        <h1 data-test-subj="monitor-page-title">{data.monitorPageTitle.id}</h1>
-      </EuiTextColor>
-    </EuiTitle>
-  ) : (
-    <EuiLoadingSpinner size="xl" />
-  );
-
-export const MonitorPageTitle = withUptimeGraphQL<
-  MonitorPageTitleQueryResult,
-  MonitorPageTitleProps
->(MonitorPageTitleComponent, monitorPageTitleQuery);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/monitor_status_bar.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/monitor_status_bar.tsx
deleted file mode 100644
index f36f0dff6745f8..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/monitor_status_bar.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiHealth, EuiLink } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { get } from 'lodash';
-import moment from 'moment';
-import React from 'react';
-import { Ping } from '../../../../common/graphql/types';
-import { UptimeGraphQLQueryProps, withUptimeGraphQL } from '../../higher_order';
-import { monitorStatusBarQuery } from '../../../queries';
-import { EmptyStatusBar } from '../empty_status_bar';
-import { convertMicrosecondsToMilliseconds } from '../../../lib/helper';
-import { MonitorSSLCertificate } from './monitor_ssl_certificate';
-import * as labels from './translations';
-
-interface MonitorStatusBarQueryResult {
-  monitorStatus?: Ping[];
-}
-
-interface MonitorStatusBarProps {
-  monitorId: string;
-}
-
-type Props = MonitorStatusBarProps & UptimeGraphQLQueryProps<MonitorStatusBarQueryResult>;
-
-export const MonitorStatusBarComponent = ({ data, monitorId }: Props) => {
-  if (data?.monitorStatus?.length) {
-    const { monitor, timestamp, tls } = data.monitorStatus[0];
-    const duration: number | undefined = get(monitor, 'duration.us', undefined);
-    const status = get<'up' | 'down'>(monitor, 'status', 'down');
-    const full = get<string>(data.monitorStatus[0], 'url.full');
-
-    return (
-      <>
-        <EuiFlexGroup gutterSize="l" wrap>
-          <EuiFlexItem grow={false}>
-            <EuiHealth
-              aria-label={labels.healthStatusMessageAriaLabel}
-              color={status === 'up' ? 'success' : 'danger'}
-              style={{ lineHeight: 'inherit' }}
-            >
-              {status === 'up' ? labels.upLabel : labels.downLabel}
-            </EuiHealth>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiFlexItem grow={false}>
-              <EuiLink aria-label={labels.monitorUrlLinkAriaLabel} href={full} target="_blank">
-                {full}
-              </EuiLink>
-            </EuiFlexItem>
-          </EuiFlexItem>
-          {!!duration && (
-            <EuiFlexItem aria-label={labels.durationTextAriaLabel} grow={false}>
-              <FormattedMessage
-                id="xpack.uptime.monitorStatusBar.healthStatus.durationInMillisecondsMessage"
-                values={{ duration: convertMicrosecondsToMilliseconds(duration) }}
-                defaultMessage="{duration}ms"
-                description="The 'ms' is an abbreviation for 'milliseconds'."
-              />
-            </EuiFlexItem>
-          )}
-          <EuiFlexItem aria-label={labels.timestampFromNowTextAriaLabel} grow={true}>
-            {moment(new Date(timestamp).valueOf()).fromNow()}
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <MonitorSSLCertificate tls={tls} />
-      </>
-    );
-  }
-  return <EmptyStatusBar message={labels.loadingMessage} monitorId={monitorId} />;
-};
-
-export const MonitorStatusBar = withUptimeGraphQL<
-  MonitorStatusBarQueryResult,
-  MonitorStatusBarProps
->(MonitorStatusBarComponent, monitorStatusBarQuery);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/__snapshots__/status_by_location.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/__snapshots__/status_by_location.test.tsx.snap
new file mode 100644
index 00000000000000..c6b18501ffa0f3
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/__snapshots__/status_by_location.test.tsx.snap
@@ -0,0 +1,51 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`StatusByLocation component renders all locations are down 1`] = `
+<div
+  class="euiText euiText--medium"
+>
+  <h2>
+    Down in 2 Locations
+  </h2>
+</div>
+`;
+
+exports[`StatusByLocation component renders when down in some locations 1`] = `
+<div
+  class="euiText euiText--medium"
+>
+  <h2>
+    Down in 1/2 Locations
+  </h2>
+</div>
+`;
+
+exports[`StatusByLocation component renders when only one location and it is down 1`] = `
+<div
+  class="euiText euiText--medium"
+>
+  <h2>
+    Down in 1 Location
+  </h2>
+</div>
+`;
+
+exports[`StatusByLocation component renders when only one location and it is up 1`] = `
+<div
+  class="euiText euiText--medium"
+>
+  <h2>
+    Up in 1 Location
+  </h2>
+</div>
+`;
+
+exports[`StatusByLocation component renders when up in all locations 1`] = `
+<div
+  class="euiText euiText--medium"
+>
+  <h2>
+    Up in 2 Locations
+  </h2>
+</div>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/status_by_location.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/status_by_location.test.tsx
new file mode 100644
index 00000000000000..4e515a52b8de6f
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/status_by_location.test.tsx
@@ -0,0 +1,81 @@
+/*
+ * 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 { renderWithIntl } from 'test_utils/enzyme_helpers';
+import { MonitorLocation } from '../../../../../common/runtime_types';
+import { StatusByLocations } from '../';
+
+describe('StatusByLocation component', () => {
+  let monitorLocations: MonitorLocation[];
+
+  it('renders when up in all locations', () => {
+    monitorLocations = [
+      {
+        summary: { up: 4, down: 0 },
+        geo: { name: 'Berlin', location: { lat: '52.487448', lon: ' 13.394798' } },
+      },
+      {
+        summary: { up: 4, down: 0 },
+        geo: { name: 'st-paul', location: { lat: '52.487448', lon: ' 13.394798' } },
+      },
+    ];
+    const component = renderWithIntl(<StatusByLocations locations={monitorLocations} />);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders when only one location and it is up', () => {
+    monitorLocations = [
+      {
+        summary: { up: 4, down: 0 },
+        geo: { name: 'Berlin', location: { lat: '52.487448', lon: ' 13.394798' } },
+      },
+    ];
+    const component = renderWithIntl(<StatusByLocations locations={monitorLocations} />);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders when only one location and it is down', () => {
+    monitorLocations = [
+      {
+        summary: { up: 0, down: 4 },
+        geo: { name: 'Berlin', location: { lat: '52.487448', lon: ' 13.394798' } },
+      },
+    ];
+    const component = renderWithIntl(<StatusByLocations locations={monitorLocations} />);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders all locations are down', () => {
+    monitorLocations = [
+      {
+        summary: { up: 0, down: 4 },
+        geo: { name: 'Berlin', location: { lat: '52.487448', lon: ' 13.394798' } },
+      },
+      {
+        summary: { up: 0, down: 4 },
+        geo: { name: 'st-paul', location: { lat: '52.487448', lon: ' 13.394798' } },
+      },
+    ];
+    const component = renderWithIntl(<StatusByLocations locations={monitorLocations} />);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders when down in some locations', () => {
+    monitorLocations = [
+      {
+        summary: { up: 0, down: 4 },
+        geo: { name: 'Berlin', location: { lat: '52.487448', lon: ' 13.394798' } },
+      },
+      {
+        summary: { up: 4, down: 0 },
+        geo: { name: 'st-paul', location: { lat: '52.487448', lon: ' 13.394798' } },
+      },
+    ];
+    const component = renderWithIntl(<StatusByLocations locations={monitorLocations} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/index.ts b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/index.ts
index 234586e0b51f13..7b4e1ea353c11c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/index.ts
@@ -5,12 +5,12 @@
  */
 import { connect } from 'react-redux';
 import { AppState } from '../../../state';
-import { getMonitorLocations } from '../../../state/selectors';
+import { selectMonitorLocations } from '../../../state/selectors';
 import { fetchMonitorLocations } from '../../../state/actions/monitor';
 import { MonitorStatusDetailsComponent } from './monitor_status_details';
 
 const mapStateToProps = (state: AppState, { monitorId }: any) => ({
-  monitorLocations: getMonitorLocations(state, monitorId),
+  monitorLocations: selectMonitorLocations(state, monitorId),
 });
 
 const mapDispatchToProps = (dispatch: any, ownProps: any) => ({
@@ -32,3 +32,5 @@ export const MonitorStatusDetails = connect(
 )(MonitorStatusDetailsComponent);
 
 export * from './monitor_status_details';
+export { MonitorStatusBar } from './monitor_status_bar';
+export { StatusByLocations } from './monitor_status_bar/status_by_location';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/index.ts b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/index.ts
new file mode 100644
index 00000000000000..94bd7fa7f026bc
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/index.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import {
+  StateProps,
+  DispatchProps,
+  MonitorStatusBarComponent,
+  MonitorStatusBarProps,
+} from './monitor_status_bar';
+import { selectMonitorStatus, selectMonitorLocations } from '../../../../state/selectors';
+import { AppState } from '../../../../state';
+import { getMonitorStatus, getSelectedMonitor } from '../../../../state/actions';
+
+const mapStateToProps = (state: AppState, ownProps: MonitorStatusBarProps) => ({
+  monitorStatus: selectMonitorStatus(state),
+  monitorLocations: selectMonitorLocations(state, ownProps.monitorId),
+});
+
+const mapDispatchToProps = (dispatch: Dispatch<any>, ownProps: MonitorStatusBarProps) => ({
+  loadMonitorStatus: () => {
+    const { dateStart, dateEnd, monitorId } = ownProps;
+    dispatch(
+      getMonitorStatus({
+        monitorId,
+        dateStart,
+        dateEnd,
+      })
+    );
+    dispatch(
+      getSelectedMonitor({
+        monitorId,
+      })
+    );
+  },
+});
+
+// @ts-ignore TODO: Investigate typescript issues here
+export const MonitorStatusBar = connect<StateProps, DispatchProps, MonitorStatusBarProps>(
+  // @ts-ignore TODO: Investigate typescript issues here
+  mapStateToProps,
+  mapDispatchToProps
+)(MonitorStatusBarComponent);
+
+export { MonitorSSLCertificate } from './monitor_ssl_certificate';
+export * from './monitor_status_bar';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/monitor_ssl_certificate.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_ssl_certificate.tsx
similarity index 53%
rename from x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/monitor_ssl_certificate.tsx
rename to x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_ssl_certificate.tsx
index c50f7f1b00f0d9..5e916c40e712d7 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/monitor_ssl_certificate.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_ssl_certificate.tsx
@@ -10,9 +10,8 @@ import moment from 'moment';
 import { EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import styled from 'styled-components';
 
-import { PingTls } from '../../../../common/graphql/types';
+import { PingTls } from '../../../../../common/graphql/types';
 
 interface Props {
   /**
@@ -21,10 +20,6 @@ interface Props {
   tls: PingTls | null | undefined;
 }
 
-const TextContainer = styled.div`
-  margin-left: 20px;
-`;
-
 export const MonitorSSLCertificate = ({ tls }: Props) => {
   const certificateValidity: string | undefined = get(
     tls,
@@ -37,27 +32,22 @@ export const MonitorSSLCertificate = ({ tls }: Props) => {
   return validExpiryDate && certificateValidity ? (
     <>
       <EuiSpacer size="s" />
-      <TextContainer>
-        <EuiText
-          color="subdued"
-          grow={false}
-          size="s"
-          aria-label={i18n.translate(
-            'xpack.uptime.monitorStatusBar.sslCertificateExpiry.ariaLabel',
-            {
-              defaultMessage: 'SSL certificate expires',
-            }
-          )}
-        >
-          <FormattedMessage
-            id="xpack.uptime.monitorStatusBar.sslCertificateExpiry.content"
-            defaultMessage="SSL certificate expires {certificateValidity}"
-            values={{
-              certificateValidity: moment(new Date(certificateValidity).valueOf()).fromNow(),
-            }}
-          />
-        </EuiText>
-      </TextContainer>
+      <EuiText
+        color="subdued"
+        grow={false}
+        size="s"
+        aria-label={i18n.translate('xpack.uptime.monitorStatusBar.sslCertificateExpiry.ariaLabel', {
+          defaultMessage: 'SSL certificate expires',
+        })}
+      >
+        <FormattedMessage
+          id="xpack.uptime.monitorStatusBar.sslCertificateExpiry.content"
+          defaultMessage="SSL certificate expires {certificateValidity}"
+          values={{
+            certificateValidity: moment(new Date(certificateValidity).valueOf()).fromNow(),
+          }}
+        />
+      </EuiText>
     </>
   ) : null;
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_status_bar.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_status_bar.tsx
new file mode 100644
index 00000000000000..57ca909ffde55a
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_status_bar.tsx
@@ -0,0 +1,79 @@
+/*
+ * 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 {
+  EuiLink,
+  EuiTitle,
+  EuiTextColor,
+  EuiSpacer,
+  EuiText,
+  EuiFlexGroup,
+  EuiFlexItem,
+} from '@elastic/eui';
+import React, { useEffect } from 'react';
+import { MonitorSSLCertificate } from './monitor_ssl_certificate';
+import * as labels from './translations';
+import { StatusByLocations } from './status_by_location';
+import { Ping } from '../../../../../common/graphql/types';
+import { MonitorLocations } from '../../../../../common/runtime_types';
+
+export interface StateProps {
+  monitorStatus: Ping;
+  monitorLocations: MonitorLocations;
+}
+
+export interface DispatchProps {
+  loadMonitorStatus: () => void;
+}
+
+export interface MonitorStatusBarProps {
+  monitorId: string;
+  dateStart: string;
+  dateEnd: string;
+}
+
+type Props = MonitorStatusBarProps & StateProps & DispatchProps;
+
+export const MonitorStatusBarComponent: React.FC<Props> = ({
+  dateStart,
+  dateEnd,
+  monitorId,
+  loadMonitorStatus,
+  monitorStatus,
+  monitorLocations,
+}) => {
+  useEffect(() => {
+    loadMonitorStatus();
+  }, [dateStart, dateEnd, loadMonitorStatus]);
+
+  const full = monitorStatus?.url?.full ?? '';
+
+  return (
+    <EuiFlexGroup direction="column" gutterSize="none">
+      <EuiFlexItem grow={false}>
+        <StatusByLocations locations={monitorLocations?.locations ?? []} />
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiText>
+          <EuiLink aria-label={labels.monitorUrlLinkAriaLabel} href={full} target="_blank">
+            {full}
+          </EuiLink>
+        </EuiText>
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <EuiTitle size="xs">
+          <EuiTextColor color="subdued">
+            <h1 data-test-subj="monitor-page-title">{monitorId}</h1>
+          </EuiTextColor>
+        </EuiTitle>
+      </EuiFlexItem>
+      <EuiSpacer />
+      <EuiFlexItem grow={false}>
+        <MonitorSSLCertificate tls={monitorStatus?.tls} />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/status_by_location.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/status_by_location.tsx
new file mode 100644
index 00000000000000..461ffc10124fd3
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/status_by_location.tsx
@@ -0,0 +1,70 @@
+/*
+ * 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 { EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { MonitorLocation } from '../../../../../common/runtime_types';
+
+interface StatusByLocationsProps {
+  locations: MonitorLocation[];
+}
+
+export const StatusByLocations = ({ locations }: StatusByLocationsProps) => {
+  const upLocations: string[] = [];
+  const downLocations: string[] = [];
+
+  if (locations)
+    locations.forEach((item: any) => {
+      if (item.summary.down === 0) {
+        upLocations.push(item.geo.name);
+      } else {
+        downLocations.push(item.geo.name);
+      }
+    });
+
+  let statusMessage = '';
+  let status = '';
+  if (downLocations.length === 0) {
+    // for Messaging like 'Up in 1 Location' or 'Up in 2 Locations'
+    statusMessage = `${locations.length}`;
+    status = 'Up';
+  } else if (downLocations.length > 0) {
+    // for Messaging like 'Down in 1/2 Locations'
+    status = 'Down';
+    statusMessage = `${downLocations.length}/${locations.length}`;
+    if (downLocations.length === locations.length) {
+      // for Messaging like 'Down in 2 Locations'
+      statusMessage = `${locations.length}`;
+    }
+  }
+
+  return (
+    <EuiText>
+      <h2>
+        {locations.length <= 1 ? (
+          <FormattedMessage
+            id="xpack.uptime.monitorStatusBar.locations.oneLocStatus"
+            values={{
+              status,
+              loc: statusMessage,
+            }}
+            defaultMessage="{status} in {loc} Location"
+          />
+        ) : (
+          <FormattedMessage
+            id="xpack.uptime.monitorStatusBar.locations.upStatus"
+            values={{
+              status,
+              loc: statusMessage,
+            }}
+            defaultMessage="{status} in {loc} Locations"
+          />
+        )}
+      </h2>
+    </EuiText>
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/translations.ts b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_bar/translations.ts
rename to x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/translations.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_details.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_details.tsx
index ed67c6364e9580..bb87497d335efd 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_details.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_details.tsx
@@ -7,7 +7,7 @@
 import React, { useEffect } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
 import { LocationMap } from '../location_map';
-import { MonitorStatusBar } from '../monitor_status_bar';
+import { MonitorStatusBar } from './monitor_status_bar';
 
 interface MonitorStatusBarProps {
   monitorId: string;
@@ -34,7 +34,12 @@ export const MonitorStatusDetailsComponent = ({
     <EuiPanel>
       <EuiFlexGroup gutterSize="l" wrap>
         <EuiFlexItem grow={true}>
-          <MonitorStatusBar monitorId={monitorId} variables={variables} />
+          <MonitorStatusBar
+            monitorId={monitorId}
+            variables={variables}
+            dateStart={dateStart}
+            dateEnd={dateEnd}
+          />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <LocationMap monitorLocations={monitorLocations} />
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx
index 4c1b482b198aff..90d716001cff96 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx
@@ -43,7 +43,7 @@ interface StoreProps {
 
 /**
  * Contains functions that will dispatch actions used
- * for this component's lifecyclel
+ * for this component's life cycle
  */
 interface DispatchProps {
   loadSnapshotCount: typeof fetchSnapshotCount;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/uptime_date_picker.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/uptime_date_picker.tsx
index ebd0cd1e4ae850..c282ac9b9e1553 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/uptime_date_picker.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/uptime_date_picker.tsx
@@ -5,9 +5,10 @@
  */
 
 import { EuiSuperDatePicker } from '@elastic/eui';
-import React from 'react';
+import React, { useContext } from 'react';
 import { useUrlParams } from '../../hooks';
 import { CLIENT_DEFAULTS } from '../../../common/constants';
+import { UptimeSettingsContext } from '../../contexts';
 
 // TODO: when EUI exports types for this, this should be replaced
 interface SuperDateRangePickerRangeChangedEvent {
@@ -26,16 +27,14 @@ export interface CommonlyUsedRange {
   display: string;
 }
 
-interface Props {
+interface UptimeDatePickerProps {
   refreshApp: () => void;
-  commonlyUsedRanges?: CommonlyUsedRange[];
 }
 
-type UptimeDatePickerProps = Props;
-
-export const UptimeDatePicker = ({ refreshApp, commonlyUsedRanges }: UptimeDatePickerProps) => {
+export const UptimeDatePicker = ({ refreshApp }: UptimeDatePickerProps) => {
   const [getUrlParams, updateUrl] = useUrlParams();
   const { autorefreshInterval, autorefreshIsPaused, dateRangeStart, dateRangeEnd } = getUrlParams();
+  const { commonlyUsedRanges } = useContext(UptimeSettingsContext);
 
   const euiCommonlyUsedRanges = commonlyUsedRanges
     ? commonlyUsedRanges.map(
diff --git a/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.ts b/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.ts
index 0fd9be952ed401..c656391678aa2c 100644
--- a/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.ts
+++ b/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.ts
@@ -9,6 +9,7 @@ import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
 import { createContext } from 'react';
 import { UptimeAppColors } from '../uptime_app';
 import { CONTEXT_DEFAULTS } from '../../common/constants';
+import { CommonlyUsedRange } from '../components/functional/uptime_date_picker';
 
 export interface UMSettingsContextValues {
   absoluteStartDate: number;
@@ -23,7 +24,7 @@ export interface UMSettingsContextValues {
   isInfraAvailable: boolean;
   isLogsAvailable: boolean;
   refreshApp: () => void;
-  setHeadingText: (text: string) => void;
+  commonlyUsedRanges?: CommonlyUsedRange[];
 }
 
 const {
@@ -64,9 +65,6 @@ const defaultContext: UMSettingsContextValues = {
   refreshApp: () => {
     throw new Error('App refresh was not initialized, set it when you invoke the context');
   },
-  setHeadingText: () => {
-    throw new Error('setHeadingText was not initialized on UMSettingsContext.');
-  },
 };
 
 export const UptimeSettingsContext = createContext(defaultContext);
diff --git a/x-pack/legacy/plugins/uptime/public/pages/index.ts b/x-pack/legacy/plugins/uptime/public/pages/index.ts
index bf5d55ebf17aee..a96be42eb0deea 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/pages/index.ts
@@ -7,3 +7,4 @@
 export { MonitorPage } from './monitor';
 export { OverviewPage } from './overview';
 export { NotFoundPage } from './not_found';
+export { PageHeader } from './page_header';
diff --git a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
index c8334b2376bc17..1b4ad8d82ead18 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
@@ -5,60 +5,31 @@
  */
 
 import { EuiSpacer } from '@elastic/eui';
-import { ApolloQueryResult, OperationVariables, QueryOptions } from 'apollo-client';
-import gql from 'graphql-tag';
-import React, { Fragment, useContext, useEffect, useState } from 'react';
-import { getMonitorPageBreadcrumb } from '../breadcrumbs';
-import { MonitorCharts, MonitorPageTitle, PingList } from '../components/functional';
+import React, { Fragment, useContext, useState } from 'react';
+import { useParams } from 'react-router-dom';
+import { MonitorCharts, PingList } from '../components/functional';
 import { UMUpdateBreadcrumbs } from '../lib/lib';
 import { UptimeSettingsContext } from '../contexts';
 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';
+import { PageHeader } from './page_header';
 
 interface MonitorPageProps {
-  match: { params: { monitorId: string } };
-  // this is the query function provided by Apollo's Client API
-  query: <T, TVariables = OperationVariables>(
-    options: QueryOptions<TVariables>
-  ) => Promise<ApolloQueryResult<T>>;
   setBreadcrumbs: UMUpdateBreadcrumbs;
 }
 
-export const MonitorPage = ({ query, setBreadcrumbs, match }: MonitorPageProps) => {
+export const MonitorPage = ({ setBreadcrumbs }: 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);
+  let { monitorId } = useParams();
+  monitorId = atob(monitorId || '');
+
   const [pingListPageCount, setPingListPageCount] = useState<number>(10);
-  const { colors, refreshApp, setHeadingText } = useContext(UptimeSettingsContext);
+  const { colors, refreshApp } = useContext(UptimeSettingsContext);
   const [getUrlParams, updateUrlParams] = useUrlParams();
   const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
   const { dateRangeStart, dateRangeEnd, selectedPingStatus } = params;
 
-  useEffect(() => {
-    query({
-      query: gql`
-        query MonitorPageTitle($monitorId: String!) {
-          monitorPageTitle: getMonitorPageTitle(monitorId: $monitorId) {
-            id
-            url
-            name
-          }
-        }
-      `,
-      variables: { monitorId },
-    }).then((result: any) => {
-      const { name, url, id } = result.data.monitorPageTitle;
-      const heading: string = name || url || id;
-      document.title = getTitle(name);
-      setBreadcrumbs(getMonitorPageBreadcrumb(heading, stringifyUrlParams(params)));
-      if (setHeadingText) {
-        setHeadingText(heading);
-      }
-    });
-  }, [monitorId, params, query, setBreadcrumbs, setHeadingText]);
-
   const [selectedLocation, setSelectedLocation] = useState(undefined);
 
   const sharedVariables = {
@@ -75,7 +46,7 @@ export const MonitorPage = ({ query, setBreadcrumbs, match }: MonitorPageProps)
 
   return (
     <Fragment>
-      <MonitorPageTitle monitorId={monitorId} variables={{ monitorId }} />
+      <PageHeader setBreadcrumbs={setBreadcrumbs} />
       <EuiSpacer size="s" />
       <MonitorStatusDetails
         monitorId={monitorId}
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index 34bcfb994cd484..edf06242053a22 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -5,10 +5,8 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React, { Fragment, useContext, useEffect, useState } from 'react';
+import React, { Fragment, useContext, useState } from 'react';
 import styled from 'styled-components';
-import { getOverviewPageBreadcrumbs } from '../breadcrumbs';
 import {
   EmptyState,
   FilterGroup,
@@ -24,15 +22,10 @@ import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { useTrackPageview } from '../../../infra/public';
 import { combineFiltersAndUserSearch, stringifyKueries, toStaticIndexPattern } from '../lib/helper';
 import { AutocompleteProviderRegister, esKuery } from '../../../../../../src/plugins/data/public';
+import { PageHeader } from './page_header';
 
 interface OverviewPageProps {
-  basePath: string;
   autocomplete: Pick<AutocompleteProviderRegister, 'getProvider'>;
-  history: any;
-  location: {
-    pathname: string;
-    search: string;
-  };
   setBreadcrumbs: UMUpdateBreadcrumbs;
 }
 
@@ -52,8 +45,8 @@ const EuiFlexItemStyled = styled(EuiFlexItem)`
   }
 `;
 
-export const OverviewPage = ({ basePath, autocomplete, setBreadcrumbs }: Props) => {
-  const { colors, setHeadingText } = useContext(UptimeSettingsContext);
+export const OverviewPage = ({ autocomplete, setBreadcrumbs }: Props) => {
+  const { colors } = useContext(UptimeSettingsContext);
   const [getUrlParams, updateUrl] = useUrlParams();
   const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
   const {
@@ -68,18 +61,6 @@ export const OverviewPage = ({ basePath, autocomplete, setBreadcrumbs }: Props)
   useUptimeTelemetry(UptimePage.Overview);
   useIndexPattern(setIndexPattern);
 
-  useEffect(() => {
-    setBreadcrumbs(getOverviewPageBreadcrumbs());
-    if (setHeadingText) {
-      setHeadingText(
-        i18n.translate('xpack.uptime.overviewPage.headerText', {
-          defaultMessage: 'Overview',
-          description: `The text that will be displayed in the app's heading when the Overview page loads.`,
-        })
-      );
-    }
-  }, [basePath, setBreadcrumbs, setHeadingText]);
-
   useTrackPageview({ app: 'uptime', path: 'overview' });
   useTrackPageview({ app: 'uptime', path: 'overview', delay: 15000 });
 
@@ -121,7 +102,8 @@ export const OverviewPage = ({ basePath, autocomplete, setBreadcrumbs }: Props)
 
   return (
     <Fragment>
-      <EmptyState basePath={basePath} implementsCustomErrorState={true} variables={{}}>
+      <PageHeader setBreadcrumbs={setBreadcrumbs} />
+      <EmptyState implementsCustomErrorState={true} variables={{}}>
         <EuiFlexGroup gutterSize="xs" wrap responsive>
           <EuiFlexItem grow={1} style={{ flexBasis: 500 }}>
             <KueryBar autocomplete={autocomplete} />
diff --git a/x-pack/legacy/plugins/uptime/public/pages/page_header.tsx b/x-pack/legacy/plugins/uptime/public/pages/page_header.tsx
new file mode 100644
index 00000000000000..250dacb8914e76
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/pages/page_header.tsx
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import React, { useEffect, useState, useContext } from 'react';
+import { connect } from 'react-redux';
+import { useRouteMatch, useParams } from 'react-router-dom';
+import { i18n } from '@kbn/i18n';
+import { UptimeDatePicker } from '../components/functional/uptime_date_picker';
+import { AppState } from '../state';
+import { selectSelectedMonitor } from '../state/selectors';
+import { getMonitorPageBreadcrumb, getOverviewPageBreadcrumbs } from '../breadcrumbs';
+import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
+import { UptimeSettingsContext } from '../contexts';
+import { getTitle } from '../lib/helper/get_title';
+import { UMUpdateBreadcrumbs } from '../lib/lib';
+import { MONITOR_ROUTE } from '../routes';
+
+interface PageHeaderProps {
+  monitorStatus?: any;
+  setBreadcrumbs: UMUpdateBreadcrumbs;
+}
+
+export const PageHeaderComponent = ({ monitorStatus, setBreadcrumbs }: PageHeaderProps) => {
+  const monitorPage = useRouteMatch({
+    path: MONITOR_ROUTE,
+  });
+  const { refreshApp } = useContext(UptimeSettingsContext);
+
+  const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = useParams();
+
+  const headingText = i18n.translate('xpack.uptime.overviewPage.headerText', {
+    defaultMessage: 'Overview',
+    description: `The text that will be displayed in the app's heading when the Overview page loads.`,
+  });
+
+  const [headerText, setHeaderText] = useState(headingText);
+
+  useEffect(() => {
+    if (monitorPage) {
+      setHeaderText(monitorStatus?.url?.full);
+      if (monitorStatus?.monitor) {
+        const { name, id } = monitorStatus.monitor;
+        document.title = getTitle(name || id);
+      }
+    } else {
+      document.title = getTitle();
+    }
+  }, [monitorStatus, monitorPage, setHeaderText]);
+
+  useEffect(() => {
+    if (monitorPage) {
+      if (headerText) {
+        setBreadcrumbs(getMonitorPageBreadcrumb(headerText, stringifyUrlParams(params)));
+      }
+    } else {
+      setBreadcrumbs(getOverviewPageBreadcrumbs());
+    }
+  }, [headerText, setBreadcrumbs, params, monitorPage]);
+
+  return (
+    <>
+      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="s">
+        <EuiFlexItem>
+          <EuiTitle>
+            <h1>{headerText}</h1>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <UptimeDatePicker refreshApp={refreshApp} />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+    </>
+  );
+};
+
+const mapStateToProps = (state: AppState) => ({
+  monitorStatus: selectSelectedMonitor(state),
+});
+
+export const PageHeader = connect(mapStateToProps, null)(PageHeaderComponent);
diff --git a/x-pack/legacy/plugins/uptime/public/queries/index.ts b/x-pack/legacy/plugins/uptime/public/queries/index.ts
index b86522c03aba8c..f4947f53254508 100644
--- a/x-pack/legacy/plugins/uptime/public/queries/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/queries/index.ts
@@ -7,6 +7,4 @@
 export { docCountQuery, docCountQueryString } from './doc_count_query';
 export { filterBarQuery, filterBarQueryString } from './filter_bar_query';
 export { monitorChartsQuery, monitorChartsQueryString } from './monitor_charts_query';
-export { monitorPageTitleQuery } from './monitor_page_title_query';
-export { monitorStatusBarQuery, monitorStatusBarQueryString } from './monitor_status_bar_query';
 export { pingsQuery, pingsQueryString } from './pings_query';
diff --git a/x-pack/legacy/plugins/uptime/public/queries/monitor_page_title_query.ts b/x-pack/legacy/plugins/uptime/public/queries/monitor_page_title_query.ts
deleted file mode 100644
index 3b59ef80183f7e..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/queries/monitor_page_title_query.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const monitorPageTitleQueryString = `
-query MonitorPageTitle($monitorId: String!) {
-  monitorPageTitle: getMonitorPageTitle(monitorId: $monitorId) {
-    id
-    url
-    name
-  }
-}`;
-
-export const monitorPageTitleQuery = gql`
-  ${monitorPageTitleQueryString}
-`;
diff --git a/x-pack/legacy/plugins/uptime/public/queries/monitor_status_bar_query.ts b/x-pack/legacy/plugins/uptime/public/queries/monitor_status_bar_query.ts
deleted file mode 100644
index 1f0eed6bb366ae..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/queries/monitor_status_bar_query.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const monitorStatusBarQueryString = `
-query MonitorStatus($dateRangeStart: String!, $dateRangeEnd: String!, $monitorId: String, $location: String) {
-  monitorStatus: getLatestMonitors(
-    dateRangeStart: $dateRangeStart
-    dateRangeEnd: $dateRangeEnd
-    monitorId: $monitorId
-    location: $location
-  ) {
-    timestamp
-    monitor {
-      status
-      duration {
-        us
-      }
-    }
-    observer {
-      geo {
-        name
-      }
-    }
-    tls {
-      certificate_not_valid_after
-    }
-    url {
-      full
-    }
-  }
-}
-`;
-
-export const monitorStatusBarQuery = gql`
-  ${monitorStatusBarQueryString}
-`;
diff --git a/x-pack/legacy/plugins/uptime/public/routes.tsx b/x-pack/legacy/plugins/uptime/public/routes.tsx
new file mode 100644
index 00000000000000..08d752f5b32abe
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/routes.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 React, { FC } from 'react';
+import { Route, Switch } from 'react-router-dom';
+import { MonitorPage, OverviewPage, NotFoundPage } from './pages';
+import { AutocompleteProviderRegister } from '../../../../../src/plugins/data/public';
+import { UMUpdateBreadcrumbs } from './lib/lib';
+
+export const MONITOR_ROUTE = '/monitor/:monitorId/:location?';
+export const OVERVIEW_ROUTE = '/';
+
+interface RouterProps {
+  autocomplete: Pick<AutocompleteProviderRegister, 'getProvider'>;
+  basePath: string;
+  setBreadcrumbs: UMUpdateBreadcrumbs;
+}
+
+export const PageRouter: FC<RouterProps> = ({ autocomplete, basePath, setBreadcrumbs }) => (
+  <Switch>
+    <Route path={MONITOR_ROUTE}>
+      <MonitorPage setBreadcrumbs={setBreadcrumbs} />
+    </Route>
+    <Route path={OVERVIEW_ROUTE}>
+      <OverviewPage autocomplete={autocomplete} setBreadcrumbs={setBreadcrumbs} />
+    </Route>
+    <Route component={NotFoundPage} />
+  </Switch>
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
index 6b896b07bb066c..3174c0023ed927 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
@@ -6,3 +6,4 @@
 
 export * from './snapshot';
 export * from './ui';
+export * from './monitor_status';
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts b/x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts
new file mode 100644
index 00000000000000..db103f6cb780e1
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.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 { createAction } from 'redux-actions';
+import { QueryParams } from './types';
+
+export const getSelectedMonitor = createAction<{ monitorId: string }>('GET_SELECTED_MONITOR');
+export const getSelectedMonitorSuccess = createAction<QueryParams>('GET_SELECTED_MONITOR_SUCCESS');
+export const getSelectedMonitorFail = createAction<QueryParams>('GET_SELECTED_MONITOR_FAIL');
+
+export const getMonitorStatus = createAction<QueryParams>('GET_MONITOR_STATUS');
+export const getMonitorStatusSuccess = createAction<QueryParams>('GET_MONITOR_STATUS_SUCCESS');
+export const getMonitorStatusFail = createAction<QueryParams>('GET_MONITOR_STATUS_FAIL');
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
index 8419aaadc74bdd..dba70ed839ac57 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
@@ -5,10 +5,12 @@
  */
 
 export interface QueryParams {
+  monitorId: string;
   dateStart: string;
   dateEnd: string;
   filters?: string;
   statusFilter?: string;
+  location?: string;
 }
 
 export interface MonitorDetailsActionPayload {
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/index.ts b/x-pack/legacy/plugins/uptime/public/state/api/index.ts
index a4429868494f15..0bcd29cf3fbe91 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/index.ts
@@ -6,3 +6,4 @@
 
 export * from './monitor';
 export * from './snapshot';
+export * from './monitor_status';
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts b/x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts
new file mode 100644
index 00000000000000..936e864b75619a
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getApiPath } from '../../lib/helper';
+import { QueryParams } from '../actions/types';
+import { Ping } from '../../../common/graphql/types';
+
+export interface APIParams {
+  basePath: string;
+  monitorId: string;
+}
+
+export const fetchSelectedMonitor = async ({ basePath, monitorId }: APIParams): Promise<Ping> => {
+  const url = getApiPath(`/api/uptime/monitor/selected`, basePath);
+  const params = {
+    monitorId,
+  };
+  const urlParams = new URLSearchParams(params).toString();
+  const response = await fetch(`${url}?${urlParams}`);
+  if (!response.ok) {
+    throw new Error(response.statusText);
+  }
+  const responseData = await response.json();
+  return responseData;
+};
+
+export const fetchMonitorStatus = async ({
+  basePath,
+  monitorId,
+  dateStart,
+  dateEnd,
+}: QueryParams & APIParams): Promise<Ping> => {
+  const url = getApiPath(`/api/uptime/monitor/status`, basePath);
+  const params = {
+    monitorId,
+    dateStart,
+    dateEnd,
+  };
+  const urlParams = new URLSearchParams(params).toString();
+  const response = await fetch(`${url}?${urlParams}`);
+  if (!response.ok) {
+    throw new Error(response.statusText);
+  }
+  const responseData = await response.json();
+  return responseData;
+};
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
index 4eb027d642974f..936b38a4d53451 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
@@ -7,8 +7,10 @@
 import { fork } from 'redux-saga/effects';
 import { fetchMonitorDetailsEffect } from './monitor';
 import { fetchSnapshotCountSaga } from './snapshot';
+import { fetchMonitorStatusEffect } from './monitor_status';
 
 export function* rootEffect() {
   yield fork(fetchMonitorDetailsEffect);
   yield fork(fetchSnapshotCountSaga);
+  yield fork(fetchMonitorStatusEffect);
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/monitor_status.ts b/x-pack/legacy/plugins/uptime/public/state/effects/monitor_status.ts
new file mode 100644
index 00000000000000..cab32092a14cd2
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/monitor_status.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { call, put, takeLatest, select } from 'redux-saga/effects';
+import { Action } from 'redux-actions';
+import {
+  getSelectedMonitor,
+  getSelectedMonitorSuccess,
+  getSelectedMonitorFail,
+  getMonitorStatus,
+  getMonitorStatusSuccess,
+  getMonitorStatusFail,
+} from '../actions/monitor_status';
+import { fetchSelectedMonitor, fetchMonitorStatus } from '../api';
+import { getBasePath } from '../selectors';
+
+function* selectedMonitorEffect(action: Action<any>) {
+  const { monitorId } = action.payload;
+  try {
+    const basePath = yield select(getBasePath);
+    const response = yield call(fetchSelectedMonitor, {
+      monitorId,
+      basePath,
+    });
+    yield put({ type: getSelectedMonitorSuccess, payload: response });
+  } catch (error) {
+    yield put({ type: getSelectedMonitorFail, payload: error.message });
+  }
+}
+
+function* monitorStatusEffect(action: Action<any>) {
+  const { monitorId, dateStart, dateEnd } = action.payload;
+  try {
+    const basePath = yield select(getBasePath);
+    const response = yield call(fetchMonitorStatus, {
+      monitorId,
+      basePath,
+      dateStart,
+      dateEnd,
+    });
+    yield put({ type: getMonitorStatusSuccess, payload: response });
+  } catch (error) {
+    yield put({ type: getMonitorStatusFail, payload: error.message });
+  }
+}
+
+export function* fetchMonitorStatusEffect() {
+  yield takeLatest(getMonitorStatus, monitorStatusEffect);
+  yield takeLatest(getSelectedMonitor, selectedMonitorEffect);
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
index b588feaf8a75a6..7b4000adc2d123 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
@@ -8,10 +8,11 @@ import { combineReducers } from 'redux';
 import { monitorReducer } from './monitor';
 import { snapshotReducer } from './snapshot';
 import { uiReducer } from './ui';
+import { monitorStatusReducer } from './monitor_status';
 
 export const rootReducer = combineReducers({
   monitor: monitorReducer,
   snapshot: snapshotReducer,
-  // @ts-ignore for now TODO: refactor to use redux-action
   ui: uiReducer,
+  monitorStatus: monitorStatusReducer,
 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/monitor.ts
index 220ab0b2054622..aac8a90598d0c0 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/monitor.ts
@@ -19,10 +19,10 @@ import { MonitorLocations } from '../../../common/runtime_types';
 type MonitorLocationsList = Map<string, MonitorLocations>;
 
 export interface MonitorState {
-  monitorDetailsList: MonitorDetailsState[];
-  monitorLocationsList: MonitorLocationsList;
   loading: boolean;
   errors: any[];
+  monitorDetailsList: MonitorDetailsState[];
+  monitorLocationsList: MonitorLocationsList;
 }
 
 const initialState: MonitorState = {
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts
new file mode 100644
index 00000000000000..2688a0946dd610
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { handleActions, Action } from 'redux-actions';
+import {
+  getSelectedMonitor,
+  getSelectedMonitorSuccess,
+  getSelectedMonitorFail,
+  getMonitorStatus,
+  getMonitorStatusSuccess,
+  getMonitorStatusFail,
+} from '../actions';
+import { Ping } from '../../../common/graphql/types';
+import { QueryParams } from '../actions/types';
+
+export interface MonitorStatusState {
+  status: Ping | null;
+  monitor: Ping | null;
+  loading: boolean;
+}
+
+const initialState: MonitorStatusState = {
+  status: null,
+  monitor: null,
+  loading: false,
+};
+
+type MonitorStatusPayload = QueryParams & Ping;
+
+export const monitorStatusReducer = handleActions<MonitorStatusState, MonitorStatusPayload>(
+  {
+    [String(getSelectedMonitor)]: (state, action: Action<QueryParams>) => ({
+      ...state,
+      loading: true,
+    }),
+
+    [String(getSelectedMonitorSuccess)]: (state, action: Action<Ping>) => ({
+      ...state,
+      loading: false,
+      monitor: { ...action.payload } as Ping,
+    }),
+
+    [String(getSelectedMonitorFail)]: (state, action: Action<any>) => ({
+      ...state,
+      loading: false,
+    }),
+
+    [String(getMonitorStatus)]: (state, action: Action<QueryParams>) => ({
+      ...state,
+      loading: true,
+    }),
+
+    [String(getMonitorStatusSuccess)]: (state, action: Action<Ping>) => ({
+      ...state,
+      loading: false,
+      status: { ...action.payload } as Ping,
+    }),
+
+    [String(getMonitorStatusFail)]: (state, action: Action<any>) => ({
+      ...state,
+      loading: false,
+    }),
+  },
+  initialState
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index 23787706015940..df8e640bcbab54 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -24,10 +24,11 @@ describe('state selectors', () => {
       errors: [],
       loading: false,
     },
-    ui: {
-      basePath: 'yyz',
-      integrationsPopoverOpen: null,
-      lastRefresh: 125,
+    ui: { basePath: 'yyz', integrationsPopoverOpen: null, lastRefresh: 125 },
+    monitorStatus: {
+      status: null,
+      monitor: null,
+      loading: false,
     },
   };
 
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
index 08d1e8c8ca36d7..337e99f6ede16a 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
@@ -17,6 +17,14 @@ export const getMonitorDetails = (state: AppState, summary: any) => {
   return state.monitor.monitorDetailsList[summary.monitor_id];
 };
 
-export const getMonitorLocations = (state: AppState, monitorId: string) => {
+export const selectMonitorLocations = (state: AppState, monitorId: string) => {
   return state.monitor.monitorLocationsList?.get(monitorId);
 };
+
+export const selectSelectedMonitor = (state: AppState) => {
+  return state.monitorStatus.monitor;
+};
+
+export const selectMonitorStatus = (state: AppState) => {
+  return state.monitorStatus.status;
+};
diff --git a/x-pack/legacy/plugins/uptime/public/uptime_app.tsx b/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
index cecbfe375f5fed..25ff0e71770160 100644
--- a/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
+++ b/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
@@ -5,25 +5,25 @@
  */
 
 import DateMath from '@elastic/datemath';
-import { EuiFlexGroup, EuiFlexItem, EuiPage, EuiSpacer, EuiTitle } from '@elastic/eui';
+import { EuiPage } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
 import { i18n } from '@kbn/i18n';
 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 { BrowserRouter as Router, Route, RouteComponentProps } from 'react-router-dom';
 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';
-import { UptimeDatePicker, CommonlyUsedRange } from './components/functional/uptime_date_picker';
+import { CommonlyUsedRange } from './components/functional/uptime_date_picker';
 import { useUrlParams } from './hooks';
 import { getTitle } from './lib/helper/get_title';
 import { store } from './state';
 import { setBasePath, triggerAppRefresh } from './state/actions';
+import { PageRouter } from './routes';
 
 export interface UptimeAppColors {
   danger: string;
@@ -93,7 +93,6 @@ const Application = (props: UptimeAppProps) => {
     };
   }
   const [lastRefresh, setLastRefresh] = useState<number>(Date.now());
-  const [headingText, setHeadingText] = useState<string | undefined>(undefined);
 
   useEffect(() => {
     renderGlobalHelpControls();
@@ -146,7 +145,7 @@ const Application = (props: UptimeAppProps) => {
       isInfraAvailable,
       isLogsAvailable,
       refreshApp,
-      setHeadingText,
+      commonlyUsedRanges,
     };
   };
 
@@ -166,49 +165,11 @@ const Application = (props: UptimeAppProps) => {
                       <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
-                                    query={client.query}
-                                    setBreadcrumbs={setBreadcrumbs}
-                                    {...routerProps}
-                                  />
-                                )}
-                              />
-                              <Route
-                                path="/"
-                                render={routerProps => (
-                                  <OverviewPage
-                                    autocomplete={plugins.data.autocomplete}
-                                    basePath={basePath}
-                                    setBreadcrumbs={setBreadcrumbs}
-                                    {...routerProps}
-                                  />
-                                )}
-                              />
-                              <Route component={NotFoundPage} />
-                            </Switch>
+                            <PageRouter
+                              autocomplete={plugins.data.autocomplete}
+                              basePath={basePath}
+                              setBreadcrumbs={setBreadcrumbs}
+                            />
                           </main>
                         </EuiPage>
                       </UptimeSettingsContext.Provider>
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
index 8b685d8e08a2bf..d53bf6b7015008 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
@@ -9,12 +9,8 @@ import { UMResolver } from '../../../common/graphql/resolver_types';
 import {
   FilterBar,
   GetFilterBarQueryArgs,
-  GetLatestMonitorsQueryArgs,
   GetMonitorChartsDataQueryArgs,
-  GetMonitorPageTitleQueryArgs,
   MonitorChart,
-  MonitorPageTitle,
-  Ping,
   GetSnapshotHistogramQueryArgs,
 } from '../../../common/graphql/types';
 import { UMServerLibs } from '../../lib/lib';
@@ -23,13 +19,6 @@ import { HistogramResult } from '../../../common/domain_types';
 
 export type UMMonitorsResolver = UMResolver<any | Promise<any>, any, UMGqlRange, UMContext>;
 
-export type UMLatestMonitorsResolver = UMResolver<
-  Ping[] | Promise<Ping[]>,
-  any,
-  GetLatestMonitorsQueryArgs,
-  UMContext
->;
-
 export type UMGetMonitorChartsResolver = UMResolver<
   any | Promise<any>,
   any,
@@ -44,13 +33,6 @@ export type UMGetFilterBarResolver = UMResolver<
   UMContext
 >;
 
-export type UMGetMontiorPageTitleResolver = UMResolver<
-  MonitorPageTitle | Promise<MonitorPageTitle | null> | null,
-  any,
-  GetMonitorPageTitleQueryArgs,
-  UMContext
->;
-
 export type UMGetSnapshotHistogram = UMResolver<
   HistogramResult | Promise<HistogramResult>,
   any,
@@ -64,9 +46,7 @@ export const createMonitorsResolvers: CreateUMGraphQLResolvers = (
   Query: {
     getSnapshotHistogram: UMGetSnapshotHistogram;
     getMonitorChartsData: UMGetMonitorChartsResolver;
-    getLatestMonitors: UMLatestMonitorsResolver;
     getFilterBar: UMGetFilterBarResolver;
-    getMonitorPageTitle: UMGetMontiorPageTitleResolver;
   };
 } => ({
   Query: {
@@ -97,19 +77,6 @@ export const createMonitorsResolvers: CreateUMGraphQLResolvers = (
         location,
       });
     },
-    async getLatestMonitors(
-      _resolver,
-      { dateRangeStart, dateRangeEnd, monitorId, location },
-      { APICaller }
-    ): Promise<Ping[]> {
-      return await libs.pings.getLatestMonitorDocs({
-        callES: APICaller,
-        dateRangeStart,
-        dateRangeEnd,
-        monitorId,
-        location,
-      });
-    },
     async getFilterBar(
       _resolver,
       { dateRangeStart, dateRangeEnd },
@@ -121,12 +88,5 @@ export const createMonitorsResolvers: CreateUMGraphQLResolvers = (
         dateRangeEnd,
       });
     },
-    async getMonitorPageTitle(
-      _resolver: any,
-      { monitorId },
-      { APICaller }
-    ): Promise<MonitorPageTitle | null> {
-      return await libs.monitors.getMonitorPageTitle({ callES: APICaller, monitorId });
-    },
   },
 });
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/monitors/schema.gql.ts b/x-pack/legacy/plugins/uptime/server/graphql/monitors/schema.gql.ts
index f9b14c63e70bbc..d49681f1dcd0dc 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/monitors/schema.gql.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/monitors/schema.gql.ts
@@ -114,12 +114,6 @@ export const monitorsSchema = gql`
     interval: UnsignedInteger!
   }
 
-  type MonitorPageTitle {
-    id: String!
-    url: String
-    name: String
-  }
-
   extend type Query {
     getMonitors(
       dateRangeStart: String!
@@ -156,7 +150,5 @@ export const monitorsSchema = gql`
     ): [Ping!]!
 
     getFilterBar(dateRangeStart: String!, dateRangeEnd: String!): FilterBar
-
-    getMonitorPageTitle(monitorId: String!): MonitorPageTitle
   }
 `;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
index 99d346e5d666eb..f844d6ecc1c4ab 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MonitorChart, MonitorPageTitle } from '../../../../common/graphql/types';
+import { MonitorChart } from '../../../../common/graphql/types';
 import { UMElasticsearchQueryFn } from '../framework';
 import { MonitorDetails, MonitorLocations } from '../../../../common/runtime_types';
 
@@ -31,11 +31,6 @@ export interface GetMonitorDetailsParams {
   dateEnd: string;
 }
 
-export interface GetMonitorPageTitleParams {
-  /** @member monitorId the ID to query */
-  monitorId: string;
-}
-
 /**
  * Fetch data for the monitor page title.
  */
@@ -57,7 +52,6 @@ export interface UMMonitorsAdapter {
   /**
    * Fetch data for the monitor page title.
    */
-  getMonitorPageTitle: UMElasticsearchQueryFn<{ monitorId: string }, MonitorPageTitle | null>;
   getMonitorDetails: UMElasticsearchQueryFn<GetMonitorDetailsParams, MonitorDetails>;
   getMonitorLocations: UMElasticsearchQueryFn<GetMonitorLocationsParams, MonitorLocations>;
 }
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
index 5f4c2e45d97597..a452f2364540a8 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
@@ -6,7 +6,7 @@
 
 import { get } from 'lodash';
 import { INDEX_NAMES } from '../../../../common/constants';
-import { MonitorChart, Ping, LocationDurationLine } from '../../../../common/graphql/types';
+import { MonitorChart, LocationDurationLine } from '../../../../common/graphql/types';
 import { getHistogramIntervalFormatted } from '../../helper';
 import { MonitorError, MonitorLocation } from '../../../../common/runtime_types';
 import { UMMonitorsAdapter } from './adapter_types';
@@ -195,42 +195,6 @@ export const elasticsearchMonitorsAdapter: UMMonitorsAdapter = {
     }, {});
   },
 
-  getMonitorPageTitle: async ({ callES, monitorId }) => {
-    const params = {
-      index: INDEX_NAMES.HEARTBEAT,
-      body: {
-        query: {
-          bool: {
-            filter: {
-              term: {
-                'monitor.id': monitorId,
-              },
-            },
-          },
-        },
-        sort: [
-          {
-            '@timestamp': {
-              order: 'desc',
-            },
-          },
-        ],
-        size: 1,
-      },
-    };
-
-    const result = await callES('search', params);
-    const pageTitle: Ping | null = get(result, 'hits.hits[0]._source', null);
-    if (pageTitle === null) {
-      return null;
-    }
-    return {
-      id: get(pageTitle, 'monitor.id', null) || monitorId,
-      url: get(pageTitle, 'url.full', null),
-      name: get(pageTitle, 'monitor.name', null),
-    };
-  },
-
   getMonitorDetails: async ({ callES, monitorId, dateStart, dateEnd }) => {
     const queryFilters: any = [
       {
@@ -289,11 +253,6 @@ export const elasticsearchMonitorsAdapter: UMMonitorsAdapter = {
     };
   },
 
-  /**
-   * Fetch data for the monitor page title.
-   * @param request Kibana server request
-   *
-   */
   getMonitorLocations: async ({ callES, monitorId, dateStart, dateEnd }) => {
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts
index bd1c182e938a3f..e1e39ac9b26377 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts
@@ -411,7 +411,7 @@ describe('ElasticsearchPingsAdapter class', () => {
     });
   });
 
-  describe('getLatestMonitorDocs', () => {
+  describe('getLatestMonitorStatus', () => {
     let expectedGetLatestSearchParams: any;
     beforeEach(() => {
       expectedGetLatestSearchParams = {
@@ -429,7 +429,7 @@ describe('ElasticsearchPingsAdapter class', () => {
                   },
                 },
                 {
-                  term: { 'monitor.id': 'testmonitor' },
+                  term: { 'monitor.id': 'testMonitor' },
                 },
               ],
             },
@@ -467,7 +467,7 @@ describe('ElasticsearchPingsAdapter class', () => {
                         _source: {
                           '@timestamp': 123456,
                           monitor: {
-                            id: 'testmonitor',
+                            id: 'testMonitor',
                           },
                         },
                       },
@@ -483,17 +483,16 @@ describe('ElasticsearchPingsAdapter class', () => {
 
     it('returns data in expected shape', async () => {
       const mockEsClient = jest.fn(async (_request: any, _params: any) => mockEsSearchResult);
-      const result = await adapter.getLatestMonitorDocs({
+      const result = await adapter.getLatestMonitorStatus({
         callES: mockEsClient,
-        dateRangeStart: 'now-1h',
-        dateRangeEnd: 'now',
-        monitorId: 'testmonitor',
+        dateStart: 'now-1h',
+        dateEnd: 'now',
+        monitorId: 'testMonitor',
       });
-      expect(result).toHaveLength(1);
-      expect(result[0].timestamp).toBe(123456);
-      expect(result[0].monitor).not.toBeFalsy();
+      expect(result.timestamp).toBe(123456);
+      expect(result.monitor).not.toBeFalsy();
       // @ts-ignore monitor will be defined
-      expect(result[0].monitor.id).toBe('testmonitor');
+      expect(result.monitor.id).toBe('testMonitor');
       expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetLatestSearchParams);
     });
   });
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/adapter_types.ts
index 81df1c7c0f6312..8b2a49c0c9ffec 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/adapter_types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/adapter_types.ts
@@ -33,16 +33,13 @@ export interface GetAllParams {
 
 export interface GetLatestMonitorDocsParams {
   /** @member dateRangeStart timestamp bounds */
-  dateRangeStart: string;
+  dateStart?: string;
 
   /** @member dateRangeEnd timestamp bounds */
-  dateRangeEnd: string;
+  dateEnd?: string;
 
   /** @member monitorId optional limit to monitorId */
   monitorId?: string | null;
-
-  /** @member location optional location value for use in filtering*/
-  location?: string | null;
 }
 
 export interface GetPingHistogramParams {
@@ -64,7 +61,10 @@ export interface GetPingHistogramParams {
 export interface UMPingsAdapter {
   getAll: UMElasticsearchQueryFn<GetAllParams, PingResults>;
 
-  getLatestMonitorDocs: UMElasticsearchQueryFn<GetLatestMonitorDocsParams, Ping[]>;
+  // Get the monitor meta info regardless of timestamp
+  getMonitor: UMElasticsearchQueryFn<GetLatestMonitorDocsParams, Ping>;
+
+  getLatestMonitorStatus: UMElasticsearchQueryFn<GetLatestMonitorDocsParams, Ping>;
 
   getPingHistogram: UMElasticsearchQueryFn<GetPingHistogramParams, HistogramResult>;
 
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
index d05cb5758ca364..adabffcb1ea4a8 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
@@ -88,7 +88,10 @@ export const elasticsearchPingsAdapter: UMPingsAdapter = {
     return results;
   },
 
-  getLatestMonitorDocs: async ({ callES, dateRangeStart, dateRangeEnd, monitorId, location }) => {
+  // Get The monitor latest state sorted by timestamp with date range
+  getLatestMonitorStatus: async ({ callES, dateStart, dateEnd, monitorId }) => {
+    // TODO: Write tests for this function
+
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
       body: {
@@ -98,13 +101,12 @@ export const elasticsearchPingsAdapter: UMPingsAdapter = {
               {
                 range: {
                   '@timestamp': {
-                    gte: dateRangeStart,
-                    lte: dateRangeEnd,
+                    gte: dateStart,
+                    lte: dateEnd,
                   },
                 },
               },
               ...(monitorId ? [{ term: { 'monitor.id': monitorId } }] : []),
-              ...(location ? [{ term: { 'observer.geo.name': location } }] : []),
             ],
           },
         },
@@ -131,21 +133,45 @@ export const elasticsearchPingsAdapter: UMPingsAdapter = {
     };
 
     const result = await callES('search', params);
-    const buckets: any[] = get(result, 'aggregations.by_id.buckets', []);
+    const ping: any = result.aggregations.by_id.buckets?.[0]?.latest.hits?.hits?.[0] ?? {};
+
+    return {
+      ...ping?._source,
+      timestamp: ping?._source?.['@timestamp'],
+    };
+  },
 
-    return buckets.map(
-      ({
-        latest: {
-          hits: { hits },
+  // Get the monitor meta info regardless of timestamp
+  getMonitor: async ({ callES, monitorId }) => {
+    const params = {
+      index: INDEX_NAMES.HEARTBEAT,
+      body: {
+        size: 1,
+        _source: ['url', 'monitor', 'observer'],
+        query: {
+          bool: {
+            filter: [
+              {
+                term: {
+                  'monitor.id': monitorId,
+                },
+              },
+            ],
+          },
         },
-      }) => {
-        const timestamp = hits[0]._source[`@timestamp`];
-        return {
-          ...hits[0]._source,
-          timestamp,
-        };
-      }
-    );
+        sort: [
+          {
+            '@timestamp': {
+              order: 'desc',
+            },
+          },
+        ],
+      },
+    };
+
+    const result = await callES('search', params);
+
+    return result.hits.hits[0]?._source;
   },
 
   getPingHistogram: async ({
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/index.ts b/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
index 4ab225076eff22..4bc6fe699a21a8 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
@@ -9,7 +9,12 @@ import { createGetIndexPatternRoute } from './index_pattern';
 import { createLogMonitorPageRoute, createLogOverviewPageRoute } from './telemetry';
 import { createGetSnapshotCount } from './snapshot';
 import { UMRestApiRouteFactory } from './types';
-import { createGetMonitorDetailsRoute, createGetMonitorLocationsRoute } from './monitors';
+import {
+  createGetMonitorRoute,
+  createGetMonitorDetailsRoute,
+  createGetMonitorLocationsRoute,
+  createGetStatusBarRoute,
+} from './monitors';
 
 export * from './types';
 export { createRouteWithAuth } from './create_route_with_auth';
@@ -17,8 +22,10 @@ export { uptimeRouteWrapper } from './uptime_route_wrapper';
 export const restApiRoutes: UMRestApiRouteFactory[] = [
   createGetAllRoute,
   createGetIndexPatternRoute,
+  createGetMonitorRoute,
   createGetMonitorDetailsRoute,
   createGetMonitorLocationsRoute,
+  createGetStatusBarRoute,
   createGetSnapshotCount,
   createLogMonitorPageRoute,
   createLogOverviewPageRoute,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/index.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/index.ts
index 2279233d49a096..7f1f10081dc4ec 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/index.ts
@@ -6,3 +6,4 @@
 
 export { createGetMonitorDetailsRoute } from './monitors_details';
 export { createGetMonitorLocationsRoute } from './monitor_locations';
+export { createGetMonitorRoute, createGetStatusBarRoute } from './status';
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/status.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/status.ts
new file mode 100644
index 00000000000000..8b1bc04b451109
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/status.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { UMServerLibs } from '../../lib/lib';
+import { UMRestApiRouteFactory } from '../types';
+
+export const createGetMonitorRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
+  method: 'GET',
+  path: '/api/uptime/monitor/selected',
+  validate: {
+    query: schema.object({
+      monitorId: schema.string(),
+    }),
+  },
+  options: {
+    tags: ['access:uptime'],
+  },
+  handler: async ({ callES }, _context, request, response): Promise<any> => {
+    const { monitorId } = request.query;
+
+    return response.ok({
+      body: {
+        ...(await libs.pings.getMonitor({ callES, monitorId })),
+      },
+    });
+  },
+});
+
+export const createGetStatusBarRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
+  method: 'GET',
+  path: '/api/uptime/monitor/status',
+  validate: {
+    query: schema.object({
+      monitorId: schema.string(),
+      dateStart: schema.string(),
+      dateEnd: schema.string(),
+    }),
+  },
+  options: {
+    tags: ['access:uptime'],
+  },
+  handler: async ({ callES }, _context, request, response): Promise<any> => {
+    const { monitorId, dateStart, dateEnd } = request.query;
+    const result = await libs.pings.getLatestMonitorStatus({
+      callES,
+      monitorId,
+      dateStart,
+      dateEnd,
+    });
+    return response.ok({
+      body: {
+        ...result,
+      },
+    });
+  },
+});
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 916360a46e5a19..9712c7c3473036 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -11741,7 +11741,6 @@
     "xpack.uptime.emptyState.loadingMessage": "読み込み中…",
     "xpack.uptime.emptyState.noDataTitle": "利用可能なアップタイムデータがありません",
     "xpack.uptime.emptyStateError.title": "エラー",
-    "xpack.uptime.emptyStatusBar.defaultMessage": "監視 ID {monitorId} のデータが見つかりません",
     "xpack.uptime.errorMessage": "エラー: {message}",
     "xpack.uptime.featureCatalogueDescription": "エンドポイントヘルスチェックとアップタイム監視を行います。",
     "xpack.uptime.featureRegistry.uptimeFeatureName": "アップタイム",
@@ -11781,7 +11780,6 @@
     "xpack.uptime.monitorList.statusColumn.upLabel": "アップ",
     "xpack.uptime.monitorList.statusColumnLabel": "ステータス",
     "xpack.uptime.monitorStatusBar.durationTextAriaLabel": "ミリ秒単位の監視時間",
-    "xpack.uptime.monitorStatusBar.healthStatus.durationInMillisecondsMessage": "{duration}ms",
     "xpack.uptime.monitorStatusBar.healthStatusMessage.downLabel": "ダウン",
     "xpack.uptime.monitorStatusBar.healthStatusMessage.upLabel": "アップ",
     "xpack.uptime.monitorStatusBar.healthStatusMessageAriaLabel": "監視ステータス",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index f2806b0b33c29d..21ec06c6a191ee 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -11830,7 +11830,6 @@
     "xpack.uptime.emptyState.loadingMessage": "正在加载……",
     "xpack.uptime.emptyState.noDataTitle": "没有可用的运行时间数据",
     "xpack.uptime.emptyStateError.title": "错误",
-    "xpack.uptime.emptyStatusBar.defaultMessage": "未找到监测 ID {monitorId} 的数据",
     "xpack.uptime.errorMessage": "错误：{message}",
     "xpack.uptime.featureCatalogueDescription": "执行终端节点运行状况检查和运行时间监测。",
     "xpack.uptime.featureRegistry.uptimeFeatureName": "运行时间",
@@ -11870,7 +11869,6 @@
     "xpack.uptime.monitorList.statusColumn.upLabel": "运行",
     "xpack.uptime.monitorList.statusColumnLabel": "状态",
     "xpack.uptime.monitorStatusBar.durationTextAriaLabel": "监测持续时间（毫秒）",
-    "xpack.uptime.monitorStatusBar.healthStatus.durationInMillisecondsMessage": "{duration}ms",
     "xpack.uptime.monitorStatusBar.healthStatusMessage.downLabel": "关闭",
     "xpack.uptime.monitorStatusBar.healthStatusMessage.upLabel": "运行",
     "xpack.uptime.monitorStatusBar.healthStatusMessageAriaLabel": "检测状态",
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_page_title.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_page_title.json
deleted file mode 100644
index c0dac6c3711bc7..00000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_page_title.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "monitorPageTitle": {
-    "id": "0002-up",
-    "url": "http://localhost:5678/pattern?r=200x1",
-    "name": ""
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_status_by_id.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_status_by_id.json
deleted file mode 100644
index 88998033655954..00000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_status_by_id.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "timestamp": "2019-09-11T03:40:34.371Z",
-    "monitor": {
-      "status": "up",
-      "duration": {
-        "us": 24627
-      }
-    },
-    "observer": {
-      "geo": {
-        "name": "mpls"
-      }
-    },
-    "tls": null,
-    "url": {
-      "full": "http://localhost:5678/pattern?r=200x1"
-    }
-  }
-]
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/helpers/expect_fixture_eql.ts b/x-pack/test/api_integration/apis/uptime/graphql/helpers/expect_fixture_eql.ts
index 362803d2b85509..45cc9011773a9c 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/helpers/expect_fixture_eql.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/helpers/expect_fixture_eql.ts
@@ -10,6 +10,7 @@ import { join } from 'path';
 import { cloneDeep } from 'lodash';
 
 const fixturesDir = join(__dirname, '..', 'fixtures');
+const restFixturesDir = join(__dirname, '../../rest/', 'fixtures');
 
 const excludeFieldsFrom = (from: any, excluder?: (d: any) => any): any => {
   const clone = cloneDeep(from);
@@ -20,7 +21,11 @@ const excludeFieldsFrom = (from: any, excluder?: (d: any) => any): any => {
 };
 
 export const expectFixtureEql = <T>(data: T, fixtureName: string, excluder?: (d: T) => void) => {
-  const fixturePath = join(fixturesDir, `${fixtureName}.json`);
+  let fixturePath = join(fixturesDir, `${fixtureName}.json`);
+  if (!fs.existsSync(fixturePath)) {
+    fixturePath = join(restFixturesDir, `${fixtureName}.json`);
+  }
+
   const dataExcluded = excludeFieldsFrom(data, excluder);
   expect(dataExcluded).not.to.be(undefined);
   if (process.env.UPDATE_UPTIME_FIXTURES) {
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/index.js b/x-pack/test/api_integration/apis/uptime/graphql/index.js
index 3a696244a5ebaa..5c93be83ab7d9a 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/index.js
+++ b/x-pack/test/api_integration/apis/uptime/graphql/index.js
@@ -13,9 +13,7 @@ export default function({ loadTestFile }) {
     loadTestFile(require.resolve('./doc_count'));
     loadTestFile(require.resolve('./filter_bar'));
     loadTestFile(require.resolve('./monitor_charts'));
-    loadTestFile(require.resolve('./monitor_page_title'));
     loadTestFile(require.resolve('./monitor_states'));
-    loadTestFile(require.resolve('./monitor_status_bar'));
     loadTestFile(require.resolve('./ping_list'));
     loadTestFile(require.resolve('./snapshot_histogram'));
   });
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts b/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts
deleted file mode 100644
index 56d22610ffe491..00000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_page_title.ts
+++ /dev/null
@@ -1,37 +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 { monitorPageTitleQueryString } from '../../../../../legacy/plugins/uptime/public/queries/monitor_page_title_query';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { expectFixtureEql } from './helpers/expect_fixture_eql';
-
-export default function({ getService }: FtrProviderContext) {
-  describe('monitor_page_title', () => {
-    before('load heartbeat data', () => getService('esArchiver').load('uptime/full_heartbeat'));
-    after('unload heartbeat index', () => getService('esArchiver').unload('uptime/full_heartbeat'));
-
-    const supertest = getService('supertest');
-
-    it('will fetch a title for a given monitorId', async () => {
-      const getMonitorTitleQuery = {
-        operationName: 'MonitorPageTitle',
-        query: monitorPageTitleQueryString,
-        variables: {
-          monitorId: '0002-up',
-        },
-      };
-
-      const {
-        body: { data },
-      } = await supertest
-        .post('/api/uptime/graphql')
-        .set('kbn-xsrf', 'foo')
-        .send({ ...getMonitorTitleQuery });
-
-      expectFixtureEql(data, 'monitor_page_title');
-    });
-  });
-}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/monitor_status_bar.js b/x-pack/test/api_integration/apis/uptime/graphql/monitor_status_bar.js
deleted file mode 100644
index 5d03c90bb20327..00000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_status_bar.js
+++ /dev/null
@@ -1,58 +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 { monitorStatusBarQueryString } from '../../../../../legacy/plugins/uptime/public/queries';
-import { expectFixtureEql } from './helpers/expect_fixture_eql';
-
-export default function({ getService }) {
-  describe('monitorStatusBar query', () => {
-    before('load heartbeat data', () => getService('esArchiver').load('uptime/full_heartbeat'));
-    after('unload heartbeat index', () => getService('esArchiver').unload('uptime/full_heartbeat'));
-
-    const supertest = getService('supertest');
-
-    it('returns the status for all monitors with no ID filtering', async () => {
-      const getMonitorStatusBarQuery = {
-        operationName: 'MonitorStatus',
-        query: monitorStatusBarQueryString,
-        variables: {
-          dateRangeStart: '2019-01-28T17:40:08.078Z',
-          dateRangeEnd: '2025-01-28T19:00:16.078Z',
-        },
-      };
-      const {
-        body: {
-          data: { monitorStatus: responseData },
-        },
-      } = await supertest
-        .post('/api/uptime/graphql')
-        .set('kbn-xsrf', 'foo')
-        .send({ ...getMonitorStatusBarQuery });
-
-      expectFixtureEql(responseData, 'monitor_status_all', res =>
-        res.forEach(i => delete i.millisFromNow)
-      );
-    });
-
-    it('returns the status for only the given monitor', async () => {
-      const getMonitorStatusBarQuery = {
-        operationName: 'MonitorStatus',
-        query: monitorStatusBarQueryString,
-        variables: {
-          dateRangeStart: '2019-01-28T17:40:08.078Z',
-          dateRangeEnd: '2025-01-28T19:00:16.078Z',
-          monitorId: '0002-up',
-        },
-      };
-      const res = await supertest
-        .post('/api/uptime/graphql')
-        .set('kbn-xsrf', 'foo')
-        .send({ ...getMonitorStatusBarQuery });
-
-      expectFixtureEql(res.body.data.monitorStatus, 'monitor_status_by_id');
-    });
-  });
-}
diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
new file mode 100644
index 00000000000000..1702cb2c21007e
--- /dev/null
+++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
@@ -0,0 +1,89 @@
+{
+   "@timestamp": "2019-09-11T03:40:34.371Z",
+   "agent": {
+       "ephemeral_id": "412a92a8-2142-4b1a-a7a2-1afd32e12f85",
+       "hostname": "avc-x1x",
+       "id": "04e1d082-65bc-4929-8d65-d0768a2621c4",
+       "type": "heartbeat",
+       "version": "8.0.0"
+     },
+   "ecs": {
+       "version": "1.1.0"
+     },
+   "event": {
+       "dataset": "uptime"
+     },
+   "host": {
+       "name": "avc-x1x"
+     },
+   "http": {
+       "response": {
+           "body": {
+               "bytes": 3,
+               "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf"
+             },
+           "status_code": 200
+         },
+       "rtt": {
+           "content": {
+               "us": 57
+             },
+           "response_header": {
+               "us": 262
+             },
+           "total": {
+               "us": 20331
+             },
+           "validate": {
+               "us": 319
+             },
+           "write_request": {
+               "us": 82
+             }
+         }
+     },
+   "monitor": {
+       "check_group": "d76f0762-d445-11e9-88e3-3e80641b9c71",
+       "duration": {
+           "us": 24627
+         },
+       "id": "0002-up",
+       "ip": "127.0.0.1",
+       "name": "",
+       "status": "up",
+       "type": "http"
+     },
+   "observer": {
+       "geo": {
+           "location": "37.926868, -78.024902",
+           "name": "mpls"
+         },
+       "hostname": "avc-x1x"
+     },
+   "resolve": {
+       "ip": "127.0.0.1",
+       "rtt": {
+           "us": 4218
+         }
+     },
+   "summary": {
+       "down": 0,
+       "up": 1
+     },
+   "tcp": {
+       "rtt": {
+           "connect": {
+               "us": 103
+             }
+         }
+     },
+   "timestamp": "2019-09-11T03:40:34.371Z",
+   "url": {
+       "domain": "localhost",
+       "full": "http://localhost:5678/pattern?r=200x1",
+       "path": "/pattern",
+       "port": 5678,
+       "query": "r=200x1",
+       "scheme": "http"
+     }
+  }
diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/selected_monitor.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/selected_monitor.json
new file mode 100644
index 00000000000000..d8367ea67052fa
--- /dev/null
+++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/selected_monitor.json
@@ -0,0 +1,28 @@
+{
+  "monitor": {
+    "check_group": "d76f0762-d445-11e9-88e3-3e80641b9c71",
+    "duration": {
+      "us": 24627
+    },
+    "id": "0002-up",
+    "ip": "127.0.0.1",
+    "name": "",
+    "status": "up",
+    "type": "http"
+  },
+  "observer": {
+    "geo": {
+      "location": "37.926868, -78.024902",
+      "name": "mpls"
+    },
+    "hostname": "avc-x1x"
+  },
+  "url": {
+    "domain": "localhost",
+    "full": "http://localhost:5678/pattern?r=200x1",
+    "path": "/pattern",
+    "port": 5678,
+    "query": "r=200x1",
+    "scheme": "http"
+  }
+}
diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts
index 68377e0820e054..ef80c1d8728feb 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -12,5 +12,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
     before('load heartbeat data', () => esArchiver.load('uptime/blank'));
     after('unload', () => esArchiver.unload('uptime/blank'));
     loadTestFile(require.resolve('./snapshot'));
+    loadTestFile(require.resolve('./monitor_latest_status'));
+    loadTestFile(require.resolve('./selected_monitor'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
new file mode 100644
index 00000000000000..749b304c87ee3a
--- /dev/null
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { expectFixtureEql } from '../graphql/helpers/expect_fixture_eql';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  describe('get monitor latest status API', () => {
+    const dateStart = '2018-01-28T17:40:08.078Z';
+    const dateEnd = '2025-01-28T19:00:16.078Z';
+    const monitorId = '0002-up';
+
+    const supertest = getService('supertest');
+
+    it('returns the status for only the given monitor', async () => {
+      const apiResponse = await supertest.get(
+        `/api/uptime/monitor/status?monitorId=${monitorId}&dateStart=${dateStart}&dateEnd=${dateEnd}`
+      );
+      expectFixtureEql(apiResponse.body, 'monitor_latest_status');
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/uptime/rest/selected_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/selected_monitor.ts
new file mode 100644
index 00000000000000..ed034f58a5f59c
--- /dev/null
+++ b/x-pack/test/api_integration/apis/uptime/rest/selected_monitor.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { expectFixtureEql } from '../graphql/helpers/expect_fixture_eql';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  describe('get selected monitor by ID', () => {
+    const monitorId = '0002-up';
+
+    const supertest = getService('supertest');
+
+    it('returns the monitor for give ID', async () => {
+      const apiResponse = await supertest.get(
+        `/api/uptime/monitor/selected?monitorId=${monitorId}`
+      );
+      expectFixtureEql(apiResponse.body, 'selected_monitor');
+    });
+  });
+}

From daffda7286a4d31e183b36a74f816f055a5487db Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Thu, 9 Jan 2020 09:28:08 -0800
Subject: [PATCH 87/96] [DOCS] Adds licence expiry details (#54081)

---
 docs/management/managing-licenses.asciidoc | 189 +++++++++++++++++++--
 1 file changed, 173 insertions(+), 16 deletions(-)

diff --git a/docs/management/managing-licenses.asciidoc b/docs/management/managing-licenses.asciidoc
index bbe4b3b68e03b0..0ad27e68f7fe94 100644
--- a/docs/management/managing-licenses.asciidoc
+++ b/docs/management/managing-licenses.asciidoc
@@ -1,28 +1,185 @@
 [[managing-licenses]]
-== License Management
+== License management
 
-When you install {kib}, it generates a Basic license
-with no expiration date.  Go to *Management > License Management* to view the 
-status of your license, start a 30-day trial, or install a new license. 
+When you install the default distribution of {kib}, you receive a basic license
+with no expiration date. For the full list of free features that are included in
+the basic license, see https://www.elastic.co/subscriptions[the subscription page].
 
-To learn more about the available license levels,
-see https://www.elastic.co/subscriptions[the subscription page]. 
+If you want to try out the full set of platinum features, you can activate a
+30-day trial license. Go to *Management > License Management* to view the 
+status of your license, start a trial, or install a new license.
 
-You can activate a 30-day trial license to try out the full set of 
-https://www.elastic.co/subscriptions[Platinum features], including machine learning, 
-advanced security, alerting, graph capabilities, and more. 
+NOTE: You can start a trial only if your cluster has not already activated a
+trial license for the current major product version. For example, if you have
+already activated a trial for v6.0, you cannot start a new trial until 
+v7.0. You can, however, contact `info@elastic.co` to request an extended trial
+license.
 
-When you activate a new license level, new features will appear in the left sidebar 
+When you activate a new license level, new features appear in the left sidebar 
 of the *Management* page.
 
 [role="screenshot"]
 image::images/management-license.png[]
 
-At the end of the trial period, the Platinum features operate in a 
-{stack-ov}/license-expiration.html[degraded mode]. You can revert to a Basic 
-license, extend the trial, or purchase a subscription. 
+At the end of the trial period, the platinum features operate in a
+<<license-expiration,degraded mode>>. You can revert to a basic license, 
+extend the trial, or purchase a subscription. 
 
+TIP: If {security-features} are enabled, before you revert to a basic license or
+install a gold or platinum license, you must configure Transport Layer Security
+(TLS) in {es}. See {ref}/encrypting-communications.html[Encrypting communications].
+{kib} and the {ref}/start-basic.html[start basic API] provide a list of all of
+the features that will no longer be supported if you revert to a basic license.
 
-TIP: If {security-features} are enabled, before you revert to a Basic license or install 
-a Gold or Platinum license, you must configure Transport Layer Security (TLS) in {es}. 
-See {ref}/encrypting-communications.html[Encrypting communications].
\ No newline at end of file
+[discrete]
+[[update-license]]
+=== Update your license
+
+You can update your license at runtime without shutting down your {es} nodes.
+License updates take effect immediately. The license is provided as a _JSON_
+file that you install in {kib} or by using the
+{ref}/update-license.html[update license API].
+
+TIP: If you are using a basic or trial license, {security-features} are disabled
+by default. In all other licenses, {security-features} are enabled by default;
+you must secure the {stack} or disable the {security-features}. 
+
+[discrete]
+[[license-expiration]]
+=== License expiration
+
+Your license is time based and expires at a future date. If you're using
+{monitor-features} and your license will expire within 30 days, a license
+expiration warning is displayed prominently. Warnings are also displayed on
+startup and written to the {es} log starting 30 days from the expiration date.
+These error messages tell you when the license expires and what features will be
+disabled if you do not update the license.
+
+IMPORTANT: You should update your license as soon as possible. You are
+essentially flying blind when running with an expired license. Access to the
+cluster health and stats APIs is critical for monitoring and managing an {es}
+cluster.
+
+[discrete]
+[[expiration-beats]]
+==== Beats
+
+*  Beats will continue to poll centrally-managed configuration.
+
+[discrete]
+[[expiration-elasticsearch]]
+==== {es}
+
+// Upgrade API is disabled
+* The deprecation API is disabled.
+* SQL support is disabled.
+* Aggregations provided by the analytics plugin are no longer usable.
+
+[discrete]
+[[expiration-watcher]]
+==== {stack} {alert-features}
+
+* The PUT and GET watch APIs are disabled. The DELETE watch API continues to work.
+* Watches execute and write to the history.
+* The actions of the watches do not execute.
+
+[discrete]
+[[expiration-graph]]
+==== {stack} {graph-features}
+
+* Graph explore APIs are disabled.
+
+[discrete]
+[[expiration-ml]]
+==== {stack} {ml-features}
+
+* APIs to create {anomaly-jobs}, open jobs, send data to jobs, create {dfeeds},
+and start {dfeeds} are disabled.
+* All started {dfeeds} are stopped.
+* All open {anomaly-jobs} are closed.
+* APIs to create and start {dfanalytics-jobs} are disabled. 
+* Existing {anomaly-job} and {dfanalytics-job} results continue to be available
+by using {kib} or APIs.
+
+[discrete]
+[[expiration-monitoring]]
+==== {stack} {monitor-features}
+
+* The agent stops collecting cluster and indices metrics.
+* The agent stops automatically cleaning indices older than
+`xpack.monitoring.history.duration`.
+
+[discrete]
+[[expiration-security]]
+==== {stack} {security-features}
+
+* Cluster health, cluster stats, and indices stats operations are blocked.
+* All data operations (read and write) continue to work.
+
+Once the license expires, calls to the cluster health, cluster stats, and index
+stats APIs fail with a `security_exception` and return a 403 HTTP status code.
+
+[source,sh]
+-----------------------------------------------------
+{
+  "error": {
+    "root_cause": [
+      {
+        "type": "security_exception",
+        "reason": "current license is non-compliant for [security]",
+        "license.expired.feature": "security"
+      }
+    ],
+    "type": "security_exception",
+    "reason": "current license is non-compliant for [security]",
+    "license.expired.feature": "security"
+  },
+  "status": 403
+}
+-----------------------------------------------------
+
+This message enables automatic monitoring systems to easily detect the license
+failure without immediately impacting other users.
+
+[discrete]
+[[expiration-logstash]]
+==== {ls} pipeline management
+
+* Cannot create new pipelines or edit or delete existing pipelines from the UI.
+* Cannot list or view existing pipelines from the UI.
+* Cannot run Logstash instances which are registered to listen to existing pipelines.
+//TBD: * Logstash will continue to poll centrally-managed pipelines
+
+[discrete]
+[[expiration-kibana]]
+==== {kib}
+
+* Users can still log into {kib}.
+* {kib} works for data exploration and visualization, but some features
+are disabled.
+* The license management UI is available to easily upgrade your license. See
+<<update-license>> and <<managing-licenses>>.
+
+[discrete]
+[[expiration-reporting]]
+==== {kib} {report-features}
+
+* Reporting is no longer available in {kib}.
+* Report generation URLs stop working.
+* Existing reports are no longer accessible.
+
+[discrete]
+[[expiration-rollups]]
+==== {rollups-cap}
+
+* {rollup-jobs-cap} cannot be created or started.
+* Existing {rollup-jobs} can be stopped and deleted.
+* The get rollup caps and rollup search APIs continue to function.
+
+[discrete]
+[[expiration-transforms]]
+==== {transforms-cap}
+
+* {transforms-cap} cannot be created, previewed, started, or updated.
+* Existing {transforms} can be stopped and deleted.
+* Existing {transform} results continue to be available.

From a6605f21cc81d24280e7cbc70bfaac3df0e343e1 Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Thu, 9 Jan 2020 10:59:16 -0700
Subject: [PATCH 88/96] [Metrics UI & Logs UI] Deprecate the override fields in
 settings (#54206)

---
 .../fields_configuration_panel.tsx            | 468 ++++++++++--------
 1 file changed, 257 insertions(+), 211 deletions(-)

diff --git a/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx b/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
index e65753ef24e9e3..e80b1489728cc4 100644
--- a/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/source_configuration/fields_configuration_panel.tsx
@@ -12,7 +12,10 @@ import {
   EuiFormRow,
   EuiSpacer,
   EuiTitle,
+  EuiCallOut,
+  EuiLink,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 
@@ -38,259 +41,302 @@ export const FieldsConfigurationPanel = ({
   tiebreakerFieldProps,
   timestampFieldProps,
   displaySettings,
-}: FieldsConfigurationPanelProps) => (
-  <EuiForm>
-    <EuiTitle size="s">
-      <h3>
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.fieldsSectionTitle"
-          defaultMessage="Fields"
-        />
-      </h3>
-    </EuiTitle>
-    <EuiSpacer size="m" />
-    <EuiDescribedFormGroup
-      idAria="timestampField"
-      title={
-        <h4>
+}: FieldsConfigurationPanelProps) => {
+  const isHostValueDefault = hostFieldProps.value === 'host.name';
+  const isContainerValueDefault = containerFieldProps.value === 'container.id';
+  const isPodValueDefault = podFieldProps.value === 'kubernetes.pod.uid';
+  const isTimestampValueDefault = timestampFieldProps.value === '@timestamp';
+  const isTiebreakerValueDefault = tiebreakerFieldProps.value === '_doc';
+  return (
+    <EuiForm>
+      <EuiTitle size="s">
+        <h3>
           <FormattedMessage
-            id="xpack.infra.sourceConfiguration.timestampFieldLabel"
-            defaultMessage="Timestamp"
+            id="xpack.infra.sourceConfiguration.fieldsSectionTitle"
+            defaultMessage="Fields"
           />
-        </h4>
-      }
-      description={
-        <FormattedMessage
-          id="xpack.infra.sourceConfiguration.timestampFieldDescription"
-          defaultMessage="Timestamp used to sort log entries"
-        />
-      }
-    >
-      <EuiFormRow
-        describedByIds={['timestampField']}
-        error={timestampFieldProps.error}
-        fullWidth
-        helpText={
+        </h3>
+      </EuiTitle>
+      <EuiSpacer size="m" />
+      <EuiCallOut
+        title={i18n.translate('xpack.infra.sourceConfiguration.deprecationNotice', {
+          defaultMessage: 'Deprecation Notice',
+        })}
+        color="warning"
+        iconType="help"
+      >
+        <p>
           <FormattedMessage
-            id="xpack.infra.sourceConfiguration.timestampFieldRecommendedValue"
-            defaultMessage="The recommended value is {defaultValue}"
+            id="xpack.infra.sourceConfiguration.deprecationMessage"
+            defaultMessage="Configuring these fields have been deprecated and will be removed in 8.0.0. This application is designed to work with {ecsLink}, you should adjust your indexing to use the {documentationLink}."
             values={{
-              defaultValue: <EuiCode>@timestamp</EuiCode>,
+              documentationLink: (
+                <EuiLink
+                  href="https://www.elastic.co/guide/en/infrastructure/guide/7.4/infrastructure-metrics.html"
+                  target="BLANK"
+                >
+                  <FormattedMessage
+                    id="xpack.infra.sourceConfiguration.documentedFields"
+                    defaultMessage="documented fields"
+                  />
+                </EuiLink>
+              ),
+              ecsLink: (
+                <EuiLink
+                  href="https://www.elastic.co/guide/en/ecs/current/index.html"
+                  target="BLANK"
+                >
+                  ECS
+                </EuiLink>
+              ),
             }}
           />
+        </p>
+      </EuiCallOut>
+      <EuiSpacer size="m" />
+      <EuiDescribedFormGroup
+        idAria="timestampField"
+        title={
+          <h4>
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.timestampFieldLabel"
+              defaultMessage="Timestamp"
+            />
+          </h4>
         }
-        isInvalid={timestampFieldProps.isInvalid}
-        label={
+        description={
           <FormattedMessage
-            id="xpack.infra.sourceConfiguration.timestampFieldLabel"
-            defaultMessage="Timestamp"
+            id="xpack.infra.sourceConfiguration.timestampFieldDescription"
+            defaultMessage="Timestamp used to sort log entries"
           />
         }
       >
-        <EuiFieldText
+        <EuiFormRow
+          describedByIds={['timestampField']}
+          error={timestampFieldProps.error}
           fullWidth
-          disabled={isLoading}
-          readOnly={readOnly}
-          isLoading={isLoading}
-          {...timestampFieldProps}
-        />
-      </EuiFormRow>
-    </EuiDescribedFormGroup>
-    {displaySettings === 'logs' && (
-      <>
-        <EuiDescribedFormGroup
-          idAria="tiebreakerField"
-          title={
-            <h4>
-              <FormattedMessage
-                id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
-                defaultMessage="Tiebreaker"
-              />
-            </h4>
+          helpText={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.timestampFieldRecommendedValue"
+              defaultMessage="The recommended value is {defaultValue}"
+              values={{
+                defaultValue: <EuiCode>@timestamp</EuiCode>,
+              }}
+            />
           }
-          description={
+          isInvalid={timestampFieldProps.isInvalid}
+          label={
             <FormattedMessage
-              id="xpack.infra.sourceConfiguration.tiebreakerFieldDescription"
-              defaultMessage="Field used to break ties between two entries with the same timestamp"
+              id="xpack.infra.sourceConfiguration.timestampFieldLabel"
+              defaultMessage="Timestamp"
             />
           }
         >
-          <EuiFormRow
-            describedByIds={['tiebreakerField']}
-            error={tiebreakerFieldProps.error}
+          <EuiFieldText
             fullWidth
-            helpText={
-              <FormattedMessage
-                id="xpack.infra.sourceConfiguration.tiebreakerFieldRecommendedValue"
-                defaultMessage="The recommended value is {defaultValue}"
-                values={{
-                  defaultValue: <EuiCode>_doc</EuiCode>,
-                }}
-              />
+            disabled={isLoading || isTimestampValueDefault}
+            readOnly={readOnly}
+            isLoading={isLoading}
+            {...timestampFieldProps}
+          />
+        </EuiFormRow>
+      </EuiDescribedFormGroup>
+      {displaySettings === 'logs' && (
+        <>
+          <EuiDescribedFormGroup
+            idAria="tiebreakerField"
+            title={
+              <h4>
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
+                  defaultMessage="Tiebreaker"
+                />
+              </h4>
             }
-            isInvalid={tiebreakerFieldProps.isInvalid}
-            label={
+            description={
               <FormattedMessage
-                id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
-                defaultMessage="Tiebreaker"
+                id="xpack.infra.sourceConfiguration.tiebreakerFieldDescription"
+                defaultMessage="Field used to break ties between two entries with the same timestamp"
               />
             }
           >
-            <EuiFieldText
+            <EuiFormRow
+              describedByIds={['tiebreakerField']}
+              error={tiebreakerFieldProps.error}
               fullWidth
-              disabled={isLoading}
-              readOnly={readOnly}
-              isLoading={isLoading}
-              {...tiebreakerFieldProps}
-            />
-          </EuiFormRow>
-        </EuiDescribedFormGroup>
-      </>
-    )}
-    {displaySettings === 'metrics' && (
-      <>
-        <EuiDescribedFormGroup
-          idAria="containerField"
-          title={
-            <h4>
-              <FormattedMessage
-                id="xpack.infra.sourceConfiguration.containerFieldLabel"
-                defaultMessage="Container ID"
-              />
-            </h4>
-          }
-          description={
-            <FormattedMessage
-              id="xpack.infra.sourceConfiguration.containerFieldDescription"
-              defaultMessage="Field used to identify Docker containers"
-            />
-          }
-        >
-          <EuiFormRow
-            describedByIds={['containerField']}
-            error={containerFieldProps.error}
-            fullWidth
-            helpText={
-              <FormattedMessage
-                id="xpack.infra.sourceConfiguration.containerFieldRecommendedValue"
-                defaultMessage="The recommended value is {defaultValue}"
-                values={{
-                  defaultValue: <EuiCode>container.id</EuiCode>,
-                }}
+              helpText={
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.tiebreakerFieldRecommendedValue"
+                  defaultMessage="The recommended value is {defaultValue}"
+                  values={{
+                    defaultValue: <EuiCode>_doc</EuiCode>,
+                  }}
+                />
+              }
+              isInvalid={tiebreakerFieldProps.isInvalid}
+              label={
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
+                  defaultMessage="Tiebreaker"
+                />
+              }
+            >
+              <EuiFieldText
+                fullWidth
+                disabled={isLoading || isTiebreakerValueDefault}
+                readOnly={readOnly}
+                isLoading={isLoading}
+                {...tiebreakerFieldProps}
               />
+            </EuiFormRow>
+          </EuiDescribedFormGroup>
+        </>
+      )}
+      {displaySettings === 'metrics' && (
+        <>
+          <EuiDescribedFormGroup
+            idAria="containerField"
+            title={
+              <h4>
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.containerFieldLabel"
+                  defaultMessage="Container ID"
+                />
+              </h4>
             }
-            isInvalid={containerFieldProps.isInvalid}
-            label={
+            description={
               <FormattedMessage
-                id="xpack.infra.sourceConfiguration.containerFieldLabel"
-                defaultMessage="Container ID"
+                id="xpack.infra.sourceConfiguration.containerFieldDescription"
+                defaultMessage="Field used to identify Docker containers"
               />
             }
           >
-            <EuiFieldText
+            <EuiFormRow
+              describedByIds={['containerField']}
+              error={containerFieldProps.error}
               fullWidth
-              disabled={isLoading}
-              readOnly={readOnly}
-              isLoading={isLoading}
-              {...containerFieldProps}
-            />
-          </EuiFormRow>
-        </EuiDescribedFormGroup>
-        <EuiDescribedFormGroup
-          idAria="hostNameField"
-          title={
-            <h4>
-              <FormattedMessage
-                id="xpack.infra.sourceConfiguration.hostNameFieldLabel"
-                defaultMessage="Host name"
-              />
-            </h4>
-          }
-          description={
-            <FormattedMessage
-              id="xpack.infra.sourceConfiguration.hostNameFieldDescription"
-              defaultMessage="Field used to identify hosts"
-            />
-          }
-        >
-          <EuiFormRow
-            describedByIds={['hostNameField']}
-            error={hostFieldProps.error}
-            fullWidth
-            helpText={
-              <FormattedMessage
-                id="xpack.infra.sourceConfiguration.hostFieldDescription"
-                defaultMessage="The recommended value is {defaultValue}"
-                values={{
-                  defaultValue: <EuiCode>host.name</EuiCode>,
-                }}
+              helpText={
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.containerFieldRecommendedValue"
+                  defaultMessage="The recommended value is {defaultValue}"
+                  values={{
+                    defaultValue: <EuiCode>container.id</EuiCode>,
+                  }}
+                />
+              }
+              isInvalid={containerFieldProps.isInvalid}
+              label={
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.containerFieldLabel"
+                  defaultMessage="Container ID"
+                />
+              }
+            >
+              <EuiFieldText
+                fullWidth
+                disabled={isLoading || isContainerValueDefault}
+                readOnly={readOnly}
+                isLoading={isLoading}
+                {...containerFieldProps}
               />
+            </EuiFormRow>
+          </EuiDescribedFormGroup>
+          <EuiDescribedFormGroup
+            idAria="hostNameField"
+            title={
+              <h4>
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.hostNameFieldLabel"
+                  defaultMessage="Host name"
+                />
+              </h4>
             }
-            isInvalid={hostFieldProps.isInvalid}
-            label={
+            description={
               <FormattedMessage
-                id="xpack.infra.sourceConfiguration.hostFieldLabel"
-                defaultMessage="Host name"
+                id="xpack.infra.sourceConfiguration.hostNameFieldDescription"
+                defaultMessage="Field used to identify hosts"
               />
             }
           >
-            <EuiFieldText
+            <EuiFormRow
+              describedByIds={['hostNameField']}
+              error={hostFieldProps.error}
               fullWidth
-              disabled={isLoading}
-              readOnly={readOnly}
-              isLoading={isLoading}
-              {...hostFieldProps}
-            />
-          </EuiFormRow>
-        </EuiDescribedFormGroup>
-        <EuiDescribedFormGroup
-          idAria="podField"
-          title={
-            <h4>
-              <FormattedMessage
-                id="xpack.infra.sourceConfiguration.podFieldLabel"
-                defaultMessage="Pod ID"
-              />
-            </h4>
-          }
-          description={
-            <FormattedMessage
-              id="xpack.infra.sourceConfiguration.podFieldDescription"
-              defaultMessage="Field used to identify Kubernetes pods"
-            />
-          }
-        >
-          <EuiFormRow
-            describedByIds={['podField']}
-            error={podFieldProps.error}
-            fullWidth
-            helpText={
-              <FormattedMessage
-                id="xpack.infra.sourceConfiguration.podFieldRecommendedValue"
-                defaultMessage="The recommended value is {defaultValue}"
-                values={{
-                  defaultValue: <EuiCode>kubernetes.pod.uid</EuiCode>,
-                }}
+              helpText={
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.hostFieldDescription"
+                  defaultMessage="The recommended value is {defaultValue}"
+                  values={{
+                    defaultValue: <EuiCode>host.name</EuiCode>,
+                  }}
+                />
+              }
+              isInvalid={hostFieldProps.isInvalid}
+              label={
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.hostFieldLabel"
+                  defaultMessage="Host name"
+                />
+              }
+            >
+              <EuiFieldText
+                fullWidth
+                disabled={isLoading || isHostValueDefault}
+                readOnly={readOnly}
+                isLoading={isLoading}
+                {...hostFieldProps}
               />
+            </EuiFormRow>
+          </EuiDescribedFormGroup>
+          <EuiDescribedFormGroup
+            idAria="podField"
+            title={
+              <h4>
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.podFieldLabel"
+                  defaultMessage="Pod ID"
+                />
+              </h4>
             }
-            isInvalid={podFieldProps.isInvalid}
-            label={
+            description={
               <FormattedMessage
-                id="xpack.infra.sourceConfiguration.podFieldLabel"
-                defaultMessage="Pod ID"
+                id="xpack.infra.sourceConfiguration.podFieldDescription"
+                defaultMessage="Field used to identify Kubernetes pods"
               />
             }
           >
-            <EuiFieldText
+            <EuiFormRow
+              describedByIds={['podField']}
+              error={podFieldProps.error}
               fullWidth
-              disabled={isLoading}
-              readOnly={readOnly}
-              isLoading={isLoading}
-              {...podFieldProps}
-            />
-          </EuiFormRow>
-        </EuiDescribedFormGroup>
-      </>
-    )}
-  </EuiForm>
-);
+              helpText={
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.podFieldRecommendedValue"
+                  defaultMessage="The recommended value is {defaultValue}"
+                  values={{
+                    defaultValue: <EuiCode>kubernetes.pod.uid</EuiCode>,
+                  }}
+                />
+              }
+              isInvalid={podFieldProps.isInvalid}
+              label={
+                <FormattedMessage
+                  id="xpack.infra.sourceConfiguration.podFieldLabel"
+                  defaultMessage="Pod ID"
+                />
+              }
+            >
+              <EuiFieldText
+                fullWidth
+                disabled={isLoading || isPodValueDefault}
+                readOnly={readOnly}
+                isLoading={isLoading}
+                {...podFieldProps}
+              />
+            </EuiFormRow>
+          </EuiDescribedFormGroup>
+        </>
+      )}
+    </EuiForm>
+  );
+};

From 719ff259fcfc21e0b13d908227cd016157aeb19b Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 9 Jan 2020 13:03:16 -0500
Subject: [PATCH 89/96] Add support for certificates in PKCS#12 (P12) key
 stores (#53810)

Kibana now supports the usage of PKCS#12 (P12) key stores and trust stores for certificates and keys.
---
 ...ana-plugin-server.kibanaresponsefactory.md |   8 +-
 docs/settings/security-settings.asciidoc      |   2 +-
 docs/setup/settings.asciidoc                  | 121 ++++--
 .../monitoring/monitoring-kibana.asciidoc     |  12 +-
 .../security/authentication/index.asciidoc    |   3 +
 .../securing-communications/index.asciidoc    | 132 +++----
 package.json                                  |   2 +
 packages/kbn-dev-utils/certs/README.md        |  62 +++
 packages/kbn-dev-utils/certs/ca.crt           |  45 ++-
 .../kbn-dev-utils/certs/elasticsearch.crt     |  43 ++-
 .../kbn-dev-utils/certs/elasticsearch.key     |  50 +--
 .../kbn-dev-utils/certs/elasticsearch.p12     | Bin 0 -> 3501 bytes
 .../certs/elasticsearch_emptypassword.p12     | Bin 0 -> 3333 bytes
 .../certs/elasticsearch_nopassword.p12        | Bin 0 -> 3543 bytes
 packages/kbn-dev-utils/certs/kibana.crt       |  29 ++
 packages/kbn-dev-utils/certs/kibana.key       |  27 ++
 packages/kbn-dev-utils/certs/kibana.p12       | Bin 0 -> 3463 bytes
 packages/kbn-dev-utils/src/certs.ts           |  11 +
 packages/kbn-dev-utils/src/index.ts           |  14 +-
 packages/kbn-es/src/cluster.js                |   8 +-
 .../integration_tests/__fixtures__/es_bin.js  |   2 +
 .../src/integration_tests/cluster.test.js     |  14 +-
 packages/kbn-pm/dist/index.js                 |  16 +
 renovate.json5                                |   8 +
 src/cli/serve/serve.js                        |   4 +
 .../deprecation/core_deprecations.test.ts     |  31 ++
 .../config/deprecation/core_deprecations.ts   |  11 +
 .../elasticsearch_client_config.test.ts       |  21 +-
 .../elasticsearch_client_config.ts            |  13 +-
 .../elasticsearch_config.test.mocks.ts        |  28 ++
 .../elasticsearch_config.test.ts              | 257 +++++++++++--
 .../elasticsearch/elasticsearch_config.ts     | 143 +++++--
 .../elasticsearch_service.test.ts             |   4 +
 .../__snapshots__/http_config.test.ts.snap    |  20 +-
 src/core/server/http/http_config.test.ts      | 215 +----------
 src/core/server/http/http_server.test.ts      |  19 +-
 src/core/server/http/http_tools.ts            |   9 +-
 src/core/server/http/ssl_config.test.mocks.ts |  30 ++
 src/core/server/http/ssl_config.test.ts       | 363 ++++++++++++++++++
 src/core/server/http/ssl_config.ts            |  77 +++-
 src/core/server/server.api.md                 |   8 +-
 src/core/utils/crypto/__fixtures__/README.md  |  44 +++
 src/core/utils/crypto/__fixtures__/index.ts   |  26 ++
 src/core/utils/crypto/__fixtures__/no_ca.p12  | Bin 0 -> 2431 bytes
 .../utils/crypto/__fixtures__/no_cert.p12     | Bin 0 -> 2217 bytes
 src/core/utils/crypto/__fixtures__/no_key.p12 | Bin 0 -> 1939 bytes
 .../utils/crypto/__fixtures__/two_cas.p12     | Bin 0 -> 4215 bytes
 .../utils/crypto/__fixtures__/two_keys.p12    | Bin 0 -> 4781 bytes
 .../crypto/index.ts}                          |   3 +-
 src/core/utils/crypto/pkcs12.test.ts          | 205 ++++++++++
 src/core/utils/crypto/pkcs12.ts               | 179 +++++++++
 src/core/utils/index.ts                       |   1 +
 .../resources/bin/kibana-docker               |   8 +
 .../__tests__/elasticsearch_proxy_config.js   |  39 +-
 .../console/server/__tests__/fixtures/ca.crt  |   1 -
 .../server/__tests__/fixtures/cert.crt        |   1 -
 .../server/__tests__/fixtures/cert.key        |   1 -
 .../console/server/__tests__/proxy_config.js  |  33 +-
 .../server/elasticsearch_proxy_config.ts      |  23 +-
 .../console/server/proxy_config.js            |   7 +-
 .../server_integration/__fixtures__/README.md |  79 ++++
 test/server_integration/__fixtures__/index.ts |  25 ++
 .../__fixtures__/localhost.p12                | Bin 0 -> 4184 bytes
 .../__fixtures__/test_intermediate_ca.crt     |  79 ++++
 .../__fixtures__/test_root_ca.crt             |  24 ++
 test/server_integration/config.js             |   4 +-
 test/server_integration/http/ssl/config.js    |  15 +-
 .../http/ssl_redirect/config.js               |  15 +-
 .../http/ssl_with_p12/config.js               |  56 +++
 .../http/ssl_with_p12/index.js                |  28 ++
 .../http/ssl_with_p12_intermediate/config.js  |  56 +++
 .../http/ssl_with_p12_intermediate/index.js   |  28 ++
 test/server_integration/services/index.js     |   2 +-
 test/server_integration/services/supertest.js |  22 +-
 x-pack/legacy/plugins/security/README.md      |   6 +-
 x-pack/test/pki_api_integration/config.ts     |   6 +-
 .../pki_api_integration/fixtures/README.md    |  17 +-
 .../pki_api_integration/fixtures/es_ca.key    |  27 --
 .../fixtures/first_client.p12                 | Bin 3467 -> 3467 bytes
 .../fixtures/second_client.p12                | Bin 3469 -> 3477 bytes
 .../fixtures/idp_metadata.xml                 |  38 +-
 .../fixtures/saml_tools.ts                    |   3 +-
 yarn.lock                                     |  12 +
 83 files changed, 2308 insertions(+), 667 deletions(-)
 create mode 100644 packages/kbn-dev-utils/certs/README.md
 mode change 100755 => 100644 packages/kbn-dev-utils/certs/ca.crt
 mode change 100755 => 100644 packages/kbn-dev-utils/certs/elasticsearch.crt
 mode change 100755 => 100644 packages/kbn-dev-utils/certs/elasticsearch.key
 create mode 100644 packages/kbn-dev-utils/certs/elasticsearch.p12
 create mode 100644 packages/kbn-dev-utils/certs/elasticsearch_emptypassword.p12
 create mode 100644 packages/kbn-dev-utils/certs/elasticsearch_nopassword.p12
 create mode 100644 packages/kbn-dev-utils/certs/kibana.crt
 create mode 100644 packages/kbn-dev-utils/certs/kibana.key
 create mode 100644 packages/kbn-dev-utils/certs/kibana.p12
 create mode 100644 src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
 create mode 100644 src/core/server/http/ssl_config.test.mocks.ts
 create mode 100644 src/core/server/http/ssl_config.test.ts
 create mode 100644 src/core/utils/crypto/__fixtures__/README.md
 create mode 100644 src/core/utils/crypto/__fixtures__/index.ts
 create mode 100644 src/core/utils/crypto/__fixtures__/no_ca.p12
 create mode 100644 src/core/utils/crypto/__fixtures__/no_cert.p12
 create mode 100644 src/core/utils/crypto/__fixtures__/no_key.p12
 create mode 100644 src/core/utils/crypto/__fixtures__/two_cas.p12
 create mode 100644 src/core/utils/crypto/__fixtures__/two_keys.p12
 rename src/core/{server/elasticsearch/elasticsearch_client_config.test.mocks.ts => utils/crypto/index.ts} (88%)
 create mode 100644 src/core/utils/crypto/pkcs12.test.ts
 create mode 100644 src/core/utils/crypto/pkcs12.ts
 delete mode 100644 src/legacy/core_plugins/console/server/__tests__/fixtures/ca.crt
 delete mode 100644 src/legacy/core_plugins/console/server/__tests__/fixtures/cert.crt
 delete mode 100644 src/legacy/core_plugins/console/server/__tests__/fixtures/cert.key
 create mode 100644 test/server_integration/__fixtures__/README.md
 create mode 100644 test/server_integration/__fixtures__/index.ts
 create mode 100644 test/server_integration/__fixtures__/localhost.p12
 create mode 100644 test/server_integration/__fixtures__/test_intermediate_ca.crt
 create mode 100644 test/server_integration/__fixtures__/test_root_ca.crt
 create mode 100644 test/server_integration/http/ssl_with_p12/config.js
 create mode 100644 test/server_integration/http/ssl_with_p12/index.js
 create mode 100644 test/server_integration/http/ssl_with_p12_intermediate/config.js
 create mode 100644 test/server_integration/http/ssl_with_p12_intermediate/index.js
 delete mode 100644 x-pack/test/pki_api_integration/fixtures/es_ca.key

diff --git a/docs/development/core/server/kibana-plugin-server.kibanaresponsefactory.md b/docs/development/core/server/kibana-plugin-server.kibanaresponsefactory.md
index 85874f5ec16bae..2e496aa0c46fc7 100644
--- a/docs/development/core/server/kibana-plugin-server.kibanaresponsefactory.md
+++ b/docs/development/core/server/kibana-plugin-server.kibanaresponsefactory.md
@@ -10,7 +10,7 @@ Set of helpers used to create `KibanaResponse` to form HTTP response on an incom
 
 ```typescript
 kibanaResponseFactory: {
-    custom: <T extends string | Error | Record<string, any> | Buffer | Stream | {
+    custom: <T extends string | Error | Buffer | Stream | Record<string, any> | {
         message: string | Error;
         attributes?: Record<string, any> | undefined;
     } | undefined>(options: CustomHttpResponseOptions<T>) => KibanaResponse<T>;
@@ -21,9 +21,9 @@ kibanaResponseFactory: {
     conflict: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
     internalError: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
     customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<ResponseError>;
-    redirected: (options: RedirectResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
-    ok: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
-    accepted: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
+    redirected: (options: RedirectResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
+    ok: (options?: HttpResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
+    accepted: (options?: HttpResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
     noContent: (options?: HttpResponseOptions) => KibanaResponse<undefined>;
 }
 ```
diff --git a/docs/settings/security-settings.asciidoc b/docs/settings/security-settings.asciidoc
index d6dd4378da1b7c..16d68a7759f776 100644
--- a/docs/settings/security-settings.asciidoc
+++ b/docs/settings/security-settings.asciidoc
@@ -45,7 +45,7 @@ if this setting isn't the same for all instances of {kib}.
 
 `xpack.security.secureCookies`::
 Sets the `secure` flag of the session cookie. The default value is `false`. It
-is set to `true` if `server.ssl.certificate` and `server.ssl.key` are set. Set
+is automatically set to `true` if `server.ssl.enabled` is set to `true`. Set
 this to `true` if SSL is configured outside of {kib} (for example, you are
 routing requests through a load balancer or proxy).
 
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index c98df6ca78356b..535ad169782170 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -82,31 +82,52 @@ Elasticsearch nodes on startup.
 `elasticsearch.sniffOnConnectionFault:`:: *Default: false* Update the list of
 Elasticsearch nodes immediately following a connection fault.
 
-`elasticsearch.ssl.alwaysPresentCertificate:`:: *Default: false* Controls
-whether to always present the certificate specified by
-`elasticsearch.ssl.certificate` when requested. This applies to all requests to
-Elasticsearch, including requests that are proxied for end-users. Setting this
-to `true` when Elasticsearch is using certificates to authenticate users can
-lead to proxied requests for end-users being executed as the identity tied to
-the configured certificate.
-
-`elasticsearch.ssl.certificate:` and `elasticsearch.ssl.key:`:: Optional
-settings that provide the paths to the PEM-format SSL certificate and key files.
-These files are used to verify the identity of Kibana to Elasticsearch and are
-required when `xpack.security.http.ssl.client_authentication` in Elasticsearch is
-set to `required`.
-
-`elasticsearch.ssl.certificateAuthorities:`:: Optional setting that enables you
-to specify a list of paths to the PEM file for the certificate authority for
-your Elasticsearch instance.
-
-`elasticsearch.ssl.keyPassphrase:`:: The passphrase that will be used to decrypt
-the private key. This value is optional as the key may not be encrypted.
-
-`elasticsearch.ssl.verificationMode:`:: *Default: full* Controls the
-verification of certificates presented by Elasticsearch. Valid values are `none`,
-`certificate`, and `full`. `full` performs hostname verification, and
-`certificate` does not.
+`elasticsearch.ssl.alwaysPresentCertificate:`:: *Default: false* Controls whether to always present the certificate specified by
+`elasticsearch.ssl.certificate` or `elasticsearch.ssl.keystore.path` when requested. This setting applies to all requests to Elasticsearch,
+including requests that are proxied for end users. Setting this to `true` when Elasticsearch is using certificates to authenticate users can
+lead to proxied requests for end users being executed as the identity tied to the configured certificate.
+
+`elasticsearch.ssl.certificate:` and `elasticsearch.ssl.key:`:: Paths to a PEM-encoded X.509 certificate and its private key, respectively.
+When `xpack.security.http.ssl.client_authentication` in Elasticsearch is set to `required` or `optional`, the certificate and key are used
+to prove Kibana's identity when it makes an outbound request to your Elasticsearch cluster.
++
+--
+NOTE: These settings cannot be used in conjunction with `elasticsearch.ssl.keystore.path`.
+--
+
+`elasticsearch.ssl.certificateAuthorities:`:: Paths to one or more PEM-encoded X.509 certificates. These certificates may consist of a root
+certificate authority (CA), and one or more intermediate CAs, which make up a trusted certificate chain for Kibana. This chain is used to
+establish trust when Kibana creates an SSL connection with your Elasticsearch cluster. In addition to this setting, trusted certificates may
+be specified via `elasticsearch.ssl.keystore.path` and/or `elasticsearch.ssl.truststore.path`.
+
+`elasticsearch.ssl.keyPassphrase:`:: The passphrase that will be used to decrypt the private key that is specified via
+`elasticsearch.ssl.key`. This value is optional, as the key may not be encrypted.
+
+`elasticsearch.ssl.keystore.path:`:: Path to a PKCS #12 file that contains an X.509 certificate with its private key. When
+`xpack.security.http.ssl.client_authentication` in Elasticsearch is set to `required` or `optional`, the certificate and key are used to
+prove Kibana's identity when it makes an outbound request to your Elasticsearch cluster. If the file contains any additional certificates,
+those will be used as a trusted certificate chain for your Elasticsearch cluster. This chain is used to establish trust when Kibana creates
+an SSL connection with your Elasticsearch cluster. In addition to this setting, trusted certificates may be specified via
+`elasticsearch.ssl.certificateAuthorities` and/or `elasticsearch.ssl.truststore.path`.
++
+--
+NOTE: This setting cannot be used in conjunction with `elasticsearch.ssl.certificate` or `elasticsearch.ssl.key`.
+--
+
+`elasticsearch.ssl.keystore.password:`:: The password that will be used to decrypt the key store and its private key. If your key store has
+no password, leave this unset. If your key store has an empty password, set this to `""`.
+
+`elasticsearch.ssl.truststore.path:`:: Path to a PKCS #12 trust store that contains one or more X.509 certificates. This may consist of a
+root certificate authority (CA) and one or more intermediate CAs, which make up a trusted certificate chain for your Elasticsearch cluster.
+This chain is used to establish trust when Kibana creates an SSL connection with your Elasticsearch cluster. In addition to this setting,
+trusted certificates may be specified via `elasticsearch.ssl.certificateAuthorities` and/or `elasticsearch.ssl.keystore.path`.
+
+`elasticsearch.ssl.truststore.password:`:: The password that will be used to decrypt the trust store. If your trust store has no password,
+leave this unset. If your trust store has an empty password, set this to `""`.
+
+`elasticsearch.ssl.verificationMode:`:: *Default: full* Controls the verification of certificates presented by Elasticsearch. Valid values
+are `none`, `certificate`, and `full`. `full` performs hostname verification and `certificate` does not. This setting is used only when
+traffic to Elasticsearch is encrypted, which is specified by using the HTTPS protocol in `elasticsearch.hosts`.
 
 `elasticsearch.startupTimeout:`:: *Default: 5000* Time in milliseconds to wait
 for Elasticsearch at Kibana startup before retrying.
@@ -325,11 +346,19 @@ default is `true`.
 `server.socketTimeout:`:: *Default: "120000"* The number of milliseconds to wait before closing an
 inactive socket.
 
-`server.ssl.certificate:` and `server.ssl.key:`:: Paths to the PEM-format SSL
-certificate and SSL key files, respectively.
+`server.ssl.certificate:` and `server.ssl.key:`:: Paths to a PEM-encoded X.509 certificate and its private key, respectively. These are used
+when enabling SSL for inbound requests from web browsers to the Kibana server.
++
+--
+NOTE: These settings cannot be used in conjunction with `server.ssl.keystore.path`.
+--
 
-`server.ssl.certificateAuthorities:`:: List of paths to PEM encoded certificate
-files that should be trusted.
+`server.ssl.certificateAuthorities:`:: Paths to one or more PEM-encoded X.509 certificates. These certificates may consist of a root
+certificate authority (CA) and one or more intermediate CAs, which make up a trusted certificate chain for Kibana. This chain is used when a
+web browser creates an SSL connection with the Kibana server; the certificate chain is sent to the browser along with the end-entity
+certificate to establish trust. This chain is also used to determine whether client certificates should be trusted when PKI authentication
+is enabled. In addition to this setting, trusted certificates may be specified via `server.ssl.keystore.path` and/or
+`server.ssl.truststore.path`.
 
 `server.ssl.cipherSuites:`:: *Default: ECDHE-RSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-RSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-GCM-SHA384, DHE-RSA-AES128-GCM-SHA256, ECDHE-RSA-AES128-SHA256, DHE-RSA-AES128-SHA256, ECDHE-RSA-AES256-SHA384, DHE-RSA-AES256-SHA384, ECDHE-RSA-AES256-SHA256, DHE-RSA-AES256-SHA256, HIGH,!aNULL, !eNULL, !EXPORT, !DES, !RC4, !MD5, !PSK, !SRP, !CAMELLIA*.
 Details on the format, and the valid options, are available via the
@@ -339,12 +368,36 @@ https://www.openssl.org/docs/man1.0.2/apps/ciphers.html#CIPHER-LIST-FORMAT[OpenS
 connections. Valid values are `required`, `optional`, and `none`. `required` forces a client to present a certificate, while `optional`
 requests a client certificate but the client is not required to present one.
 
-`server.ssl.enabled:`:: *Default: "false"* Enables SSL for outgoing requests
-from the Kibana server to the browser. When set to `true`,
-`server.ssl.certificate` and `server.ssl.key` are required.
+`server.ssl.enabled:`:: *Default: "false"* Enables SSL for inbound requests from the browser to the Kibana server. When set to `true`, a
+certificate and private key must be provided. These can be specified via `server.ssl.keystore.path` or the combination of
+`server.ssl.certificate` and `server.ssl.key`.
+
+`server.ssl.keyPassphrase:`:: The passphrase that will be used to decrypt the private key that is specified via `server.ssl.key`. This value
+is optional, as the key may not be encrypted.
+
+`server.ssl.keystore.path:`:: Path to a PKCS #12 file that contains an X.509 certificate with its private key. These are used when enabling
+SSL for inbound requests from web browsers to the Kibana server. If the file contains any additional certificates, those will be used as a
+trusted certificate chain for Kibana. This chain is used when a web browser creates an SSL connection with the Kibana server; the
+certificate chain is sent to the browser along with the end-entity certificate to establish trust. This chain is also used to determine
+whether client certificates should be trusted when PKI authentication is enabled. In addition to this setting, trusted certificates may be
+specified via `server.ssl.certificateAuthorities` and/or `server.ssl.truststore.path`.
++
+--
+NOTE: This setting cannot be used in conjunction with `server.ssl.certificate` or `server.ssl.key`.
+--
+
+`server.ssl.keystore.password:`:: The password that will be used to decrypt the key store and its private key. If your key store has no
+password, leave this unset. If your key store has an empty password, set this to `""`.
+
+`server.ssl.truststore.path:`:: Path to a PKCS #12 trust store that contains one or more X.509 certificates. These certificates may consist
+of a root certificate authority (CA) and one or more intermediate CAs, which make up a trusted certificate chain for Kibana. This chain is
+used when a web browser creates an SSL connection with the Kibana server; the certificate chain is sent to the browser along with the
+end-entity certificate to establish trust. This chain is also used to determine whether client certificates should be trusted when PKI
+authentication is enabled. In addition to this setting, trusted certificates may be specified via `server.ssl.certificateAuthorities` and/or
+`server.ssl.keystore.path`.
 
-`server.ssl.keyPassphrase:`:: The passphrase that will be used to decrypt the
-private key. This value is optional as the key may not be encrypted.
+`server.ssl.truststore.password:`:: The password that will be used to decrypt the trust store. If your trust store has no password, leave
+this unset. If your trust store has an empty password, set this to `""`.
 
 `server.ssl.redirectHttpFromPort:`:: Kibana will bind to this port and redirect
 all http requests to https over the port configured as `server.port`.
diff --git a/docs/user/monitoring/monitoring-kibana.asciidoc b/docs/user/monitoring/monitoring-kibana.asciidoc
index d7af0d5c420a14..b5d263aed8346a 100644
--- a/docs/user/monitoring/monitoring-kibana.asciidoc
+++ b/docs/user/monitoring/monitoring-kibana.asciidoc
@@ -96,7 +96,8 @@ used when {kib} sends monitoring data to the production cluster.
 .. Configure {kib} to encrypt communications between the {kib} server and the
 production cluster. This set up involves generating a server certificate and
 setting `server.ssl.*` and `elasticsearch.ssl.certificateAuthorities` settings
-in the `kibana.yml` file on the {kib} server. For example:
+in the `kibana.yml` file on the {kib} server. For example, using a PEM-formatted
+certificate and private key:
 +
 --
 [source,yaml]
@@ -105,14 +106,19 @@ server.ssl.key: /path/to/your/server.key
 server.ssl.certificate: /path/to/your/server.crt
 --------------------------------------------------------------------------------
 
-If you are using your own certificate authority to sign certificates, specify
-the location of the PEM file in the `kibana.yml` file:
+If you are using your own certificate authority (CA) to sign certificates,
+specify the location of the PEM file in the `kibana.yml` file:
 
 [source,yaml]
 --------------------------------------------------------------------------------
 elasticsearch.ssl.certificateAuthorities: /path/to/your/cacert.pem
 --------------------------------------------------------------------------------
 
+NOTE: Alternatively, the PKCS #12 format can be used for the Kibana certificate
+and key, along with any included CA certificates, by setting
+`server.ssl.keystore.path`. If your CA certificate chain is in a separate trust
+store, you can also use `server.ssl.truststore.path`.
+
 For more information, see <<using-kibana-with-security>>.
 --
 
diff --git a/docs/user/security/authentication/index.asciidoc b/docs/user/security/authentication/index.asciidoc
index 2e2aaf688e8b68..05aabfc343be94 100644
--- a/docs/user/security/authentication/index.asciidoc
+++ b/docs/user/security/authentication/index.asciidoc
@@ -67,6 +67,9 @@ server.ssl.clientAuthentication: required
 xpack.security.authc.providers: [pki]
 --------------------------------------------------------------------------------
 
+NOTE: Trusted CAs can also be specified in a PKCS #12 keystore bundled with your Kibana server certificate/key using
+`server.ssl.keystore.path` or in a separate trust store using `server.ssl.truststore.path`.
+
 PKI support in {kib} is designed to be the primary (or sole) authentication method for users of that {kib} instance. However, you can configure both PKI and Basic authentication for the same {kib} instance:
 
 [source,yaml]
diff --git a/docs/user/security/securing-communications/index.asciidoc b/docs/user/security/securing-communications/index.asciidoc
index 6917a48909c7b0..b370c35905bce4 100644
--- a/docs/user/security/securing-communications/index.asciidoc
+++ b/docs/user/security/securing-communications/index.asciidoc
@@ -4,121 +4,115 @@
 <titleabbrev>Encrypting communications</titleabbrev>
 ++++
 
-{kib} supports Transport Layer Security (TLS/SSL) encryption for client 
-requests. 
-//TBD: It is unclear what "client requests" are in this context. Is it just 
-// communication between the browser and the Kibana server or are we talking 
-// about other types of clients connecting to the Kibana server?
-
-If you are using {security} or a proxy that provides an HTTPS endpoint for {es}, 
-you can configure {kib} to access {es} via HTTPS. Thus, communications between 
-{kib} and {es} are also encrypted. 
-
-. Configure {kib} to encrypt communications between the browser and the {kib}
-server:
+{kib} supports Transport Layer Security (TLS/SSL) encryption for all forms of data-in-transit. Browsers send traffic to {kib} and {kib}
+sends traffic to {es}. These communications are configured separately.
+
+[[configuring-tls-browser-kib]]
+==== Encrypting traffic between the browser and {kib}
+
+NOTE: You do not need to enable {security-features} for this type of encryption. 
+
+. Obtain a server certificate and private key for {kib}.
 +
 --
-NOTE: You do not need to enable {security} for this type of encryption. 
+{kib} supports certificates/keys in both PKCS #12 key stores and PEM format.
+
+When you obtain a certificate, you must do at least one of the following:
+
+.. Set the certificate's `subjectAltName` to the hostname, fully-qualified domain name (FQDN), or IP address of the {kib} server.
+
+.. Set the certificate's Common Name (CN) to the {kib} server's hostname or FQDN. Using the server's IP address as the CN does not work.
+
+You may choose to generate a certificate and private key using {ref}/certutil.html[the {es} certutil tool]. If you already used certutil to
+generate a certificate authority (CA), you would generate a certificate/key for Kibana like so (using the `--dns` param to set the
+`subjectAltName`):
+
+[source,sh]
+--------------------------------------------------------------------------------
+bin/elasticsearch-certutil cert --ca elastic-stack-ca.p12 --name kibana --dns localhost
+--------------------------------------------------------------------------------
+
+This will generate a certificate and private key in a PKCS #12 keystore named `kibana.p12`.
 
 --
 
-.. Generate a server certificate for {kib}. 
+. Enable TLS/SSL in `kibana.yml`:
 +
 --
-//TBD: Can we provide more information about how they generate the certificate? 
-//Would they be able to use something like the elasticsearch-certutil command?
-You must either set the certificate's
-`subjectAltName` to the hostname, fully-qualified domain name (FQDN), or IP
-address of the {kib} server, or set the CN to the {kib} server's hostname
-or FQDN. Using the server's IP address as the CN does not work.
+[source,yaml]
+--------------------------------------------------------------------------------
+server.ssl.enabled: true
+--------------------------------------------------------------------------------
 --
 
-.. Set the `server.ssl.enabled`, `server.ssl.key`, and `server.ssl.certificate` 
-properties in `kibana.yml`:
+. Specify your server certificate and private key in `kibana.yml`:
 +
 --
+If your certificate and private key are in a PKCS #12 keystore, specify it like so:
+
 [source,yaml]
 --------------------------------------------------------------------------------
-server.ssl.enabled: true
-server.ssl.key: /path/to/your/server.key
-server.ssl.certificate: /path/to/your/server.crt
+server.ssl.keystore.path: "/path/to/your/keystore.p12"
+server.ssl.keystore.password: "optional decryption password"
+--------------------------------------------------------------------------------
+
+Otherwise, if your certificate/key are in PEM format, specify them like so:
+
+[source,yaml]
+--------------------------------------------------------------------------------
+server.ssl.certificate: "/path/to/your/server.crt"
+server.ssl.key: "/path/to/your/server.key"
+server.ssl.keyPassphrase: "optional decryption password"
 --------------------------------------------------------------------------------
 
 After making these changes, you must always access {kib} via HTTPS. For example, 
 https://localhost:5601.
 
-// TBD: The reference information for server.ssl.enabled says it "enables SSL for 
-// outgoing requests from the Kibana server to the browser". Do we need to 
-// reiterate here that only one side of the communications is encrypted?
-
 For more information, see <<settings,{kib} configuration settings>>.
 --
 
-. Configure {kib} to connect to {es} via HTTPS:
-+
---
+[[configuring-tls-kib-es]]
+==== Encrypting traffic between {kib} and {es}
+
 NOTE: To perform this step, you must 
 {ref}/configuring-security.html[enable the {es} {security-features}] or you 
 must have a proxy that provides an HTTPS endpoint for {es}. 
 
---
-
-.. Specify the HTTPS protocol in the `elasticsearch.hosts` setting in the {kib}
-configuration file, `kibana.yml`:
+. Specify the HTTPS URL in the `elasticsearch.hosts` setting in the {kib} configuration file, `kibana.yml`:
 +
 --
 [source,yaml]
 --------------------------------------------------------------------------------
 elasticsearch.hosts: ["https://<your_elasticsearch_host>.com:9200"]
 --------------------------------------------------------------------------------
---
-
-.. If you are using your own CA to sign certificates for {es}, set the
-`elasticsearch.ssl.certificateAuthorities` setting in `kibana.yml` to specify
-the location of the PEM file.
-+
---
-[source,yaml]
---------------------------------------------------------------------------------
-elasticsearch.ssl.certificateAuthorities: /path/to/your/cacert.pem
---------------------------------------------------------------------------------
 
-Setting the `certificateAuthorities` property lets you use the default 
-`verificationMode` option of `full`. 
-//TBD: Is this still true? It isn't mentioned in https://www.elastic.co/guide/en/kibana/master/settings.html
+Using the HTTPS protocol results in a default `elasticsearch.ssl.verificationMode` option of `full`, which utilizes hostname verification.
 
 For more information, see <<settings,{kib} configuration settings>>. 
 --
 
-. (Optional) If the Elastic {monitor-features} are enabled, configure {kib} to 
-connect to the {es} monitoring cluster via HTTPS: 
+. Specify the {es} cluster's CA certificate chain in `kibana.yml`:
 +
 --
-NOTE: To perform this step, you must 
-{ref}/configuring-security.html[enable the {es} {security-features}] or you 
-must have a proxy that provides an HTTPS endpoint for {es}. 
 
---
+If you are using your own CA to sign certificates for {es}, then you need to specify the CA certificate chain in {kib} to properly establish
+trust in TLS connections. If your CA certificate chain is contained in a PKCS #12 trust store, specify it like so:
 
-.. Specify the HTTPS URL in the `xpack.monitoring.elasticsearch.hosts` setting in 
-the {kib} configuration file, `kibana.yml`
-+
---
 [source,yaml]
 --------------------------------------------------------------------------------
-xpack.monitoring.elasticsearch.hosts: ["https://<your_monitoring_cluster>:9200"]
+elasticsearch.ssl.truststore.path: "/path/to/your/truststore.p12"
+elasticsearch.ssl.truststore.password: "optional decryption password"
 --------------------------------------------------------------------------------
---
 
-.. Specify the `xpack.monitoring.elasticsearch.ssl.*` settings in the 
-`kibana.yml` file.
-+
---
-For example, if you are using your own certificate authority to sign
-certificates, specify the location of the PEM file in the `kibana.yml` file:
+Otherwise, if your CA certificate chain is in PEM format, specify each certificate like so:
 
 [source,yaml]
 --------------------------------------------------------------------------------
-xpack.monitoring.elasticsearch.ssl.certificateAuthorities: /path/to/your/cacert.pem
+elasticsearch.ssl.certificateAuthorities: ["/path/to/your/cacert1.pem", "/path/to/your/cacert2.pem"]
 --------------------------------------------------------------------------------
+
 --
+
+. (Optional) If the Elastic {monitor-features} are enabled, configure {kib} to connect to the {es} monitoring cluster via HTTPS. The steps
+are the same as above, but each setting is prefixed by `xpack.monitoring.`. For example, `xpack.monitoring.elasticsearch.hosts`,
+`xpack.monitoring.elasticsearch.ssl.truststore.path`, etc.
diff --git a/package.json b/package.json
index 0dbed9e432e991..be7c95c14934b7 100644
--- a/package.json
+++ b/package.json
@@ -135,6 +135,7 @@
     "@kbn/ui-framework": "1.0.0",
     "@types/json-stable-stringify": "^1.0.32",
     "@types/lodash.clonedeep": "^4.5.4",
+    "@types/node-forge": "^0.9.0",
     "@types/react-grid-layout": "^0.16.7",
     "@types/recompose": "^0.30.5",
     "JSONStream": "1.3.5",
@@ -217,6 +218,7 @@
     "mustache": "2.3.2",
     "ngreact": "0.5.1",
     "node-fetch": "1.7.3",
+    "node-forge": "^0.9.1",
     "opn": "^5.5.0",
     "oppsy": "^2.0.0",
     "pegjs": "0.10.0",
diff --git a/packages/kbn-dev-utils/certs/README.md b/packages/kbn-dev-utils/certs/README.md
new file mode 100644
index 00000000000000..fdf78927894044
--- /dev/null
+++ b/packages/kbn-dev-utils/certs/README.md
@@ -0,0 +1,62 @@
+# Development certificates
+
+Kibana includes several development certificates to enable easy setup of TLS-encrypted communications with Elasticsearch.
+
+_Note: these certificates should **never** be used in production._
+
+## Certificate information
+
+Certificates and keys are provided in multiple formats. These can be used by other packages to set up a new Elastic Stack with Kibana and Elasticsearch. The Certificate Authority (CA) private key is intentionally omitted from this package.
+
+### PEM 
+
+* `ca.crt` -- A [PEM-formatted](https://tools.ietf.org/html/rfc1421) [X.509](https://tools.ietf.org/html/rfc5280) certificate that is used as a CA.
+* `elasticsearch.crt` -- A PEM-formatted X.509 certificate and public key for Elasticsearch.
+* `elasticsearch.key` -- A PEM-formatted [PKCS #1](https://tools.ietf.org/html/rfc8017) private key for Elasticsearch.
+* `kibana.crt` -- A PEM-formatted X.509 certificate and public key for Kibana.
+* `kibana.key` -- A PEM-formatted PKCS #1 private key for Kibana.
+
+### PKCS #12
+
+* `elasticsearch.p12` -- A [PKCS #12](https://tools.ietf.org/html/rfc7292) encrypted key store / trust store that contains `ca.crt`, `elasticsearch.crt`, and a [PKCS #8](https://tools.ietf.org/html/rfc5208) encrypted version of `elasticsearch.key`.
+* `kibana.p12` -- A PKCS #12 encrypted key store / trust store that contains `ca.crt`, `kibana.crt`, and a PKCS #8 encrypted version of `kibana.key`.
+
+The password used for both of these is "storepass". Other copies are also provided for testing purposes:
+
+* `elasticsearch_emptypassword.p12` -- The same PKCS #12 key store, encrypted with an empty password.
+* `elasticsearch_nopassword.p12` -- The same PKCS #12 key store, not encrypted with a password.
+
+## Certificate generation
+
+[Elasticsearch cert-util](https://www.elastic.co/guide/en/elasticsearch/reference/current/certutil.html) and [OpenSSL](https://www.openssl.org/) were used to generate these certificates. The following commands were used from the root directory of Elasticsearch:
+
+```
+# Generate the PKCS #12 keystore for a CA, valid for 50 years
+bin/elasticsearch-certutil ca -days 18250 --pass castorepass
+
+# Generate the PKCS #12 keystore for Elasticsearch and sign it with the CA
+bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name elasticsearch --dns localhost --pass storepass
+
+# Generate the PKCS #12 keystore for Kibana and sign it with the CA
+bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name kibana --dns localhost --pass storepass
+
+# Copy the PKCS #12 keystore for Elasticsearch with an empty password
+openssl pkcs12 -in elasticsearch.p12 -nodes -passin pass:"storepass" -passout pass:"" | openssl pkcs12 -export -out elasticsearch_emptypassword.p12 -passout pass:""
+
+# Manually create "elasticsearch_nopassword.p12" -- this can be done on macOS by importing the P12 key store into the Keychain and exporting it again
+
+# Extract the PEM-formatted X.509 certificate for the CA
+openssl pkcs12 -in elasticsearch.p12 -out ca.crt -cacerts -passin pass:"storepass" -passout pass:
+
+# Extract the PEM-formatted PKCS #1 private key for Elasticsearch
+openssl pkcs12 -in elasticsearch.p12 -nocerts -passin pass:"storepass" -passout pass:"keypass" | openssl rsa -passin pass:keypass -out elasticsearch.key
+
+# Extract the PEM-formatted X.509 certificate for Elasticsearch
+openssl pkcs12 -in elasticsearch.p12 -out elasticsearch.crt -clcerts -passin pass:"storepass" -passout pass:
+
+# Extract the PEM-formatted PKCS #1 private key for Kibana
+openssl pkcs12 -in kibana.p12 -nocerts -passin pass:"storepass" -passout pass:"keypass" | openssl rsa -passin pass:keypass -out kibana.key
+
+# Extract the PEM-formatted X.509 certificate for Kibana
+openssl pkcs12 -in kibana.p12 -out kibana.crt -clcerts -passin pass:"storepass" -passout pass:
+```
diff --git a/packages/kbn-dev-utils/certs/ca.crt b/packages/kbn-dev-utils/certs/ca.crt
old mode 100755
new mode 100644
index 3e964823c5086b..217935b8d83f63
--- a/packages/kbn-dev-utils/certs/ca.crt
+++ b/packages/kbn-dev-utils/certs/ca.crt
@@ -1,20 +1,29 @@
+Bag Attributes
+    friendlyName: elasticsearch
+    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 
+Key Attributes: <No Attributes>
+Bag Attributes
+    friendlyName: ca
+    2.16.840.1.113894.746875.1.1: <Unsupported tag 6>
+subject=/CN=Elastic Certificate Tool Autogenerated CA
+issuer=/CN=Elastic Certificate Tool Autogenerated CA
 -----BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIVAOgxLlE1RMGl2fYgTKDznvDL2vboMA0GCSqGSIb3DQEB
-CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMB4XDTE5MDcxMTE3MzQ0OFoXDTIyMDcxMDE3MzQ0OFowNDEyMDAG
-A1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5lcmF0ZWQgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNImKp/A9l++Ac7U5lvHOA
-+fYRb8p7AgdfKBMB0v3bo+bpHjkbkf3vYHjo1xJSg5ls6EPK+Do4owkAgKJdrznI
-5/efJOjgA+ylH4rgAfrRIQmiFEWZnAv86vJ+Iq83mfkPELb4dvXCi7AFQkzoM/rY
-Lbi97xha5bA2SEmpYp7VhBTM9zWy+q9Tm5odPO8u2n75GpIM2RwipaXlL0ink+06
-/oweQJoivaDgpDOmUXCFPmpV3VCdhUGxDQPyG0upQkF+NbQoei4RmluPEmVz4S7I
-TFLWjX7LeZVP63bJkcCgiq6Hm97kDtr9EYlPKhHm7UMWzhNzHbfvySMDzqAJC0KX
-AgMBAAGjUzBRMB0GA1UdDgQWBBRKqaaQ/+jT+ipPLJe7qekp1N/zizAfBgNVHSME
-GDAWgBRKqaaQ/+jT+ipPLJe7qekp1N/zizAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
-SIb3DQEBCwUAA4IBAQA7Gcq8h8yDXvepfKUAcTTMCBZkI+g3qE1gfRwjW7587CIj
-xnrzEqANU+Q1lv7IeQ158HiduDUMZfnvpuNwkf0HkqnRWb57RwfVdCAlAeZmzipq
-5ZJWlIW4dbmk57nGLg4fCszedi0uSGytZ2/BUdpWyC0fAM97h7Agtr4xGGKMEL67
-uB55ijt61V62HZ5wWXWNO9m+wfmdnt+YQViQJHtpYz1oOmWhY3dpitZLfWs1sLLD
-w3CZOhmWX7+P7+HlCkSBF4swzHOCI3THyX61NbLxju8VkTAjwbZPq4EOnVKnO6kr
-RdwQVnzKnqG5fxfSGknNahy0pOhJHZlGLwECRlgF
+MIIDSzCCAjOgAwIBAgIUW0brhEtYK3tUBYlXnUa+AMmAX6kwDQYJKoZIhvcNAQEL
+BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
+cmF0ZWQgQ0EwIBcNMTkxMjI3MTcwMjMyWhgPMjA2OTEyMTQxNzAyMzJaMDQxMjAw
+BgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2VuZXJhdGVkIENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAplO5m5Xy8xERyA0/G5SM
+Nu2QXkfS+m7ZTFjSmtwqX7BI1I6ISI4Yw8QxzcIgSbEGlSqb7baeT+A/1JQj0gZN
+KOnKbazl+ujVRJpsfpt5iUsnQyVPheGekcHkB+9WkZPgZ1oGRENr/4Eb1VImQf+Y
+yo/FUj8X939tYW0fficAqYKv8/4NWpBUbeop8wsBtkz738QKlmPkMwC4FbuF2/bN
+vNuzQuRbGMVmPeyivZJRfDAMKExoXjCCLmbShdg4dUHsUjVeWQZ6s4vbims+8qF9
+b4bseayScQNNU3hc5mkfhEhSM0KB0lDpSvoCxuXvXzb6bOk7xIdYo+O4vHUhvSkQ
+mwIDAQABo1MwUTAdBgNVHQ4EFgQUGu0mDnvDRnBdNBG8DxwPdWArB0kwHwYDVR0j
+BBgwFoAUGu0mDnvDRnBdNBG8DxwPdWArB0kwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEASv/FYOwWGnQreH8ulcVupGeZj25dIjZiuKfJmslH8QN/
+pVCIzAxNZjGjCpKxbJoCu5U9USaBylbhigeBJEq4wmYTs/WPu4uYMgDj0MILuHin
+RQqgEVG0uADGEgH2nnk8DeY8gQvGpJRQGlXNK8pb+pCsy6F8k/svGOeBND9osHfU
+CVEo5nXjfq6JCFt6hPx7kl4h3/j3C4wNy/Dv/QINdpPsl6CnF17Q9R9d60WFv42/
+pkl7W1hszCG9foNJOJabuWfVoPkvKQjoCvPitZt/hCaFZAW49PmAVhK+DAohQ91l
+TZhDmYqHoXNiRDQiUT68OS7RlfKgNpr/vMTZXDxpmw==
 -----END CERTIFICATE-----
diff --git a/packages/kbn-dev-utils/certs/elasticsearch.crt b/packages/kbn-dev-utils/certs/elasticsearch.crt
old mode 100755
new mode 100644
index b30e11e9bbce14..87ba02019903f1
--- a/packages/kbn-dev-utils/certs/elasticsearch.crt
+++ b/packages/kbn-dev-utils/certs/elasticsearch.crt
@@ -1,20 +1,29 @@
+Bag Attributes
+    friendlyName: elasticsearch
+    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 
+Key Attributes: <No Attributes>
+Bag Attributes
+    friendlyName: elasticsearch
+    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 
+subject=/CN=elasticsearch
+issuer=/CN=Elastic Certificate Tool Autogenerated CA
 -----BEGIN CERTIFICATE-----
-MIIDRDCCAiygAwIBAgIVAI8V1fwvXKykKtp5k0cLpTOtY+DVMA0GCSqGSIb3DQEB
+MIIDQDCCAiigAwIBAgIVAI93OQE6tZffPyzenSg3ljE3JJBzMA0GCSqGSIb3DQEB
 CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMB4XDTE5MDcxMTE3MzUxOFoXDTIyMDcxMDE3MzUxOFowGDEWMBQG
-A1UEAxMNZWxhc3RpY3NlYXJjaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALW+8gV6m6wYmTZmrXzNWKElE+ePkkikCviNfuWonWqxgAoWpAwAx2FvdhP3
-UDFbe38ydJX4oDgXeC25vdIR6z2uqzx+GXSNSybO7luuOUYQOP4Xf5Cj3zzXXMyu
-nY1nZTVsChI9jAMz4cZZdUd04f4r4TBNxrFCcVR0uec5RGRXuP8rSQd9AbYFUVYf
-jJeLb24asghb2Ku+c2JGvMqPEXFWFGOXFhUoIbRjCJNTDcr1ZXPof3+fO1l6HmhT
-QBSqC4IZL8XqANltDT4tCQDD8L9+ckWJD8MP3wPkPUGZId2gLu++hrb9YfiP2upq
-N/f3P7l5Fcisw1iwQC4+DGMTyfcCAwEAAaNpMGcwHQYDVR0OBBYEFGuiGk8HLpG2
-MyA24/J+GwxT32ikMB8GA1UdIwQYMBaAFEqpppD/6NP6Kk8sl7up6SnU3/OLMBoG
-A1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATAJBgNVHRMEAjAAMA0GCSqGSIb3DQEB
-CwUAA4IBAQB8yfY0edAgq2KnJNWyl8NpHNfqtM27+/LR2V8OxVwxV1hc4ZilczLu
-CXeqP9uqBVjcck6fvLrjy4LhSG0V05j51UMJ1FjFVTBuhlrDcd3j8848yWrmyz8z
-vPYYY2vIN9d1NsBgufULwliBT4UJchsYE8xT5ayAzGHKCTlzHGHMTPzYjwac8nbT
-nd2u+6h0OQOJn6K4v+RfXtN4EA8ZUrYxUkqHNS3cFB5sxH7JQGi25XJc5MfxyCwY
-YOukxbN85ew861N6oVd+W+nGJu8WOLU88/uvCv+dLhnAlnnIOLqvmrD5m7gFsFO9
-Z7Xz/U1SbNipWy9OLOhqq2Ja59j8p9e5
+ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDMxN1oYDzIwNjkxMjE0MTcwMzE3WjAYMRYw
+FAYDVQQDEw1lbGFzdGljc2VhcmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2EkPfvE3ZNMjHCAQZhpImoXBCIN6KavvJSbVHRtLzAXB4wxige+vFQWb
+4umqPeEeVH7FvrsRqn24tUgGIkag9p9AOwYxfcT3vwNqcK/EztIlYFs72pmYg7Ez
+s6+qLc/YSLOT3aMoHKDHE93z1jYIDGccyjGbv9NsdgCbLHD0TQuqm+7pKy1MZoJm
+0qn4KYw4kXakVNWlxm5GIwr8uqU/w4phrikcOOWqRzsxByoQajypLOA4eD/uWnI2
+zGyPQy7Bkxojiy1ss0CVlrl8fJgcjC4PONpm1ibUSX3SoZ8PopPThR6gvvwoQolR
+rYu4+D+rsX7q/ldA6vBOiHBD8r4QoQIDAQABo2MwYTAdBgNVHQ4EFgQUSlIMCYYd
+e72A0rUqaCkjVPkGPIwwHwYDVR0jBBgwFoAUGu0mDnvDRnBdNBG8DxwPdWArB0kw
+FAYDVR0RBA0wC4IJbG9jYWxob3N0MAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQAD
+ggEBAImbzBVAEjiLRsNDLP7QAl0k7lVmfQRFz5G95ZTAUSUgbqqymDvry47yInFF
+3o12TuI1GxK5zHzi+qzpJLyrnGwGK5JBR+VGxIBBKFVcFh1WNGKV6kSO/zBzO7PO
+4Jw4G7By/ImWvS0RBhBUQ9XbQZN3WcVkVVV8UQw5Y7JoKtM+fzyEKXKRCTsvgH+h
+3+fUBgqwal2Mz4KPH57Jrtk209dtn7tnQxHTNLo0niHyEcfrpuG3YFqTwekr+5FF
+FniIcYHPGjag1WzLIdyhe88FFpuav19mlCaxBACc7t97v+euSVUWnsKpy4dLydpv
+NxJiI9eWbJZ7f5VM7o64pm7U1cU=
 -----END CERTIFICATE-----
diff --git a/packages/kbn-dev-utils/certs/elasticsearch.key b/packages/kbn-dev-utils/certs/elasticsearch.key
old mode 100755
new mode 100644
index 1013ce39712461..9ae4e314630d1e
--- a/packages/kbn-dev-utils/certs/elasticsearch.key
+++ b/packages/kbn-dev-utils/certs/elasticsearch.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/packages/kbn-dev-utils/certs/elasticsearch.p12 b/packages/kbn-dev-utils/certs/elasticsearch.p12
new file mode 100644
index 0000000000000000000000000000000000000000..02a9183cd8a50e166b7b0500caf215a0a8dcd6b6
GIT binary patch
literal 3501
zcmY+EcQ_l27RG~!62V98nHaT7RMjlC1*K85HjPn)8qwH|5~B#Uw;FA2rDl!TyH&J;
zQa+mw6t(KQ_qpS_f1Kw%=Y7vPfBq17$ZJXpDg++l1fms>){8!ZP|#2m;vx5dc!=?(
zZGga22mW6~?FPhCKe)6VF3Sc4{`VC<9R+0}9(ant1CJ15AiDq9m(RI@&=~QvH!enf
zti9vS%rUB&5;rrgb}6X<J$He4;NZ|0wy-hS=Es*soY;fH(lsMJdS(?Q1el&?>Gjmz
zYBoqfUPu+pb#xFnUM;X)(Ndpy4=&WG!1Uad`sKQO0l2i$WaBNXj>m}jz?QG2w0~_^
zy+dR!Wub6U1Fo*OZ8T{tO*<b4Su#ds*6?j4Nb2(6P7M1T5<KCO)Sidu6XQyanI|O5
z9ld|jntMx5vgG5#*U1Yt11IQiE?9w}ndV?uglk(V=LNg$%IxCJu|}6G)*G=N$n%V)
zjPcT*Ork$Ji~$o+U%k^UyBHxOJULrq9`#wVIZe=d`XW2>`#UuiQD7hL5k=1@X}CNH
zqB=Ke(N*%)q9~ci7SOB09l=-PG-P6|oO)7|()!VFo&58>nMYu5H!o}Nw`|6JkgJlG
z6vRCc@wC1f8t|(=Pqs2<-B~&L%PlVWP7+fmihX%kjm}O(FUp)v#;h!xM6P%ADREi%
z<ol3^Lcu5)@f=7Z26YY@4fyt*k#Cnh1?gsfE1W>MTNe^~@gk~RcbVaBvU38=s{A}R
z!{JdtQuM{bP)N6RpM{B0l?*$t&c+ON*}^&B8?_Mh9pA*GUE<UaSJme}`hDHXxDj4~
zC3cfXPSOjb>*ka3*X*0~AhTB+rvDU+@h#K6cvLIRAt%47OGibTGTP*<*jPNYeK*de
zJbPlrdT`B`^(gfaS7_K(8*YI8i9P{TGp|gn)Z^7PYl#)CV9s&rt=ri{KVIEF%pjPF
zy}r#HKMK$=t9E@}FV_7WHswc&&97bh27Bg{$HG_1HQ!>!+*UsBb@#ZCmf^XuTY83U
z-&uK3Tqa|?Fnw6*s&6Np*_~wyx!AACmA+f`)_0M-8CsDO%~4XtA?Al4n-46?u<I%`
ze|4S^Zq}5YwZLM<Le;@n{}u3YdI-I|qOsBHj}7M#PGCLczNRPUg>~P2vMmOzGA?n0
z7MoB_Hx#UQJD2AH)x*ixF$25_e-Wv7_5E~*;`b%p&*X(Z#n+^z9U7meuf=cbE$P}Z
z$1FcISI`7UGx8d&SVaV6CS%Rtd@%HF9D|>OWZpQftyK=ZJ_kP#*EGN`g9<g^e{pe*
z5=?r1jP3t?R-5DQU5%xciP*8hyuO>1klZ-rLiI^1D^Cr%jHDvm?f_<cHj~a&uUTQq
zi%)d8T_h~^Izq4${7>ji_7;uUUsKlA?d`A@jd}bLq08ZQ98FS?Kg324f+}Qf>!~|;
z&&k|%GvEhW%#+I8z#{%P=Tp^hUWO!F1}K79%-NjhULQ>y6ou~egqG&>pAAqux?66i
zlu^#F7Uy0auP~$$MmttgeGCpu7WtVV?7WII;62;WR&y{W%WlXSD=sf9g55$wqyexw
z`;?xTbd$svgSNAs<dhf&h9}1br%8Jaso#5h_pw&7L-N5jI!tk0CqntFpgT6R&}{F&
zfRBkJ6c7K()j@P>Wm%$DEUE;8)}B!^QI)d$5*gVx>}t-OovbSHyY<~FuWo`~MoFE9
zdt_tw>C}*SfmMV4ewO~LG5;bztBhC5H>x`P=2tqGhpq#qy=zqV)>Ww@6l$I+thyAg
zOU7H;Yhd&F7)?{O6?K|Mo$|hR*!D{QIY>+u;|%=l`+a&+o5Yu@-{o*mKY_menU9Ro
zCHVeBQCg@B4<8o*4e$gw0{j5}0C#}%rJ^q<-^<Po0sG%7s|*y#Z0hcX7LbvXm%nlI
zri`KjLRKDury2e45)G&jPt$&BwNO$3F6GVt5{m!hE$E-TZBgWETNom*_QS46vcaUM
zv7AYSfAKZ~PxH8?Y{bLpctcn+^y{-VCJpZpht6X~8SqhK#f4RLn7|%R53oA&sb3z0
z1c->K*1_4*BnTOI9~!Z^sxb#23N1zK*9?-x{npH!I08ia7{Sk`kCITqKhxO;Z~B<c
z+fFZwvIbb$wgsaHnzLWAgKk4C(_JZ>{KtQ;-{|7dP@rTdmO3*cEeb4hOv9`(iPh5~
zZ3T>Jsm@UW@6;GX$9mLi6EXKq)sYlz&^fS=rd%Ot)H2RL*=bnpI@}3Q=KNiElV05#
zG*C<E%l9#1r1=obV$X~Xe`!B_4xyOh;wEmR#^<o{fLh*YI8!@k@E&yQLvvYtnQCwp
z4bZCRfG!9dI>UC%KoGPYQM9;)pRo;-f$4U8{hh7FaBwXH6SvxrZwb2|r%oiabH)a_
znnptFm*=`c8vftYY)4d-+T$2e@go$?JD<uFeSXgIw|Hl%YE6V|^<>t~^n2?M_tVk1
zp~8cFFk>wqE-Mc>6g@i@__wp+pU!m2^b*DQ4!Dv@>0bkft_n7YdUukI)#HUeb86(R
zjv53|y1bjmRpF9h8RbD0OZvCyymLH$ih39zVdg3CEeV95>))z`_WXJ_p^x3)uP_Jo
z{kd+_foI=6)*DUZ689&rlf<U7rD#n&S(1{^w8p;p_nLt@zY5{5+_$%*%xd}*2cMKw
z<vsFh3JS#J&$Mm3wCf9me#`NPxc%5o|28B4#5C(8DlDHJy2Yu%2RffAz2Eq$jA#c`
zU6?hmFC#)nQT%K*X|}6zzL`FKB6~`)BY(mL&?-}rmPaZW$&%fP_2XY?+H`c)H@&iq
zs6tp1+$5$VQLeoIzQ%@ysDcyeDrRABn63K<DXmo9v6cLkRQqA#B<FM%mGUIVQ`=JQ
z;noZ9>sw^GUsJhWl9h8PzwY~`vNt%y9%W{>*(?05n;#gg5H7I3a?+It0;z_?_(X7P
zvs=?z`@hBeZktvZE(Dk|-KnI!aHoo9O}?-gL#XJ<u?7mk1Ed1iB;1;7g<rkRYWzBa
znJ@&7Pn8AQ@%aAm7hD=vkXEH$3#PxCB&YJ^B%KHD)NLhUE=j6!$Q-5M&yJzFW2kiN
zDlX_Md6(0$*Z^jfQa3}9V{p;n+$D^(Vk)Qp1)uC4(unsp%QsXzr<vF7BcE>^?=F0C
zs;aHIK__$?rJ49nyZ`p)AXS9lp-ghJd{x>Y5W!E<Xn9a{Ds{}TA3dOjS5EO0{n@0w
zY6?8tqxY<QCo(@G5Kon_rZD0sM<X*^rN)?M0h#Z9Jg3AEhxCEi4sTM`3X1KuTe+0H
zjB#`^IulJHE-@XSJk8BO2n7WjwT9HMU0K{X)Ia-W$WtOJ7xp2~Q^aE8NOPM!|8Xv0
z=sFmC^yKk!Qi)!9!UhrrTrTp8ZE0q`1I?N>$RT9L5@BUE!aN~GHHTh%P=^=~T`}mh
zooD;u-&Kd^*bZ+BGW~FnonRBG^4c}>vDpmV6wYZ@+H-DT`$pSZ(3U+VO_OsJhlIL)
z&2}dmhbt~&%7TnBoSV_J2ZzLjkw&>;v*ndQ$MyD;;+-53D1U+KEjCwE7RGS;jYZnB
z3@w2{Y{FtFm_BmC7`L5S5z+I5#P<b59l`@eDMwYu;ufMA^q-Dhd1PW818w>-#)UBZ
zp6%Fzn3u2?k&Pz&Dmj%GWcvMjY#=6Yt>|~(s~N{|?F{pyq*j?bSneRbt$6ao!Or(D
z6t@^G(%;}*uL<70XVpA1h+lmXw-}cE20}9`b2}pbFjp?f0;LRPXgm5F1{jkPD)Lkq
z3A2TB3Axa_yH)4f^?TX8JR!E@TVgL5v=Upy<!HRN3cg71pxfrOcxHIvOX3YQnY(e@
z`29a3$XNz;E`pT2z<IHJ>n$nM1Dvd;4mw7KsP1phOD%_sTFqRO@S5WI_^9WZNPA8J
zgrz!EfLD%UUEiJzPfJb2<ZCzU_+}h}pgQ2MlKeIV!KnS-Rl_3Eaq;Qhl&&z>_G=#6
z?<bAMqf7jLGg*JI5sBsK#7<8;<PDEyH+ViQ!%Oe$Rm7~lHBR`oCI8<1;T4quS4vRq
z=8&0m-W;d7{lb7VeNx=?=NEPOcAaI8GfY=UkTmc-8RLms30kjvKI-;I=e<&(*stM8
zPqqe*a8@r-zmqKlLsI=Sz*!LM!x5wucjU>L4y6yxdq#N5AsLO*^SaMw^E>TsS0u~R
z;=osO)MnKYEdCveCk})5p<WULVjsS*EZ7I~-Bj9sG;DNb(MH<txClv*RYn@gu(EpN
z#*<O&`+U<SXRVA*`WK<)(EvCHn0>Q=o?8d}dnjGUj~90B<H+Q@CVbmS?P6I%zODOX
zzyXE3*CzzQl43`{^kvrH14@&fpKD3x>g<&gJRfd~D(^P%#C#J|NT9XjPVJ7&w>y(I
z=|2@0Iqkxv<tPxn2cM(1UP$R#Ra?*h<v)4`nrvi|g{wRISXyH;G!5Dx3I~SI#gRI2
z=BSxL<YIA9qcK?1+>zBwa1Oki^Ezc}g^r8*D@|qbsE2s=Om6*d6D*^)1Ap}hp^AVZ
zXhGBx3{;d{)Bqqfa8u$U_gm^BdPj7DM3PEzdhqEN5Gv4)<ZV71)?wgA^=mN=*GVhh
Lv!SG-h%WpG{MdXl

literal 0
HcmV?d00001

diff --git a/packages/kbn-dev-utils/certs/elasticsearch_emptypassword.p12 b/packages/kbn-dev-utils/certs/elasticsearch_emptypassword.p12
new file mode 100644
index 0000000000000000000000000000000000000000..3162982ac635ad31f99dd2592062cbc40b9a51ea
GIT binary patch
literal 3333
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
Pn;Fpn6@wtZ0s;sCPyJam

literal 0
HcmV?d00001

diff --git a/packages/kbn-dev-utils/certs/elasticsearch_nopassword.p12 b/packages/kbn-dev-utils/certs/elasticsearch_nopassword.p12
new file mode 100644
index 0000000000000000000000000000000000000000..3a22a58d207dfb67ab87d81de0860ab228561854
GIT binary patch
literal 3543
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
L$;zsL0Kk6%be@sh

literal 0
HcmV?d00001

diff --git a/packages/kbn-dev-utils/certs/kibana.crt b/packages/kbn-dev-utils/certs/kibana.crt
new file mode 100644
index 00000000000000..1c83be587bff9b
--- /dev/null
+++ b/packages/kbn-dev-utils/certs/kibana.crt
@@ -0,0 +1,29 @@
+Bag Attributes
+    friendlyName: kibana
+    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 32 32 33 30 33 39 
+Key Attributes: <No Attributes>
+Bag Attributes
+    friendlyName: kibana
+    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 32 32 33 30 33 39 
+subject=/CN=kibana
+issuer=/CN=Elastic Certificate Tool Autogenerated CA
+-----BEGIN CERTIFICATE-----
+MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
+ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
+wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
+FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
+OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
+s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
+vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
+BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
+V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
+z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
++frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
+TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
+b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
+cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
+eOUsdwn1yDKHRxDHyA==
+-----END CERTIFICATE-----
diff --git a/packages/kbn-dev-utils/certs/kibana.key b/packages/kbn-dev-utils/certs/kibana.key
new file mode 100644
index 00000000000000..4a4e6b4cb8c360
--- /dev/null
+++ b/packages/kbn-dev-utils/certs/kibana.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAkMGGG0LW0QSieLjWXNviIEVPuzTS9tWXm0JRCDICu4wKjjK7
+Ftm+QwE8+NRXfhkBVBVGGI8KPj0I+rCR7ITiaP4DW99h68nbzCO2D73r5LM5LhBg
+n18UNw8NkUwAi4A9EDgpMB7590zH9JaJaFf3jxlmmQ2GWl4t2uQ3VovxxRaCcrIB
+dCVdn+l8ioSZBmhHybPaVl9uvcx/10LxjceARIpiaWAfIeCZw2DxSIkHao/rJdm/
+pEtYR/ZC+YAQDF4xVL3DZ1/j5sk48iaxqO+ZNJLvrKQX9WzMLkLd7kpjPk0CF5Lx
+Q5ktAzlREq6QORAtUwVBkc+qPyPPF8eDLne+9QIDAQABAoIBAHl9suxWYKz00te3
+alJtSZAEHDLm1tjL034/XnseXiTCGGnYMiWvgnwCIgZFUVlH61GCuV4LT3GFEHA2
+mYKE1PGBn5gQF8MpnAvtPPRhVgaQVUFQBYg86F59h8mWnC545sciG4+DsA/apUem
+wJSOn/u+Odni/AwEV0ALolZFBhl+0rccSr+6paJnzJ7QNiIn6EWbgb0n9WXqkhap
+TqoPclBHm0ObeBI6lNyfvBZ8HB3hyjWZInNCaAs9DnkNPh4evuttUn/KlOPOVn9r
+xz2UYsmVW6E+yPXUpSYkFQN9aaPF6alOz8PIfF8Wit7pmZMmInluGcwi/us9+ZTN
+8gNvpoECgYEA0KC7XEoXRsBTN4kPznkGftvj1dtgB35W/HxXNouArQQjCbLhqcsA
+jqaK0f+stYzSWZXGsKl9yQU9KA7u/wCHmLep70l7WsYYUKdkhWouK0HU5MeeLwB0
+N4ekQOQuQGqelqMo7IG2hQhTYD9PB4F3G0Sz1FgdObfuGPKfvNFVjckCgYEAsaAA
+IY/TpRBWeWZfyXrnkp3atOPzkdpjb6cfT8Kib9bIECXr7ULUxA5QANX05ofodhsW
+3+7iW5wicyZ1VNVEsPRL0aw7YUbNpBvob8faBUZ2KEdKQr42IfVOo7TQnvVXtumR
+UE+dNvWUL2PbL0wMxD1XbMSmOze/wF8X2CeyDc0CgYBQnLqol2xVBz1gaRJ1emgb
+HoXzfVemrZeY6cadKdwnfkC3n6n4fJsTg6CCMiOe5vHkca4bVvJmeSK/Vr3cRG0g
+gl8kOaVzVrXQfE2oC3YZes9zMvqZOLivODcsZ77DXy82D4dhk2FeF/B3cR7tTIYk
+QDCoLP/l7H8QnrdAMza2mQKBgDODwuX475ncviehUEB/26+DBo4V2ms/mj0kjAk2
+2qNy+DzuspjyHADsYbmMU+WUHxA51Q2HG7ET/E3HJpo+7BgiEecye1pADZ391hCt
+Nob3I4eU/W2T+uEoYvFJnIOthg3veYyAOolY+ewwmr4B4WX8oGFUOx3Lklo5ehHf
+mV01AoGBAI/c6OoHdcqQsZxKlxDNLyB2bTbowAcccoZIOjkC5fkkbsmMDLfScBfW
+Q4YYJsmJBdrWNvo7jCl17Mcc4Is3RlmHDrItRkaZj+ehqAN3ejrnPLdgYeW/5XDK
+e7yBj7oJd4oKZc59jVytdHvo5R8K0QohAv9gQEZ/tdypX+xWe+5E
+-----END RSA PRIVATE KEY-----
diff --git a/packages/kbn-dev-utils/certs/kibana.p12 b/packages/kbn-dev-utils/certs/kibana.p12
new file mode 100644
index 0000000000000000000000000000000000000000..06bbd23881290b8952db722041a5da7553546560
GIT binary patch
literal 3463
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

literal 0
HcmV?d00001

diff --git a/packages/kbn-dev-utils/src/certs.ts b/packages/kbn-dev-utils/src/certs.ts
index 0d340e4e8c906f..f72e3ee547b5cb 100644
--- a/packages/kbn-dev-utils/src/certs.ts
+++ b/packages/kbn-dev-utils/src/certs.ts
@@ -22,3 +22,14 @@ import { resolve } from 'path';
 export const CA_CERT_PATH = resolve(__dirname, '../certs/ca.crt');
 export const ES_KEY_PATH = resolve(__dirname, '../certs/elasticsearch.key');
 export const ES_CERT_PATH = resolve(__dirname, '../certs/elasticsearch.crt');
+export const ES_P12_PATH = resolve(__dirname, '../certs/elasticsearch.p12');
+export const ES_P12_PASSWORD = 'storepass';
+export const ES_EMPTYPASSWORD_P12_PATH = resolve(
+  __dirname,
+  '../certs/elasticsearch_emptypassword.p12'
+);
+export const ES_NOPASSWORD_P12_PATH = resolve(__dirname, '../certs/elasticsearch_nopassword.p12');
+export const KBN_KEY_PATH = resolve(__dirname, '../certs/kibana.key');
+export const KBN_CERT_PATH = resolve(__dirname, '../certs/kibana.crt');
+export const KBN_P12_PATH = resolve(__dirname, '../certs/kibana.p12');
+export const KBN_P12_PASSWORD = 'storepass';
diff --git a/packages/kbn-dev-utils/src/index.ts b/packages/kbn-dev-utils/src/index.ts
index dc12613cf2a9e9..2fc29b71b262ec 100644
--- a/packages/kbn-dev-utils/src/index.ts
+++ b/packages/kbn-dev-utils/src/index.ts
@@ -25,7 +25,19 @@ export {
   ToolingLogCollectingWriter,
 } from './tooling_log';
 export { createAbsolutePathSerializer } from './serializers';
-export { CA_CERT_PATH, ES_KEY_PATH, ES_CERT_PATH } from './certs';
+export {
+  CA_CERT_PATH,
+  ES_KEY_PATH,
+  ES_CERT_PATH,
+  ES_P12_PATH,
+  ES_P12_PASSWORD,
+  ES_EMPTYPASSWORD_P12_PATH,
+  ES_NOPASSWORD_P12_PATH,
+  KBN_KEY_PATH,
+  KBN_CERT_PATH,
+  KBN_P12_PATH,
+  KBN_P12_PASSWORD,
+} from './certs';
 export { run, createFailError, createFlagError, combineErrors, isFailError, Flags } from './run';
 export { REPO_ROOT } from './repo_root';
 export { KbnClient } from './kbn_client';
diff --git a/packages/kbn-es/src/cluster.js b/packages/kbn-es/src/cluster.js
index 665f80e3802e35..ceb4a5b6aece14 100644
--- a/packages/kbn-es/src/cluster.js
+++ b/packages/kbn-es/src/cluster.js
@@ -35,7 +35,7 @@ const { createCliError } = require('./errors');
 const { promisify } = require('util');
 const treeKillAsync = promisify(require('tree-kill'));
 const { parseSettings, SettingsFilter } = require('./settings');
-const { CA_CERT_PATH, ES_KEY_PATH, ES_CERT_PATH } = require('@kbn/dev-utils');
+const { CA_CERT_PATH, ES_P12_PATH, ES_P12_PASSWORD } = require('@kbn/dev-utils');
 const readFile = util.promisify(fs.readFile);
 
 // listen to data on stream until map returns anything but undefined
@@ -261,9 +261,9 @@ exports.Cluster = class Cluster {
     const esArgs = [].concat(options.esArgs || []);
     if (this._ssl) {
       esArgs.push('xpack.security.http.ssl.enabled=true');
-      esArgs.push(`xpack.security.http.ssl.key=${ES_KEY_PATH}`);
-      esArgs.push(`xpack.security.http.ssl.certificate=${ES_CERT_PATH}`);
-      esArgs.push(`xpack.security.http.ssl.certificate_authorities=${CA_CERT_PATH}`);
+      esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
+      esArgs.push(`xpack.security.http.ssl.keystore.type=PKCS12`);
+      esArgs.push(`xpack.security.http.ssl.keystore.password=${ES_P12_PASSWORD}`);
     }
 
     const args = parseSettings(extractConfigFiles(esArgs, installPath, { log: this._log }), {
diff --git a/packages/kbn-es/src/integration_tests/__fixtures__/es_bin.js b/packages/kbn-es/src/integration_tests/__fixtures__/es_bin.js
index d3181a748ffbbe..d374abe5db0683 100644
--- a/packages/kbn-es/src/integration_tests/__fixtures__/es_bin.js
+++ b/packages/kbn-es/src/integration_tests/__fixtures__/es_bin.js
@@ -34,6 +34,8 @@ if (!start) {
 let serverUrl;
 const server = createServer(
   {
+    // Note: the integration uses the ES_P12_PATH, but that keystore contains
+    // the same key/cert as ES_KEY_PATH and ES_CERT_PATH
     key: ssl ? fs.readFileSync(ES_KEY_PATH) : undefined,
     cert: ssl ? fs.readFileSync(ES_CERT_PATH) : undefined,
   },
diff --git a/packages/kbn-es/src/integration_tests/cluster.test.js b/packages/kbn-es/src/integration_tests/cluster.test.js
index dd570e27e32826..dfbc04477bd409 100644
--- a/packages/kbn-es/src/integration_tests/cluster.test.js
+++ b/packages/kbn-es/src/integration_tests/cluster.test.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-const { ToolingLog, CA_CERT_PATH, ES_KEY_PATH, ES_CERT_PATH } = require('@kbn/dev-utils');
+const { ToolingLog, ES_P12_PATH, ES_P12_PASSWORD } = require('@kbn/dev-utils');
 const execa = require('execa');
 const { Cluster } = require('../cluster');
 const { installSource, installSnapshot, installArchive } = require('../install');
@@ -252,9 +252,9 @@ describe('#start(installPath)', () => {
 
     const config = extractConfigFiles.mock.calls[0][0];
     expect(config).toContain('xpack.security.http.ssl.enabled=true');
-    expect(config).toContain(`xpack.security.http.ssl.key=${ES_KEY_PATH}`);
-    expect(config).toContain(`xpack.security.http.ssl.certificate=${ES_CERT_PATH}`);
-    expect(config).toContain(`xpack.security.http.ssl.certificate_authorities=${CA_CERT_PATH}`);
+    expect(config).toContain(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
+    expect(config).toContain(`xpack.security.http.ssl.keystore.type=PKCS12`);
+    expect(config).toContain(`xpack.security.http.ssl.keystore.password=${ES_P12_PASSWORD}`);
   });
 
   it(`doesn't setup SSL when disabled`, async () => {
@@ -319,9 +319,9 @@ describe('#run()', () => {
 
     const config = extractConfigFiles.mock.calls[0][0];
     expect(config).toContain('xpack.security.http.ssl.enabled=true');
-    expect(config).toContain(`xpack.security.http.ssl.key=${ES_KEY_PATH}`);
-    expect(config).toContain(`xpack.security.http.ssl.certificate=${ES_CERT_PATH}`);
-    expect(config).toContain(`xpack.security.http.ssl.certificate_authorities=${CA_CERT_PATH}`);
+    expect(config).toContain(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
+    expect(config).toContain(`xpack.security.http.ssl.keystore.type=PKCS12`);
+    expect(config).toContain(`xpack.security.http.ssl.keystore.password=${ES_P12_PASSWORD}`);
   });
 
   it(`doesn't setup SSL when disabled`, async () => {
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index c3f3f2f477fdd0..c806547595089e 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -4500,6 +4500,14 @@ var certs_1 = __webpack_require__(422);
 exports.CA_CERT_PATH = certs_1.CA_CERT_PATH;
 exports.ES_KEY_PATH = certs_1.ES_KEY_PATH;
 exports.ES_CERT_PATH = certs_1.ES_CERT_PATH;
+exports.ES_P12_PATH = certs_1.ES_P12_PATH;
+exports.ES_P12_PASSWORD = certs_1.ES_P12_PASSWORD;
+exports.ES_EMPTYPASSWORD_P12_PATH = certs_1.ES_EMPTYPASSWORD_P12_PATH;
+exports.ES_NOPASSWORD_P12_PATH = certs_1.ES_NOPASSWORD_P12_PATH;
+exports.KBN_KEY_PATH = certs_1.KBN_KEY_PATH;
+exports.KBN_CERT_PATH = certs_1.KBN_CERT_PATH;
+exports.KBN_P12_PATH = certs_1.KBN_P12_PATH;
+exports.KBN_P12_PASSWORD = certs_1.KBN_P12_PASSWORD;
 var run_1 = __webpack_require__(423);
 exports.run = run_1.run;
 exports.createFailError = run_1.createFailError;
@@ -36986,6 +36994,14 @@ const path_1 = __webpack_require__(16);
 exports.CA_CERT_PATH = path_1.resolve(__dirname, '../certs/ca.crt');
 exports.ES_KEY_PATH = path_1.resolve(__dirname, '../certs/elasticsearch.key');
 exports.ES_CERT_PATH = path_1.resolve(__dirname, '../certs/elasticsearch.crt');
+exports.ES_P12_PATH = path_1.resolve(__dirname, '../certs/elasticsearch.p12');
+exports.ES_P12_PASSWORD = 'storepass';
+exports.ES_EMPTYPASSWORD_P12_PATH = path_1.resolve(__dirname, '../certs/elasticsearch_emptypassword.p12');
+exports.ES_NOPASSWORD_P12_PATH = path_1.resolve(__dirname, '../certs/elasticsearch_nopassword.p12');
+exports.KBN_KEY_PATH = path_1.resolve(__dirname, '../certs/kibana.key');
+exports.KBN_CERT_PATH = path_1.resolve(__dirname, '../certs/kibana.crt');
+exports.KBN_P12_PATH = path_1.resolve(__dirname, '../certs/kibana.p12');
+exports.KBN_P12_PASSWORD = 'storepass';
 
 
 /***/ }),
diff --git a/renovate.json5 b/renovate.json5
index a5983283a9e856..560403046b0a51 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -625,6 +625,14 @@
           '@types/node-fetch',
         ],
       },
+      {
+        groupSlug: 'node-forge',
+        groupName: 'node-forge related packages',
+        packageNames: [
+          'node-forge',
+          '@types/node-forge',
+        ],
+      },
       {
         groupSlug: 'nodemailer',
         groupName: 'nodemailer related packages',
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index 6b13d0dc32d3f0..9cf5691b88399e 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -102,6 +102,8 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
       }
       ensureNotDefined('server.ssl.certificate');
       ensureNotDefined('server.ssl.key');
+      ensureNotDefined('server.ssl.keystore.path');
+      ensureNotDefined('server.ssl.truststore.path');
       ensureNotDefined('elasticsearch.ssl.certificateAuthorities');
 
       const elasticsearchHosts = (
@@ -119,6 +121,8 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
       });
 
       set('server.ssl.enabled', true);
+      // TODO: change this cert/key to KBN_CERT_PATH and KBN_KEY_PATH from '@kbn/dev-utils'; will require some work to avoid breaking
+      // functional tests. Once that is done, the existing test cert/key at DEV_SSL_CERT_PATH and DEV_SSL_KEY_PATH can be deleted.
       set('server.ssl.certificate', DEV_SSL_CERT_PATH);
       set('server.ssl.key', DEV_SSL_KEY_PATH);
       set('elasticsearch.hosts', elasticsearchHosts);
diff --git a/src/core/server/config/deprecation/core_deprecations.test.ts b/src/core/server/config/deprecation/core_deprecations.test.ts
index b40dbdc1b66519..7851522ec899f2 100644
--- a/src/core/server/config/deprecation/core_deprecations.test.ts
+++ b/src/core/server/config/deprecation/core_deprecations.test.ts
@@ -208,4 +208,35 @@ describe('core deprecations', () => {
       ).toEqual([`worker-src blob:`]);
     });
   });
+
+  describe('elasticsearchUsernameDeprecation', () => {
+    it('logs a warning if elasticsearch.username is set to "elastic"', () => {
+      const { messages } = applyCoreDeprecations({
+        elasticsearch: {
+          username: 'elastic',
+        },
+      });
+      expect(messages).toMatchInlineSnapshot(`
+        Array [
+          "Setting elasticsearch.username to \\"elastic\\" is deprecated. You should use the \\"kibana\\" user instead.",
+        ]
+      `);
+    });
+
+    it('does not log a warning if elasticsearch.username is set to something besides "elastic"', () => {
+      const { messages } = applyCoreDeprecations({
+        elasticsearch: {
+          username: 'otheruser',
+        },
+      });
+      expect(messages).toHaveLength(0);
+    });
+
+    it('does not log a warning if elasticsearch.username is unset', () => {
+      const { messages } = applyCoreDeprecations({
+        elasticsearch: {},
+      });
+      expect(messages).toHaveLength(0);
+    });
+  });
 });
diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts
index 36fe95e05cb531..e3b66414ee163d 100644
--- a/src/core/server/config/deprecation/core_deprecations.ts
+++ b/src/core/server/config/deprecation/core_deprecations.ts
@@ -91,6 +91,16 @@ const cspRulesDeprecation: ConfigDeprecation = (settings, fromPath, log) => {
   return settings;
 };
 
+const elasticsearchUsernameDeprecation: ConfigDeprecation = (settings, _fromPath, log) => {
+  const username: string | undefined = get(settings, 'elasticsearch.username');
+  if (username === 'elastic') {
+    log(
+      `Setting elasticsearch.username to "elastic" is deprecated. You should use the "kibana" user instead.`
+    );
+  }
+  return settings;
+};
+
 export const coreDeprecationProvider: ConfigDeprecationProvider = ({
   unusedFromRoot,
   renameFromRoot,
@@ -110,4 +120,5 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({
   dataPathDeprecation,
   rewriteBasePathDeprecation,
   cspRulesDeprecation,
+  elasticsearchUsernameDeprecation,
 ];
diff --git a/src/core/server/elasticsearch/elasticsearch_client_config.test.ts b/src/core/server/elasticsearch/elasticsearch_client_config.test.ts
index 64fb41cb3e4e5a..20c10459e0e8a4 100644
--- a/src/core/server/elasticsearch/elasticsearch_client_config.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_client_config.test.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-import { mockReadFileSync } from './elasticsearch_client_config.test.mocks';
-
 import { duration } from 'moment';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 import {
@@ -66,8 +64,6 @@ Object {
 });
 
 test('parses fully specified config', () => {
-  mockReadFileSync.mockImplementation((path: string) => `content-of-${path}`);
-
   const elasticsearchConfig: ElasticsearchClientConfig = {
     apiVersion: 'v7.0.0',
     customHeaders: { xsrf: 'something' },
@@ -87,9 +83,9 @@ test('parses fully specified config', () => {
     sniffInterval: 11223344,
     ssl: {
       verificationMode: 'certificate',
-      certificateAuthorities: ['ca-path-1', 'ca-path-2'],
-      certificate: 'certificate-path',
-      key: 'key-path',
+      certificateAuthorities: ['content-of-ca-path-1', 'content-of-ca-path-2'],
+      certificate: 'content-of-certificate-path',
+      key: 'content-of-key-path',
       keyPassphrase: 'key-pass',
       alwaysPresentCertificate: true,
     },
@@ -497,6 +493,7 @@ Object {
   "sniffOnConnectionFault": true,
   "sniffOnStart": true,
   "ssl": Object {
+    "ca": undefined,
     "rejectUnauthorized": false,
   },
 }
@@ -541,6 +538,7 @@ Object {
   "sniffOnConnectionFault": true,
   "sniffOnStart": true,
   "ssl": Object {
+    "ca": undefined,
     "checkServerIdentity": [Function],
     "rejectUnauthorized": true,
   },
@@ -581,6 +579,7 @@ Object {
   "sniffOnConnectionFault": true,
   "sniffOnStart": true,
   "ssl": Object {
+    "ca": undefined,
     "rejectUnauthorized": true,
   },
 }
@@ -606,8 +605,6 @@ Object {
   });
 
   test('#ignoreCertAndKey = true', () => {
-    mockReadFileSync.mockImplementation((path: string) => `content-of-${path}`);
-
     expect(
       parseElasticsearchClientConfig(
         {
@@ -620,9 +617,9 @@ Object {
           requestHeadersWhitelist: [],
           ssl: {
             verificationMode: 'certificate',
-            certificateAuthorities: ['ca-path'],
-            certificate: 'certificate-path',
-            key: 'key-path',
+            certificateAuthorities: ['content-of-ca-path'],
+            certificate: 'content-of-certificate-path',
+            key: 'content-of-key-path',
             keyPassphrase: 'key-pass',
             alwaysPresentCertificate: true,
           },
diff --git a/src/core/server/elasticsearch/elasticsearch_client_config.ts b/src/core/server/elasticsearch/elasticsearch_client_config.ts
index dcc09f711abbeb..287d835c40351b 100644
--- a/src/core/server/elasticsearch/elasticsearch_client_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_client_config.ts
@@ -18,7 +18,6 @@
  */
 
 import { ConfigOptions } from 'elasticsearch';
-import { readFileSync } from 'fs';
 import { cloneDeep } from 'lodash';
 import { Duration } from 'moment';
 import { checkServerIdentity } from 'tls';
@@ -165,18 +164,12 @@ export function parseElasticsearchClientConfig(
       throw new Error(`Unknown ssl verificationMode: ${verificationMode}`);
   }
 
-  const readFile = (file: string) => readFileSync(file, 'utf8');
-  if (
-    config.ssl.certificateAuthorities !== undefined &&
-    config.ssl.certificateAuthorities.length > 0
-  ) {
-    esClientConfig.ssl.ca = config.ssl.certificateAuthorities.map(readFile);
-  }
+  esClientConfig.ssl.ca = config.ssl.certificateAuthorities;
 
   // Add client certificate and key if required by elasticsearch
   if (!ignoreCertAndKey && config.ssl.certificate && config.ssl.key) {
-    esClientConfig.ssl.cert = readFile(config.ssl.certificate);
-    esClientConfig.ssl.key = readFile(config.ssl.key);
+    esClientConfig.ssl.cert = config.ssl.certificate;
+    esClientConfig.ssl.key = config.ssl.key;
     esClientConfig.ssl.passphrase = config.ssl.keyPassphrase;
   }
 
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts b/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
new file mode 100644
index 00000000000000..d908fdbfd2e807
--- /dev/null
+++ b/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const mockReadFileSync = jest.fn();
+jest.mock('fs', () => ({ readFileSync: mockReadFileSync }));
+
+export const mockReadPkcs12Keystore = jest.fn();
+export const mockReadPkcs12Truststore = jest.fn();
+jest.mock('../../utils', () => ({
+  readPkcs12Keystore: mockReadPkcs12Keystore,
+  readPkcs12Truststore: mockReadPkcs12Truststore,
+}));
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.ts b/src/core/server/elasticsearch/elasticsearch_config.test.ts
index 1d919639abe5f1..c0db7369b4b991 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.test.ts
@@ -17,10 +17,25 @@
  * under the License.
  */
 
-import { ElasticsearchConfig, config } from './elasticsearch_config';
+import {
+  mockReadFileSync,
+  mockReadPkcs12Keystore,
+  mockReadPkcs12Truststore,
+} from './elasticsearch_config.test.mocks';
+
+import { ElasticsearchConfig, config, ElasticsearchConfigType } from './elasticsearch_config';
+import { loggingServiceMock } from '../mocks';
+import { Logger } from '../logging';
+
+const createElasticsearchConfig = (rawConfig: ElasticsearchConfigType, log?: Logger) => {
+  if (!log) {
+    log = loggingServiceMock.create().get('config');
+  }
+  return new ElasticsearchConfig(rawConfig, log);
+};
 
 test('set correct defaults', () => {
-  const configValue = new ElasticsearchConfig(config.schema.validate({}));
+  const configValue = createElasticsearchConfig(config.schema.validate({}));
   expect(configValue).toMatchInlineSnapshot(`
     ElasticsearchConfig {
       "apiVersion": "master",
@@ -43,7 +58,10 @@ test('set correct defaults', () => {
       "sniffOnStart": false,
       "ssl": Object {
         "alwaysPresentCertificate": false,
+        "certificate": undefined,
         "certificateAuthorities": undefined,
+        "key": undefined,
+        "keyPassphrase": undefined,
         "verificationMode": "full",
       },
       "username": undefined,
@@ -52,17 +70,17 @@ test('set correct defaults', () => {
 });
 
 test('#hosts accepts both string and array of strings', () => {
-  let configValue = new ElasticsearchConfig(
+  let configValue = createElasticsearchConfig(
     config.schema.validate({ hosts: 'http://some.host:1234' })
   );
   expect(configValue.hosts).toEqual(['http://some.host:1234']);
 
-  configValue = new ElasticsearchConfig(
+  configValue = createElasticsearchConfig(
     config.schema.validate({ hosts: ['http://some.host:1234'] })
   );
   expect(configValue.hosts).toEqual(['http://some.host:1234']);
 
-  configValue = new ElasticsearchConfig(
+  configValue = createElasticsearchConfig(
     config.schema.validate({
       hosts: ['http://some.host:1234', 'https://some.another.host'],
     })
@@ -71,17 +89,17 @@ test('#hosts accepts both string and array of strings', () => {
 });
 
 test('#requestHeadersWhitelist accepts both string and array of strings', () => {
-  let configValue = new ElasticsearchConfig(
+  let configValue = createElasticsearchConfig(
     config.schema.validate({ requestHeadersWhitelist: 'token' })
   );
   expect(configValue.requestHeadersWhitelist).toEqual(['token']);
 
-  configValue = new ElasticsearchConfig(
+  configValue = createElasticsearchConfig(
     config.schema.validate({ requestHeadersWhitelist: ['token'] })
   );
   expect(configValue.requestHeadersWhitelist).toEqual(['token']);
 
-  configValue = new ElasticsearchConfig(
+  configValue = createElasticsearchConfig(
     config.schema.validate({
       requestHeadersWhitelist: ['token', 'X-Forwarded-Proto'],
     })
@@ -89,23 +107,216 @@ test('#requestHeadersWhitelist accepts both string and array of strings', () =>
   expect(configValue.requestHeadersWhitelist).toEqual(['token', 'X-Forwarded-Proto']);
 });
 
-test('#ssl.certificateAuthorities accepts both string and array of strings', () => {
-  let configValue = new ElasticsearchConfig(
-    config.schema.validate({ ssl: { certificateAuthorities: 'some-path' } })
-  );
-  expect(configValue.ssl.certificateAuthorities).toEqual(['some-path']);
+describe('reads files', () => {
+  beforeEach(() => {
+    mockReadFileSync.mockReset();
+    mockReadFileSync.mockImplementation((path: string) => `content-of-${path}`);
+    mockReadPkcs12Keystore.mockReset();
+    mockReadPkcs12Keystore.mockImplementation((path: string) => ({
+      key: `content-of-${path}.key`,
+      cert: `content-of-${path}.cert`,
+      ca: [`content-of-${path}.ca`],
+    }));
+    mockReadPkcs12Truststore.mockReset();
+    mockReadPkcs12Truststore.mockImplementation((path: string) => [`content-of-${path}`]);
+  });
 
-  configValue = new ElasticsearchConfig(
-    config.schema.validate({ ssl: { certificateAuthorities: ['some-path'] } })
-  );
-  expect(configValue.ssl.certificateAuthorities).toEqual(['some-path']);
+  it('reads certificate authorities when ssl.keystore.path is specified', () => {
+    const configValue = createElasticsearchConfig(
+      config.schema.validate({ ssl: { keystore: { path: 'some-path' } } })
+    );
+    expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
+    expect(configValue.ssl.certificateAuthorities).toEqual(['content-of-some-path.ca']);
+  });
 
-  configValue = new ElasticsearchConfig(
-    config.schema.validate({
-      ssl: { certificateAuthorities: ['some-path', 'another-path'] },
-    })
-  );
-  expect(configValue.ssl.certificateAuthorities).toEqual(['some-path', 'another-path']);
+  it('reads certificate authorities when ssl.truststore.path is specified', () => {
+    const configValue = createElasticsearchConfig(
+      config.schema.validate({ ssl: { truststore: { path: 'some-path' } } })
+    );
+    expect(mockReadPkcs12Truststore).toHaveBeenCalledTimes(1);
+    expect(configValue.ssl.certificateAuthorities).toEqual(['content-of-some-path']);
+  });
+
+  it('reads certificate authorities when ssl.certificateAuthorities is specified', () => {
+    let configValue = createElasticsearchConfig(
+      config.schema.validate({ ssl: { certificateAuthorities: 'some-path' } })
+    );
+    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
+    expect(configValue.ssl.certificateAuthorities).toEqual(['content-of-some-path']);
+
+    mockReadFileSync.mockClear();
+    configValue = createElasticsearchConfig(
+      config.schema.validate({ ssl: { certificateAuthorities: ['some-path'] } })
+    );
+    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
+    expect(configValue.ssl.certificateAuthorities).toEqual(['content-of-some-path']);
+
+    mockReadFileSync.mockClear();
+    configValue = createElasticsearchConfig(
+      config.schema.validate({
+        ssl: { certificateAuthorities: ['some-path', 'another-path'] },
+      })
+    );
+    expect(mockReadFileSync).toHaveBeenCalledTimes(2);
+    expect(configValue.ssl.certificateAuthorities).toEqual([
+      'content-of-some-path',
+      'content-of-another-path',
+    ]);
+  });
+
+  it('reads certificate authorities when ssl.keystore.path, ssl.truststore.path, and ssl.certificateAuthorities are specified', () => {
+    const configValue = createElasticsearchConfig(
+      config.schema.validate({
+        ssl: {
+          keystore: { path: 'some-path' },
+          truststore: { path: 'another-path' },
+          certificateAuthorities: 'yet-another-path',
+        },
+      })
+    );
+    expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
+    expect(mockReadPkcs12Truststore).toHaveBeenCalledTimes(1);
+    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
+    expect(configValue.ssl.certificateAuthorities).toEqual([
+      'content-of-some-path.ca',
+      'content-of-another-path',
+      'content-of-yet-another-path',
+    ]);
+  });
+
+  it('reads a private key and certificate when ssl.keystore.path is specified', () => {
+    const configValue = createElasticsearchConfig(
+      config.schema.validate({ ssl: { keystore: { path: 'some-path' } } })
+    );
+    expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
+    expect(configValue.ssl.key).toEqual('content-of-some-path.key');
+    expect(configValue.ssl.certificate).toEqual('content-of-some-path.cert');
+  });
+
+  it('reads a private key when ssl.key is specified', () => {
+    const configValue = createElasticsearchConfig(
+      config.schema.validate({ ssl: { key: 'some-path' } })
+    );
+    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
+    expect(configValue.ssl.key).toEqual('content-of-some-path');
+  });
+
+  it('reads a certificate when ssl.certificate is specified', () => {
+    const configValue = createElasticsearchConfig(
+      config.schema.validate({ ssl: { certificate: 'some-path' } })
+    );
+    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
+    expect(configValue.ssl.certificate).toEqual('content-of-some-path');
+  });
+});
+
+describe('throws when config is invalid', () => {
+  beforeAll(() => {
+    const realFs = jest.requireActual('fs');
+    mockReadFileSync.mockImplementation((path: string) => realFs.readFileSync(path));
+    const utils = jest.requireActual('../../utils');
+    mockReadPkcs12Keystore.mockImplementation((path: string, password?: string) =>
+      utils.readPkcs12Keystore(path, password)
+    );
+    mockReadPkcs12Truststore.mockImplementation((path: string, password?: string) =>
+      utils.readPkcs12Truststore(path, password)
+    );
+  });
+
+  it('throws if key is invalid', () => {
+    const value = { ssl: { key: '/invalid/key' } };
+    expect(() =>
+      createElasticsearchConfig(config.schema.validate(value))
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"ENOENT: no such file or directory, open '/invalid/key'"`
+    );
+  });
+
+  it('throws if certificate is invalid', () => {
+    const value = { ssl: { certificate: '/invalid/cert' } };
+    expect(() =>
+      createElasticsearchConfig(config.schema.validate(value))
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"ENOENT: no such file or directory, open '/invalid/cert'"`
+    );
+  });
+
+  it('throws if certificateAuthorities is invalid', () => {
+    const value = { ssl: { certificateAuthorities: '/invalid/ca' } };
+    expect(() =>
+      createElasticsearchConfig(config.schema.validate(value))
+    ).toThrowErrorMatchingInlineSnapshot(`"ENOENT: no such file or directory, open '/invalid/ca'"`);
+  });
+
+  it('throws if keystore path is invalid', () => {
+    const value = { ssl: { keystore: { path: '/invalid/keystore' } } };
+    expect(() =>
+      createElasticsearchConfig(config.schema.validate(value))
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"ENOENT: no such file or directory, open '/invalid/keystore'"`
+    );
+  });
+
+  it('throws if keystore does not contain a key or certificate', () => {
+    mockReadPkcs12Keystore.mockReturnValueOnce({});
+    const value = { ssl: { keystore: { path: 'some-path' } } };
+    expect(() =>
+      createElasticsearchConfig(config.schema.validate(value))
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Did not find key or certificate in Elasticsearch keystore."`
+    );
+  });
+
+  it('throws if truststore path is invalid', () => {
+    const value = { ssl: { keystore: { path: '/invalid/truststore' } } };
+    expect(() =>
+      createElasticsearchConfig(config.schema.validate(value))
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"ENOENT: no such file or directory, open '/invalid/truststore'"`
+    );
+  });
+
+  it('throws if key and keystore.path are both specified', () => {
+    const value = { ssl: { key: 'foo', keystore: { path: 'bar' } } };
+    expect(() => config.schema.validate(value)).toThrowErrorMatchingInlineSnapshot(
+      `"[ssl]: cannot use [key] when [keystore.path] is specified"`
+    );
+  });
+
+  it('throws if certificate and keystore.path are both specified', () => {
+    const value = { ssl: { certificate: 'foo', keystore: { path: 'bar' } } };
+    expect(() => config.schema.validate(value)).toThrowErrorMatchingInlineSnapshot(
+      `"[ssl]: cannot use [certificate] when [keystore.path] is specified"`
+    );
+  });
+});
+
+describe('logs warnings', () => {
+  let logger: ReturnType<typeof loggingServiceMock.create>;
+  let log: Logger;
+
+  beforeAll(() => {
+    mockReadFileSync.mockResolvedValue('foo');
+  });
+
+  beforeEach(() => {
+    logger = loggingServiceMock.create();
+    log = logger.get('config');
+  });
+
+  it('warns if ssl.key is set and ssl.certificate is not', () => {
+    createElasticsearchConfig(config.schema.validate({ ssl: { key: 'some-path' } }), log);
+    expect(loggingServiceMock.collect(logger).warn[0][0]).toMatchInlineSnapshot(
+      `"Detected a key without a certificate; mutual TLS authentication is disabled."`
+    );
+  });
+
+  it('warns if ssl.certificate is set and ssl.key is not', () => {
+    createElasticsearchConfig(config.schema.validate({ ssl: { certificate: 'some-path' } }), log);
+    expect(loggingServiceMock.collect(logger).warn[0][0]).toMatchInlineSnapshot(
+      `"Detected a certificate without a key; mutual TLS authentication is disabled."`
+    );
+  });
 });
 
 test('#username throws if equal to "elastic", only while running from source', () => {
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index 8d92b12ae4a779..815005f65c6e78 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -19,6 +19,8 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import { Duration } from 'moment';
+import { readFileSync } from 'fs';
+import { readPkcs12Keystore, readPkcs12Truststore } from '../../utils';
 import { Logger } from '../logging';
 
 const hostURISchema = schema.uri({ scheme: ['http', 'https'] });
@@ -67,19 +69,39 @@ export const config = {
     pingTimeout: schema.duration({ defaultValue: schema.siblingRef('requestTimeout') }),
     startupTimeout: schema.duration({ defaultValue: '5s' }),
     logQueries: schema.boolean({ defaultValue: false }),
-    ssl: schema.object({
-      verificationMode: schema.oneOf(
-        [schema.literal('none'), schema.literal('certificate'), schema.literal('full')],
-        { defaultValue: 'full' }
-      ),
-      certificateAuthorities: schema.maybe(
-        schema.oneOf([schema.string(), schema.arrayOf(schema.string(), { minSize: 1 })])
-      ),
-      certificate: schema.maybe(schema.string()),
-      key: schema.maybe(schema.string()),
-      keyPassphrase: schema.maybe(schema.string()),
-      alwaysPresentCertificate: schema.boolean({ defaultValue: false }),
-    }),
+    ssl: schema.object(
+      {
+        verificationMode: schema.oneOf(
+          [schema.literal('none'), schema.literal('certificate'), schema.literal('full')],
+          { defaultValue: 'full' }
+        ),
+        certificateAuthorities: schema.maybe(
+          schema.oneOf([schema.string(), schema.arrayOf(schema.string(), { minSize: 1 })])
+        ),
+        certificate: schema.maybe(schema.string()),
+        key: schema.maybe(schema.string()),
+        keyPassphrase: schema.maybe(schema.string()),
+        keystore: schema.object({
+          path: schema.maybe(schema.string()),
+          password: schema.maybe(schema.string()),
+        }),
+        truststore: schema.object({
+          path: schema.maybe(schema.string()),
+          password: schema.maybe(schema.string()),
+        }),
+        alwaysPresentCertificate: schema.boolean({ defaultValue: false }),
+      },
+      {
+        validate: rawConfig => {
+          if (rawConfig.key && rawConfig.keystore.path) {
+            return 'cannot use [key] when [keystore.path] is specified';
+          }
+          if (rawConfig.certificate && rawConfig.keystore.path) {
+            return 'cannot use [certificate] when [keystore.path] is specified';
+          }
+        },
+      }
+    ),
     apiVersion: schema.string({ defaultValue: DEFAULT_API_VERSION }),
     healthCheck: schema.object({ delay: schema.duration({ defaultValue: 2500 }) }),
     ignoreVersionMismatch: schema.boolean({ defaultValue: false }),
@@ -173,7 +195,7 @@ export class ElasticsearchConfig {
    */
   public readonly ssl: Pick<
     SslConfigSchema,
-    Exclude<keyof SslConfigSchema, 'certificateAuthorities'>
+    Exclude<keyof SslConfigSchema, 'certificateAuthorities' | 'keystore' | 'truststore'>
   > & { certificateAuthorities?: string[] };
 
   /**
@@ -183,7 +205,7 @@ export class ElasticsearchConfig {
    */
   public readonly customHeaders: ElasticsearchConfigType['customHeaders'];
 
-  constructor(rawConfig: ElasticsearchConfigType, log?: Logger) {
+  constructor(rawConfig: ElasticsearchConfigType, log: Logger) {
     this.ignoreVersionMismatch = rawConfig.ignoreVersionMismatch;
     this.apiVersion = rawConfig.apiVersion;
     this.logQueries = rawConfig.logQueries;
@@ -202,24 +224,87 @@ export class ElasticsearchConfig {
     this.password = rawConfig.password;
     this.customHeaders = rawConfig.customHeaders;
 
-    const certificateAuthorities = Array.isArray(rawConfig.ssl.certificateAuthorities)
-      ? rawConfig.ssl.certificateAuthorities
-      : typeof rawConfig.ssl.certificateAuthorities === 'string'
-      ? [rawConfig.ssl.certificateAuthorities]
-      : undefined;
+    const { alwaysPresentCertificate, verificationMode } = rawConfig.ssl;
+    const { key, keyPassphrase, certificate, certificateAuthorities } = readKeyAndCerts(rawConfig);
+
+    if (key && !certificate) {
+      log.warn(`Detected a key without a certificate; mutual TLS authentication is disabled.`);
+    } else if (certificate && !key) {
+      log.warn(`Detected a certificate without a key; mutual TLS authentication is disabled.`);
+    }
 
     this.ssl = {
-      ...rawConfig.ssl,
+      alwaysPresentCertificate,
+      key,
+      keyPassphrase,
+      certificate,
       certificateAuthorities,
+      verificationMode,
     };
+  }
+}
+
+const readKeyAndCerts = (rawConfig: ElasticsearchConfigType) => {
+  let key: string | undefined;
+  let keyPassphrase: string | undefined;
+  let certificate: string | undefined;
+  let certificateAuthorities: string[] | undefined;
 
-    if (this.username === 'elastic' && log !== undefined) {
-      // logger is optional / not used during tests
-      // TODO: logger can be removed when issue #40255 is resolved to support deprecations in NP config service
-      log.warn(
-        `Setting the elasticsearch username to "elastic" is deprecated. You should use the "kibana" user instead.`,
-        { tags: ['deprecation'] }
-      );
+  const addCAs = (ca: string[] | undefined) => {
+    if (ca && ca.length) {
+      certificateAuthorities = [...(certificateAuthorities || []), ...ca];
+    }
+  };
+
+  if (rawConfig.ssl.keystore?.path) {
+    const keystore = readPkcs12Keystore(
+      rawConfig.ssl.keystore.path,
+      rawConfig.ssl.keystore.password
+    );
+    if (!keystore.key && !keystore.cert) {
+      throw new Error(`Did not find key or certificate in Elasticsearch keystore.`);
+    }
+    key = keystore.key;
+    certificate = keystore.cert;
+    addCAs(keystore.ca);
+  } else {
+    if (rawConfig.ssl.key) {
+      key = readFile(rawConfig.ssl.key);
+      keyPassphrase = rawConfig.ssl.keyPassphrase;
+    }
+    if (rawConfig.ssl.certificate) {
+      certificate = readFile(rawConfig.ssl.certificate);
     }
   }
-}
+
+  if (rawConfig.ssl.truststore?.path) {
+    const ca = readPkcs12Truststore(
+      rawConfig.ssl.truststore.path,
+      rawConfig.ssl.truststore.password
+    );
+    addCAs(ca);
+  }
+
+  const ca = rawConfig.ssl.certificateAuthorities;
+  if (ca) {
+    const parsed: string[] = [];
+    const paths = Array.isArray(ca) ? ca : [ca];
+    if (paths.length > 0) {
+      for (const path of paths) {
+        parsed.push(readFile(path));
+      }
+      addCAs(parsed);
+    }
+  }
+
+  return {
+    key,
+    keyPassphrase,
+    certificate,
+    certificateAuthorities,
+  };
+};
+
+const readFile = (file: string) => {
+  return readFileSync(file, 'utf8');
+};
diff --git a/src/core/server/elasticsearch/elasticsearch_service.test.ts b/src/core/server/elasticsearch/elasticsearch_service.test.ts
index aefc8b1fdf047e..9f694ac1c46da2 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.test.ts
@@ -196,7 +196,11 @@ Object {
     undefined,
   ],
   "ssl": Object {
+    "alwaysPresentCertificate": undefined,
+    "certificate": undefined,
     "certificateAuthorities": undefined,
+    "key": undefined,
+    "keyPassphrase": undefined,
     "verificationMode": "none",
   },
 }
diff --git a/src/core/server/http/__snapshots__/http_config.test.ts.snap b/src/core/server/http/__snapshots__/http_config.test.ts.snap
index 8856eb95ba722b..28933a035c8709 100644
--- a/src/core/server/http/__snapshots__/http_config.test.ts.snap
+++ b/src/core/server/http/__snapshots__/http_config.test.ts.snap
@@ -67,10 +67,12 @@ Object {
     ],
     "clientAuthentication": "none",
     "enabled": false,
+    "keystore": Object {},
     "supportedProtocols": Array [
       "TLSv1.1",
       "TLSv1.2",
     ],
+    "truststore": Object {},
   },
   "xsrf": Object {
     "disableProtection": false,
@@ -87,24 +89,6 @@ exports[`throws if basepath is not specified, but rewriteBasePath is set 1`] = `
 
 exports[`throws if invalid hostname 1`] = `"[host]: value is [asdf$%^] but it must be a valid hostname (see RFC 1123)."`;
 
-exports[`with TLS should accept known protocols\` 1`] = `
-"[ssl.supportedProtocols.0]: types that failed validation:
-- [ssl.supportedProtocols.0.0]: expected value to equal [TLSv1] but got [SOMEv100500]
-- [ssl.supportedProtocols.0.1]: expected value to equal [TLSv1.1] but got [SOMEv100500]
-- [ssl.supportedProtocols.0.2]: expected value to equal [TLSv1.2] but got [SOMEv100500]"
-`;
-
-exports[`with TLS should accept known protocols\` 2`] = `
-"[ssl.supportedProtocols.3]: types that failed validation:
-- [ssl.supportedProtocols.3.0]: expected value to equal [TLSv1] but got [SOMEv100500]
-- [ssl.supportedProtocols.3.1]: expected value to equal [TLSv1.1] but got [SOMEv100500]
-- [ssl.supportedProtocols.3.2]: expected value to equal [TLSv1.2] but got [SOMEv100500]"
-`;
-
-exports[`with TLS throws if TLS is enabled but \`certificate\` is not specified 1`] = `"[ssl]: must specify [certificate] and [key] when ssl is enabled"`;
-
-exports[`with TLS throws if TLS is enabled but \`key\` is not specified 1`] = `"[ssl]: must specify [certificate] and [key] when ssl is enabled"`;
-
 exports[`with TLS throws if TLS is enabled but \`redirectHttpFromPort\` is equal to \`port\` 1`] = `"Kibana does not accept http traffic to [port] when ssl is enabled (only https is allowed), so [ssl.redirectHttpFromPort] cannot be configured to the same value. Both are [1234]."`;
 
 exports[`with compression accepts valid referrer whitelist 1`] = `
diff --git a/src/core/server/http/http_config.test.ts b/src/core/server/http/http_config.test.ts
index 3dc5fa48bc3665..7ac707b0f3d83e 100644
--- a/src/core/server/http/http_config.test.ts
+++ b/src/core/server/http/http_config.test.ts
@@ -18,7 +18,7 @@
  */
 
 import uuid from 'uuid';
-import { config, HttpConfig } from '.';
+import { config } from '.';
 
 const validHostnames = ['www.example.com', '8.8.8.8', '::1', 'localhost'];
 const invalidHostname = 'asdf$%^';
@@ -108,28 +108,6 @@ test('throws if xsrf.whitelist element does not start with a slash', () => {
 });
 
 describe('with TLS', () => {
-  test('throws if TLS is enabled but `key` is not specified', () => {
-    const httpSchema = config.schema;
-    const obj = {
-      ssl: {
-        certificate: '/path/to/certificate',
-        enabled: true,
-      },
-    };
-    expect(() => httpSchema.validate(obj)).toThrowErrorMatchingSnapshot();
-  });
-
-  test('throws if TLS is enabled but `certificate` is not specified', () => {
-    const httpSchema = config.schema;
-    const obj = {
-      ssl: {
-        enabled: true,
-        key: '/path/to/key',
-      },
-    };
-    expect(() => httpSchema.validate(obj)).toThrowErrorMatchingSnapshot();
-  });
-
   test('throws if TLS is enabled but `redirectHttpFromPort` is equal to `port`', () => {
     const httpSchema = config.schema;
     const obj = {
@@ -143,189 +121,16 @@ describe('with TLS', () => {
     };
     expect(() => httpSchema.validate(obj)).toThrowErrorMatchingSnapshot();
   });
+});
 
-  test('throws if TLS is not enabled but `clientAuthentication` is `optional`', () => {
-    const httpSchema = config.schema;
-    const obj = {
-      port: 1234,
-      ssl: {
-        enabled: false,
-        clientAuthentication: 'optional',
-      },
-    };
-    expect(() => httpSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
-      `"[ssl]: must enable ssl to use [clientAuthentication]"`
-    );
-  });
-
-  test('throws if TLS is not enabled but `clientAuthentication` is `required`', () => {
-    const httpSchema = config.schema;
-    const obj = {
-      port: 1234,
-      ssl: {
-        enabled: false,
-        clientAuthentication: 'required',
-      },
-    };
-    expect(() => httpSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
-      `"[ssl]: must enable ssl to use [clientAuthentication]"`
-    );
-  });
-
-  test('can specify `none` for [clientAuthentication] if ssl is not enabled', () => {
-    const obj = {
-      ssl: {
-        enabled: false,
-        clientAuthentication: 'none',
-      },
-    };
-
-    const configValue = config.schema.validate(obj);
-    expect(configValue.ssl.clientAuthentication).toBe('none');
-  });
-
-  test('can specify single `certificateAuthority` as a string', () => {
-    const obj = {
-      ssl: {
-        certificate: '/path/to/certificate',
-        certificateAuthorities: '/authority/',
-        enabled: true,
-        key: '/path/to/key',
-      },
-    };
-
-    const configValue = config.schema.validate(obj);
-    expect(configValue.ssl.certificateAuthorities).toBe('/authority/');
-  });
-
-  test('can specify socket timeouts', () => {
-    const obj = {
-      keepaliveTimeout: 1e5,
-      socketTimeout: 5e5,
-    };
-    const { keepaliveTimeout, socketTimeout } = config.schema.validate(obj);
-    expect(keepaliveTimeout).toBe(1e5);
-    expect(socketTimeout).toBe(5e5);
-  });
-
-  test('can specify several `certificateAuthorities`', () => {
-    const obj = {
-      ssl: {
-        certificate: '/path/to/certificate',
-        certificateAuthorities: ['/authority/1', '/authority/2'],
-        enabled: true,
-        key: '/path/to/key',
-      },
-    };
-
-    const configValue = config.schema.validate(obj);
-    expect(configValue.ssl.certificateAuthorities).toEqual(['/authority/1', '/authority/2']);
-  });
-
-  test('accepts known protocols`', () => {
-    const httpSchema = config.schema;
-    const singleKnownProtocol = {
-      ssl: {
-        certificate: '/path/to/certificate',
-        enabled: true,
-        key: '/path/to/key',
-        supportedProtocols: ['TLSv1'],
-      },
-    };
-
-    const allKnownProtocols = {
-      ssl: {
-        certificate: '/path/to/certificate',
-        enabled: true,
-        key: '/path/to/key',
-        supportedProtocols: ['TLSv1', 'TLSv1.1', 'TLSv1.2'],
-      },
-    };
-
-    const singleKnownProtocolConfig = httpSchema.validate(singleKnownProtocol);
-    expect(singleKnownProtocolConfig.ssl.supportedProtocols).toEqual(['TLSv1']);
-
-    const allKnownProtocolsConfig = httpSchema.validate(allKnownProtocols);
-    expect(allKnownProtocolsConfig.ssl.supportedProtocols).toEqual(['TLSv1', 'TLSv1.1', 'TLSv1.2']);
-  });
-
-  test('should accept known protocols`', () => {
-    const httpSchema = config.schema;
-
-    const singleUnknownProtocol = {
-      ssl: {
-        certificate: '/path/to/certificate',
-        enabled: true,
-        key: '/path/to/key',
-        supportedProtocols: ['SOMEv100500'],
-      },
-    };
-
-    const allKnownWithOneUnknownProtocols = {
-      ssl: {
-        certificate: '/path/to/certificate',
-        enabled: true,
-        key: '/path/to/key',
-        supportedProtocols: ['TLSv1', 'TLSv1.1', 'TLSv1.2', 'SOMEv100500'],
-      },
-    };
-
-    expect(() => httpSchema.validate(singleUnknownProtocol)).toThrowErrorMatchingSnapshot();
-    expect(() =>
-      httpSchema.validate(allKnownWithOneUnknownProtocols)
-    ).toThrowErrorMatchingSnapshot();
-  });
-
-  test('HttpConfig instance should properly interpret `none` client authentication', () => {
-    const httpConfig = new HttpConfig(
-      config.schema.validate({
-        ssl: {
-          enabled: true,
-          key: 'some-key-path',
-          certificate: 'some-certificate-path',
-          clientAuthentication: 'none',
-        },
-      }),
-      {} as any
-    );
-
-    expect(httpConfig.ssl.requestCert).toBe(false);
-    expect(httpConfig.ssl.rejectUnauthorized).toBe(false);
-  });
-
-  test('HttpConfig instance should properly interpret `optional` client authentication', () => {
-    const httpConfig = new HttpConfig(
-      config.schema.validate({
-        ssl: {
-          enabled: true,
-          key: 'some-key-path',
-          certificate: 'some-certificate-path',
-          clientAuthentication: 'optional',
-        },
-      }),
-      {} as any
-    );
-
-    expect(httpConfig.ssl.requestCert).toBe(true);
-    expect(httpConfig.ssl.rejectUnauthorized).toBe(false);
-  });
-
-  test('HttpConfig instance should properly interpret `required` client authentication', () => {
-    const httpConfig = new HttpConfig(
-      config.schema.validate({
-        ssl: {
-          enabled: true,
-          key: 'some-key-path',
-          certificate: 'some-certificate-path',
-          clientAuthentication: 'required',
-        },
-      }),
-      {} as any
-    );
-
-    expect(httpConfig.ssl.requestCert).toBe(true);
-    expect(httpConfig.ssl.rejectUnauthorized).toBe(true);
-  });
+test('can specify socket timeouts', () => {
+  const obj = {
+    keepaliveTimeout: 1e5,
+    socketTimeout: 5e5,
+  };
+  const { keepaliveTimeout, socketTimeout } = config.schema.validate(obj);
+  expect(keepaliveTimeout).toBe(1e5);
+  expect(socketTimeout).toBe(5e5);
 });
 
 describe('with compression', () => {
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index df357aeaf2731d..df7b4b5af4267b 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -18,11 +18,7 @@
  */
 
 import { Server } from 'http';
-
-jest.mock('fs', () => ({
-  readFileSync: jest.fn(),
-}));
-
+import { readFileSync } from 'fs';
 import supertest from 'supertest';
 
 import { ByteSizeValue, schema } from '@kbn/config-schema';
@@ -39,6 +35,7 @@ import { loggingServiceMock } from '../logging/logging_service.mock';
 import { HttpServer } from './http_server';
 import { Readable } from 'stream';
 import { RequestHandlerContext } from 'kibana/server';
+import { KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 
 const cookieOptions = {
   name: 'sid',
@@ -55,6 +52,14 @@ const loggingService = loggingServiceMock.create();
 const logger = loggingService.get();
 const enhanceWithContext = (fn: (...args: any[]) => any) => fn.bind(null, {});
 
+let certificate: string;
+let key: string;
+
+beforeAll(() => {
+  certificate = readFileSync(KBN_CERT_PATH, 'utf8');
+  key = readFileSync(KBN_KEY_PATH, 'utf8');
+});
+
 beforeEach(() => {
   config = {
     host: '127.0.0.1',
@@ -68,10 +73,10 @@ beforeEach(() => {
     ...config,
     ssl: {
       enabled: true,
-      certificate: '/certificate',
+      certificate,
       cipherSuites: ['cipherSuite'],
       getSecureOptions: () => 0,
-      key: '/key',
+      key,
       redirectHttpFromPort: config.port + 1,
     },
   } as HttpConfig;
diff --git a/src/core/server/http/http_tools.ts b/src/core/server/http/http_tools.ts
index 22468a5b252f42..747fd5a10b168d 100644
--- a/src/core/server/http/http_tools.ts
+++ b/src/core/server/http/http_tools.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { readFileSync } from 'fs';
 import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, Util } from 'hapi';
 import Hoek from 'hoek';
 import { ServerOptions as TLSOptions } from 'https';
@@ -66,14 +65,12 @@ export function getServerOptions(config: HttpConfig, { configureTLS = true } = {
     // TODO: Hapi types have a typo in `tls` property type definition: `https.RequestOptions` is used instead of
     // `https.ServerOptions`, and `honorCipherOrder` isn't presented in `https.RequestOptions`.
     const tlsOptions: TLSOptions = {
-      ca:
-        config.ssl.certificateAuthorities &&
-        config.ssl.certificateAuthorities.map(caFilePath => readFileSync(caFilePath)),
-      cert: readFileSync(ssl.certificate!),
+      ca: ssl.certificateAuthorities,
+      cert: ssl.certificate,
       ciphers: config.ssl.cipherSuites.join(':'),
       // We use the server's cipher order rather than the client's to prevent the BEAST attack.
       honorCipherOrder: true,
-      key: readFileSync(ssl.key!),
+      key: ssl.key,
       passphrase: ssl.keyPassphrase,
       secureOptions: ssl.getSecureOptions(),
       requestCert: ssl.requestCert,
diff --git a/src/core/server/http/ssl_config.test.mocks.ts b/src/core/server/http/ssl_config.test.mocks.ts
new file mode 100644
index 00000000000000..ab98c3a27920c5
--- /dev/null
+++ b/src/core/server/http/ssl_config.test.mocks.ts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const mockReadFileSync = jest.fn();
+jest.mock('fs', () => {
+  return { readFileSync: mockReadFileSync };
+});
+
+export const mockReadPkcs12Keystore = jest.fn();
+export const mockReadPkcs12Truststore = jest.fn();
+jest.mock('../../utils', () => ({
+  readPkcs12Keystore: mockReadPkcs12Keystore,
+  readPkcs12Truststore: mockReadPkcs12Truststore,
+}));
diff --git a/src/core/server/http/ssl_config.test.ts b/src/core/server/http/ssl_config.test.ts
new file mode 100644
index 00000000000000..738f86f7a69eb8
--- /dev/null
+++ b/src/core/server/http/ssl_config.test.ts
@@ -0,0 +1,363 @@
+/*
+ * 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 {
+  mockReadFileSync,
+  mockReadPkcs12Keystore,
+  mockReadPkcs12Truststore,
+} from './ssl_config.test.mocks';
+
+import { sslSchema, SslConfig } from './ssl_config';
+
+describe('#SslConfig', () => {
+  const createConfig = (obj: any) => new SslConfig(sslSchema.validate(obj));
+
+  beforeEach(() => {
+    mockReadFileSync.mockReset();
+    mockReadFileSync.mockImplementation((path: string) => `content-of-${path}`);
+    mockReadPkcs12Keystore.mockReset();
+    mockReadPkcs12Keystore.mockImplementation((path: string) => ({
+      key: `content-of-${path}.key`,
+      cert: `content-of-${path}.cert`,
+      ca: [`content-of-${path}.ca`],
+    }));
+    mockReadPkcs12Truststore.mockReset();
+    mockReadPkcs12Truststore.mockImplementation((path: string) => [`content-of-${path}`]);
+  });
+
+  describe('throws when config is invalid', () => {
+    beforeEach(() => {
+      const realFs = jest.requireActual('fs');
+      mockReadFileSync.mockImplementation((path: string) => realFs.readFileSync(path));
+      const utils = jest.requireActual('../../utils');
+      mockReadPkcs12Keystore.mockImplementation((path: string, password?: string) =>
+        utils.readPkcs12Keystore(path, password)
+      );
+      mockReadPkcs12Truststore.mockImplementation((path: string, password?: string) =>
+        utils.readPkcs12Truststore(path, password)
+      );
+    });
+
+    test('throws if `key` is invalid', () => {
+      const obj = { key: '/invalid/key', certificate: '/valid/certificate' };
+      expect(() => createConfig(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"ENOENT: no such file or directory, open '/invalid/key'"`
+      );
+    });
+
+    test('throws if `certificate` is invalid', () => {
+      mockReadFileSync.mockImplementationOnce((path: string) => `content-of-${path}`);
+      const obj = { key: '/valid/key', certificate: '/invalid/certificate' };
+      expect(() => createConfig(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"ENOENT: no such file or directory, open '/invalid/certificate'"`
+      );
+    });
+
+    test('throws if `certificateAuthorities` is invalid', () => {
+      const obj = { certificateAuthorities: '/invalid/ca' };
+      expect(() => createConfig(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"ENOENT: no such file or directory, open '/invalid/ca'"`
+      );
+    });
+
+    test('throws if `keystore.path` is invalid', () => {
+      const obj = { keystore: { path: '/invalid/keystore' } };
+      expect(() => createConfig(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"ENOENT: no such file or directory, open '/invalid/keystore'"`
+      );
+    });
+
+    test('throws if `keystore.path` does not contain a private key', () => {
+      mockReadPkcs12Keystore.mockImplementation((path: string, password?: string) => ({
+        key: undefined,
+        certificate: 'foo',
+      }));
+      const obj = { keystore: { path: 'some-path' } };
+      expect(() => createConfig(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"Did not find private key in keystore at [keystore.path]."`
+      );
+    });
+
+    test('throws if `keystore.path` does not contain a certificate', () => {
+      mockReadPkcs12Keystore.mockImplementation((path: string, password?: string) => ({
+        key: 'foo',
+        certificate: undefined,
+      }));
+      const obj = { keystore: { path: 'some-path' } };
+      expect(() => createConfig(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"Did not find certificate in keystore at [keystore.path]."`
+      );
+    });
+
+    test('throws if `truststore.path` is invalid', () => {
+      const obj = { truststore: { path: '/invalid/truststore' } };
+      expect(() => createConfig(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"ENOENT: no such file or directory, open '/invalid/truststore'"`
+      );
+    });
+  });
+
+  describe('reads files', () => {
+    it('reads certificate authorities when `keystore.path` is specified', () => {
+      const configValue = createConfig({ keystore: { path: 'some-path' } });
+      expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
+      expect(configValue.certificateAuthorities).toEqual(['content-of-some-path.ca']);
+    });
+
+    it('reads certificate authorities when `truststore.path` is specified', () => {
+      const configValue = createConfig({ truststore: { path: 'some-path' } });
+      expect(mockReadPkcs12Truststore).toHaveBeenCalledTimes(1);
+      expect(configValue.certificateAuthorities).toEqual(['content-of-some-path']);
+    });
+
+    it('reads certificate authorities when `certificateAuthorities` is specified', () => {
+      let configValue = createConfig({ certificateAuthorities: 'some-path' });
+      expect(mockReadFileSync).toHaveBeenCalledTimes(1);
+      expect(configValue.certificateAuthorities).toEqual(['content-of-some-path']);
+
+      mockReadFileSync.mockClear();
+      configValue = createConfig({ certificateAuthorities: ['some-path'] });
+      expect(mockReadFileSync).toHaveBeenCalledTimes(1);
+      expect(configValue.certificateAuthorities).toEqual(['content-of-some-path']);
+
+      mockReadFileSync.mockClear();
+      configValue = createConfig({ certificateAuthorities: ['some-path', 'another-path'] });
+      expect(mockReadFileSync).toHaveBeenCalledTimes(2);
+      expect(configValue.certificateAuthorities).toEqual([
+        'content-of-some-path',
+        'content-of-another-path',
+      ]);
+    });
+
+    it('reads certificate authorities when `keystore.path`, `truststore.path`, and `certificateAuthorities` are specified', () => {
+      const configValue = createConfig({
+        keystore: { path: 'some-path' },
+        truststore: { path: 'another-path' },
+        certificateAuthorities: 'yet-another-path',
+      });
+      expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
+      expect(mockReadPkcs12Truststore).toHaveBeenCalledTimes(1);
+      expect(mockReadFileSync).toHaveBeenCalledTimes(1);
+      expect(configValue.certificateAuthorities).toEqual([
+        'content-of-some-path.ca',
+        'content-of-another-path',
+        'content-of-yet-another-path',
+      ]);
+    });
+
+    it('reads a private key and certificate when `keystore.path` is specified', () => {
+      const configValue = createConfig({ keystore: { path: 'some-path' } });
+      expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
+      expect(configValue.key).toEqual('content-of-some-path.key');
+      expect(configValue.certificate).toEqual('content-of-some-path.cert');
+    });
+
+    it('reads a private key and certificate when `key` and `certificate` are specified', () => {
+      const configValue = createConfig({ key: 'some-path', certificate: 'another-path' });
+      expect(mockReadFileSync).toHaveBeenCalledTimes(2);
+      expect(configValue.key).toEqual('content-of-some-path');
+      expect(configValue.certificate).toEqual('content-of-another-path');
+    });
+  });
+});
+
+describe('#sslSchema', () => {
+  describe('throws when config is invalid', () => {
+    test('throws if both `key` and `keystore.path` are specified', () => {
+      const obj = {
+        key: '/path/to/key',
+        keystore: {
+          path: 'path/to/keystore',
+        },
+      };
+      expect(() => sslSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"cannot use [key] when [keystore.path] is specified"`
+      );
+    });
+
+    test('throws if both `certificate` and `keystore.path` are specified', () => {
+      const obj = {
+        certificate: '/path/to/certificate',
+        keystore: {
+          path: 'path/to/keystore',
+        },
+      };
+      expect(() => sslSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"cannot use [certificate] when [keystore.path] is specified"`
+      );
+    });
+
+    test('throws if TLS is enabled but `certificate` is specified and `key` is not', () => {
+      const obj = {
+        certificate: '/path/to/certificate',
+        enabled: true,
+      };
+      expect(() => sslSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"must specify [certificate] and [key] -- or [keystore.path] -- when ssl is enabled"`
+      );
+    });
+
+    test('throws if TLS is enabled but `key` is specified and `certificate` is not', () => {
+      const obj = {
+        enabled: true,
+        key: '/path/to/key',
+      };
+      expect(() => sslSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"must specify [certificate] and [key] -- or [keystore.path] -- when ssl is enabled"`
+      );
+    });
+
+    test('throws if TLS is enabled but `key`, `certificate`, and `keystore.path` are not specified', () => {
+      const obj = {
+        enabled: true,
+      };
+      expect(() => sslSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"must specify [certificate] and [key] -- or [keystore.path] -- when ssl is enabled"`
+      );
+    });
+
+    test('throws if TLS is not enabled but `clientAuthentication` is `optional`', () => {
+      const obj = {
+        enabled: false,
+        clientAuthentication: 'optional',
+      };
+      expect(() => sslSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"must enable ssl to use [clientAuthentication]"`
+      );
+    });
+
+    test('throws if TLS is not enabled but `clientAuthentication` is `required`', () => {
+      const obj = {
+        enabled: false,
+        clientAuthentication: 'required',
+      };
+      expect(() => sslSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+        `"must enable ssl to use [clientAuthentication]"`
+      );
+    });
+  });
+
+  describe('#supportedProtocols', () => {
+    test('accepts known protocols`', () => {
+      const singleKnownProtocol = {
+        certificate: '/path/to/certificate',
+        enabled: true,
+        key: '/path/to/key',
+        supportedProtocols: ['TLSv1'],
+      };
+
+      const allKnownProtocols = {
+        certificate: '/path/to/certificate',
+        enabled: true,
+        key: '/path/to/key',
+        supportedProtocols: ['TLSv1', 'TLSv1.1', 'TLSv1.2'],
+      };
+
+      const singleKnownProtocolConfig = sslSchema.validate(singleKnownProtocol);
+      expect(singleKnownProtocolConfig.supportedProtocols).toEqual(['TLSv1']);
+
+      const allKnownProtocolsConfig = sslSchema.validate(allKnownProtocols);
+      expect(allKnownProtocolsConfig.supportedProtocols).toEqual(['TLSv1', 'TLSv1.1', 'TLSv1.2']);
+    });
+
+    test('rejects unknown protocols`', () => {
+      const singleUnknownProtocol = {
+        certificate: '/path/to/certificate',
+        enabled: true,
+        key: '/path/to/key',
+        supportedProtocols: ['SOMEv100500'],
+      };
+
+      const allKnownWithOneUnknownProtocols = {
+        certificate: '/path/to/certificate',
+        enabled: true,
+        key: '/path/to/key',
+        supportedProtocols: ['TLSv1', 'TLSv1.1', 'TLSv1.2', 'SOMEv100500'],
+      };
+
+      expect(() => sslSchema.validate(singleUnknownProtocol)).toThrowErrorMatchingInlineSnapshot(`
+"[supportedProtocols.0]: types that failed validation:
+- [supportedProtocols.0.0]: expected value to equal [TLSv1] but got [SOMEv100500]
+- [supportedProtocols.0.1]: expected value to equal [TLSv1.1] but got [SOMEv100500]
+- [supportedProtocols.0.2]: expected value to equal [TLSv1.2] but got [SOMEv100500]"
+`);
+      expect(() => sslSchema.validate(allKnownWithOneUnknownProtocols))
+        .toThrowErrorMatchingInlineSnapshot(`
+"[supportedProtocols.3]: types that failed validation:
+- [supportedProtocols.3.0]: expected value to equal [TLSv1] but got [SOMEv100500]
+- [supportedProtocols.3.1]: expected value to equal [TLSv1.1] but got [SOMEv100500]
+- [supportedProtocols.3.2]: expected value to equal [TLSv1.2] but got [SOMEv100500]"
+`);
+    });
+  });
+
+  describe('#clientAuthentication', () => {
+    test('can specify `none` client authentication when ssl is not enabled', () => {
+      const obj = {
+        enabled: false,
+        clientAuthentication: 'none',
+      };
+
+      const configValue = sslSchema.validate(obj);
+      expect(configValue.clientAuthentication).toBe('none');
+    });
+
+    test('should properly interpret `none` client authentication when ssl is enabled', () => {
+      const sslConfig = new SslConfig(
+        sslSchema.validate({
+          enabled: true,
+          key: 'some-key-path',
+          certificate: 'some-certificate-path',
+          clientAuthentication: 'none',
+        })
+      );
+
+      expect(sslConfig.requestCert).toBe(false);
+      expect(sslConfig.rejectUnauthorized).toBe(false);
+    });
+
+    test('should properly interpret `optional` client authentication when ssl is enabled', () => {
+      const sslConfig = new SslConfig(
+        sslSchema.validate({
+          enabled: true,
+          key: 'some-key-path',
+          certificate: 'some-certificate-path',
+          clientAuthentication: 'optional',
+        })
+      );
+
+      expect(sslConfig.requestCert).toBe(true);
+      expect(sslConfig.rejectUnauthorized).toBe(false);
+    });
+
+    test('should properly interpret `required` client authentication when ssl is enabled', () => {
+      const sslConfig = new SslConfig(
+        sslSchema.validate({
+          enabled: true,
+          key: 'some-key-path',
+          certificate: 'some-certificate-path',
+          clientAuthentication: 'required',
+        })
+      );
+
+      expect(sslConfig.requestCert).toBe(true);
+      expect(sslConfig.rejectUnauthorized).toBe(true);
+    });
+  });
+});
diff --git a/src/core/server/http/ssl_config.ts b/src/core/server/http/ssl_config.ts
index 55d6ebff93ce78..0096eeb0925658 100644
--- a/src/core/server/http/ssl_config.ts
+++ b/src/core/server/http/ssl_config.ts
@@ -19,6 +19,8 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import crypto from 'crypto';
+import { readFileSync } from 'fs';
+import { readPkcs12Keystore, readPkcs12Truststore } from '../../utils';
 
 // `crypto` type definitions doesn't currently include `crypto.constants`, see
 // https://github.com/DefinitelyTyped/DefinitelyTyped/blob/fa5baf1733f49cf26228a4e509914572c1b74adf/types/node/v6/index.d.ts#L3412
@@ -44,6 +46,14 @@ export const sslSchema = schema.object(
     }),
     key: schema.maybe(schema.string()),
     keyPassphrase: schema.maybe(schema.string()),
+    keystore: schema.object({
+      path: schema.maybe(schema.string()),
+      password: schema.maybe(schema.string()),
+    }),
+    truststore: schema.object({
+      path: schema.maybe(schema.string()),
+      password: schema.maybe(schema.string()),
+    }),
     redirectHttpFromPort: schema.maybe(schema.number()),
     supportedProtocols: schema.arrayOf(
       schema.oneOf([schema.literal('TLSv1'), schema.literal('TLSv1.1'), schema.literal('TLSv1.2')]),
@@ -56,8 +66,16 @@ export const sslSchema = schema.object(
   },
   {
     validate: ssl => {
-      if (ssl.enabled && (!ssl.key || !ssl.certificate)) {
-        return 'must specify [certificate] and [key] when ssl is enabled';
+      if (ssl.key && ssl.keystore.path) {
+        return 'cannot use [key] when [keystore.path] is specified';
+      }
+
+      if (ssl.certificate && ssl.keystore.path) {
+        return 'cannot use [certificate] when [keystore.path] is specified';
+      }
+
+      if (ssl.enabled && (!ssl.key || !ssl.certificate) && !ssl.keystore.path) {
+        return 'must specify [certificate] and [key] -- or [keystore.path] -- when ssl is enabled';
       }
 
       if (!ssl.enabled && ssl.clientAuthentication !== 'none') {
@@ -88,14 +106,49 @@ export class SslConfig {
   constructor(config: SslConfigType) {
     this.enabled = config.enabled;
     this.redirectHttpFromPort = config.redirectHttpFromPort;
-    this.key = config.key;
-    this.certificate = config.certificate;
-    this.certificateAuthorities = this.initCertificateAuthorities(config.certificateAuthorities);
-    this.keyPassphrase = config.keyPassphrase;
     this.cipherSuites = config.cipherSuites;
     this.supportedProtocols = config.supportedProtocols;
     this.requestCert = config.clientAuthentication !== 'none';
     this.rejectUnauthorized = config.clientAuthentication === 'required';
+
+    const addCAs = (ca: string[] | undefined) => {
+      if (ca && ca.length) {
+        this.certificateAuthorities = [...(this.certificateAuthorities || []), ...ca];
+      }
+    };
+
+    if (config.keystore?.path) {
+      const { key, cert, ca } = readPkcs12Keystore(config.keystore.path, config.keystore.password);
+      if (!key) {
+        throw new Error(`Did not find private key in keystore at [keystore.path].`);
+      } else if (!cert) {
+        throw new Error(`Did not find certificate in keystore at [keystore.path].`);
+      }
+      this.key = key;
+      this.certificate = cert;
+      addCAs(ca);
+    } else if (config.key && config.certificate) {
+      this.key = readFile(config.key);
+      this.keyPassphrase = config.keyPassphrase;
+      this.certificate = readFile(config.certificate);
+    }
+
+    if (config.truststore?.path) {
+      const ca = readPkcs12Truststore(config.truststore.path, config.truststore.password);
+      addCAs(ca);
+    }
+
+    const ca = config.certificateAuthorities;
+    if (ca) {
+      const parsed: string[] = [];
+      const paths = Array.isArray(ca) ? ca : [ca];
+      if (paths.length > 0) {
+        for (const path of paths) {
+          parsed.push(readFile(path));
+        }
+        addCAs(parsed);
+      }
+    }
   }
 
   /**
@@ -117,12 +170,8 @@ export class SslConfig {
         : secureOptions | secureOption; // eslint-disable-line no-bitwise
     }, 0);
   }
-
-  private initCertificateAuthorities(certificateAuthorities?: string[] | string) {
-    if (certificateAuthorities === undefined || Array.isArray(certificateAuthorities)) {
-      return certificateAuthorities;
-    }
-
-    return [certificateAuthorities];
-  }
 }
+
+const readFile = (file: string) => {
+  return readFileSync(file, 'utf8');
+};
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index e41f045622a42c..72934175f96e5a 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -888,7 +888,7 @@ export type KibanaResponseFactory = typeof kibanaResponseFactory;
 
 // @public
 export const kibanaResponseFactory: {
-    custom: <T extends string | Error | Record<string, any> | Buffer | Stream | {
+    custom: <T extends string | Error | Buffer | Stream | Record<string, any> | {
         message: string | Error;
         attributes?: Record<string, any> | undefined;
     } | undefined>(options: CustomHttpResponseOptions<T>) => KibanaResponse<T>;
@@ -899,9 +899,9 @@ export const kibanaResponseFactory: {
     conflict: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
     internalError: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
     customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<ResponseError>;
-    redirected: (options: RedirectResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
-    ok: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
-    accepted: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
+    redirected: (options: RedirectResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
+    ok: (options?: HttpResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
+    accepted: (options?: HttpResponseOptions) => KibanaResponse<string | Buffer | Stream | Record<string, any>>;
     noContent: (options?: HttpResponseOptions) => KibanaResponse<undefined>;
 };
 
diff --git a/src/core/utils/crypto/__fixtures__/README.md b/src/core/utils/crypto/__fixtures__/README.md
new file mode 100644
index 00000000000000..2652b16c420f0c
--- /dev/null
+++ b/src/core/utils/crypto/__fixtures__/README.md
@@ -0,0 +1,44 @@
+# PKCS12 Test Fixtures
+
+These PKCS12 files are used to test different scenarios. Each has an empty password.
+
+Including `-noiter` uses a single encryption iteration, and `-nomaciter` uses a single MAC verification iteration.
+This makes each P12 keystore much quicker to parse.
+
+Commands to generate files:
+
+```shell
+# Generate a PKCS12 file with an EE cert and CA cert, but no EE key
+cat elasticsearch.crt ca.crt | openssl pkcs12 -export -noiter -nomaciter -passout pass: -nokeys -out no_key.p12
+
+# Generate a PKCS12 file with an EE key and EE cert, but no CA cert
+cat elasticsearch.key elasticsearch.crt | openssl pkcs12 -export -noiter -nomaciter -passout pass: -out no_ca.p12
+
+# Generate a PKCS12 file with an EE key, EE cert, and two CA certs
+cat elasticsearch.key elasticsearch.crt ca.crt ca.crt | openssl pkcs12 -export -noiter -nomaciter -passout pass: -out two_cas.p12
+
+# Generate a PKCS12 file with two EE keys and EE certs
+cat elasticsearch.key elasticsearch.crt | openssl pkcs12 -export -noiter -nomaciter -passout pass: -out two_keys.p12
+cat kibana.key kibana.crt | openssl pkcs12 -export -noiter -nomaciter -passout pass: -name 2 -out tmp.p12
+keytool -importkeystore -srckeystore tmp.p12 -srcstorepass '' -destkeystore two_keys.p12 -deststorepass '' -deststoretype PKCS12
+rm tmp.p12
+```
+
+No commonly available tools seem to be able to generate a PKCS12 file with a key and no certificate, so we use node-forge to do that:
+
+```js
+const utils = require('@kbn/dev-utils');
+const forge = require('node-forge');
+const fs = require('fs');
+
+const pemCA = fs.readFileSync(utils.CA_CERT_PATH, 'utf8');
+const pemKey = fs.readFileSync(utils.ES_KEY_PATH, 'utf8');
+const privateKey = forge.pki.privateKeyFromPem(pemKey);
+
+const p12Asn = forge.pkcs12.toPkcs12Asn1(privateKey, pemCA, null, {
+  useMac: false,
+  generateLocalKeyId: false,
+});
+const p12Der = forge.asn1.toDer(p12Asn).getBytes();
+fs.writeFileSync('no_cert.p12', p12Der, { encoding: 'binary' });
+```
diff --git a/src/core/utils/crypto/__fixtures__/index.ts b/src/core/utils/crypto/__fixtures__/index.ts
new file mode 100644
index 00000000000000..12481963ff4f63
--- /dev/null
+++ b/src/core/utils/crypto/__fixtures__/index.ts
@@ -0,0 +1,26 @@
+/*
+ * 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 { resolve } from 'path';
+
+export const NO_CA_PATH = resolve(__dirname, './no_ca.p12');
+export const NO_CERT_PATH = resolve(__dirname, './no_cert.p12');
+export const NO_KEY_PATH = resolve(__dirname, './no_key.p12');
+export const TWO_CAS_PATH = resolve(__dirname, './two_cas.p12');
+export const TWO_KEYS_PATH = resolve(__dirname, './two_keys.p12');
diff --git a/src/core/utils/crypto/__fixtures__/no_ca.p12 b/src/core/utils/crypto/__fixtures__/no_ca.p12
new file mode 100644
index 0000000000000000000000000000000000000000..1e6df9a0f71c54158e7dbf3b6cad2a062ae3a9d0
GIT binary patch
literal 2431
zcmV-_34r!6f(d&90Ru3C2}K48Duzgg_YDCD0ic2jHUxqRGBAP(E--=v<^~BWhDe6@
z4FLxRpn?O}FoFZq0s#Opf&<J32`Yw2hW8Bt2LUh}1_~;MNQU<f0So~KFbxC<mq(R*
zsMNw!0s#Slf&-ueJ9Xn@gchq~?3$VW3;qU%GD>f6{CsJ8i+woJ?xO6vK~K|b#Vxp*
zl`5wMks(O+tZF|S@3$t8@y85^7sZ7T=<7JyG$M#kq2XCl+94oUMkA?qLCWL10jVFI
zq~_RgIZGtx5#k@{pfyD?0B70y0j{_U^`rNw=W38>`psD~D(fE8b!3v1^b>8%&L2EI
zuWwNT0(dENad3^sjaDT5!aq-^FOE>MXpyg~e1_Q712dh5Ef<#_f@aO}<}5UZAN-#1
zJk^+)`)(1rvPccSVR9H=ZIz$e!$=LqFhDuh4YS)$jS-RP;s^auLoEtCIG3m;KG&1T
z<U=@hiD&4oG<kniw06YOSV@Hu$N8nV6%gI^WVZi&&G=_ReIw0F16S2$2N0c-uZXJZ
zl|(S&H!#3kdg)>Wl<|W>($(n?q5qsQx1$$WE=Ts_bk&Y5{#`bTXXhM9!bw@1Tu~nJ
zL1PUaprg4>dW6IhcCZf?F(7+Se};^|lyKT@Yj~+LbZDH^UEYB&wO?Aoh(A@f5i$d(
zzw<vU*<1)gkx*>?q_nwmil?4j$7pdF-g<D{5Oe(6#r};Ts?DlDBb$4!_hLWKKgbr5
zOf(aXD`j|L7~US-#Ez34j81Vwa@u8k;ibjwxPoE*jXb3|PlG=g^Fw817?F`wJScGc
zVy9!~%3}+AayjWCwk;lk9~Fa(RpsgG)Zozro?1(FJF#7_o3K!umougQXi_(rc+r`0
zZfrZG;O??2@U#FG|9f`ftCRDsiy-#WZX<APLU=P6ch_JNVBe#`6g?8Pg2$NMg1tn>
z(Wn7cuIGBFP@TgM+jsRJEael`G2(a&i8`J_qR5)177v2y=AstDTvw0()yMeZOtD!-
zYH-@&@)7QfRq=_#$O(oq|GOfHA)U%SnC2(!RW4864jHrqV>{0k(Zck*0~bXv&(Y4%
zb|-dj&hC=zk$#4a-u;+4%mJ~;rtoDr5M{Cv_R01|DVYms{N>t6bnu!dfg96fBX$<f
zc@Hdy9R{nOET$M!$k{dEw5xvNi<S=-$aWyrEHj~Am=q(*t-;CT{e(BrwOmr>Rdcr$
zGi;oCbAV-(K_Q&#I8h*I8=7h;aHSUQ=Q}1rr{^>wo;)_kZQ5tA3)k%Mtde*lkbm*j
zE9=j45Umf<*C&5~DH1B-Pm1=91BB{Z!VpwUva~|?X84H5r~vkQHg{9nWNyY({wtAX
zy32Ghf(1YZ2`Yw2hW8Bt2LYgh1u+DI1uZaw1t~Cs1tkUxDuzgg_YDCI3IPJ3f&}d_
zf&}R>8wLt0hDe6@4FL=R127E)2#GVEfDVCo!vX;T1cC&}9Mo^8jBlJ~*lzO(a^P@k
zk5!9xL?^hr1aFD_zj6%t33?_i42)#GXq>tC+{=abs<vrRPDJ?hz3~N!S#H!T!xGBS
zu;qHO%u_l_3VVc*|E8XYlrCBbF-=8gJ~j|Ev&X*RV{mhz=Q)j{ov0~O-u7O0whcn2
zt*Q*Z1qN}&`Pt(`$Z^nbTV%v6(siZkd7=#KP6mf~!wszp;K&dcECG$+T3rLx0&v{T
zOL`H^^<fe<uLo3H&GP=4l9i+GM6?W{r`aGr%v5))%9K5v7JQYLG;S?JCYyfJ{~@}z
z{DwmF$f<W_m`tl)hmLb*r6OOd8IbD0IE(Ext8Zcw`cFL%fgT!GF0Z9`aoE<<haoc5
z9=1pUZckECf>J5IC_i+`Mth;mVUsSK77kwC{+Lb6!N=*+prUZhh$ojLZd<%mnmdzC
zK>EDIg-ff(mO!XX^U2;TA8t2vt4(Vyl#wtI{^m)`vC&hZ!uE`teNz(oKBQ>VOXzX{
zi<aee*vf<r3a_Ij!fUM$F*W!E_!}NoqZUO9T6#<PLlv+9W9VmmNgRA54YtBpCBln5
z%q4AeI8T>r7BA^UTIs6Nc}w3Aa%arckMqrQ`|ejb;WX#VEh-R`D7~@GGFE-U$5mb3
zYJLpbDMDe_X=r0B>n^5D5Shy7%RLS&E;%(Xw|1U(-#G=p1$^>bPg-y&gUVV4{AK=(
zoG$7-kO~jRCou4}kQU<%6{4)TUn9iA#4j@Uu)+ihrv84`J_%N!>Xa7`+UnTyg<-ek
zOR2PLWRQv8r%mIRMP#y99`ye-|4AG7Kg(KgO6cPp>Rc62z`^s~fg@js>JepzFv^1a
z2(IEoq<Ds&GWPh3<|{1=g3l^bm^;W+UraZ={z59E5Z9&M+4bLzfFmij7Br~yA&g%`
z?k4@dO!=ggvqmxxB_cH=yx3`!{Y#!v^SjsF7G^K5t~Ne|rQ?(0Bt0APaMIcdJ`GZG
z+ao?xdEx0>LGH+erwlV0%!HZ6J8%-R^)w=D(^7APA?m=?6p7oI`+<7bF*;EZAyWJF
zz79yc^X7BzJwE6nutj#sh>S<DydT{C-C2roa)`REvm+FTYPuWW%AvNxOCP*W+`URj
zu24S~fCuMnTFjllsHr00_9iO+Cv+eKoKZx1SuF6qS%5+&g(Gc3kw;#`qgXA(_&uQm
z)O)=!lCDLO-xQQ0KzM{_7U?YQ%N2g<4L6@r=gpmLmPMunsR3=-d>IVG4s13^&E@!C
zhjU)I(z*}m8Y*>JM;Ut9R;IiJDe>0!d|68bi@swvEe;%O7y_)aE>=5QiUNy|Xw25-
z@p^>A=kM7l06_ZI2<ik6sMLD~tj%q;cNdEo#>$qZ_a)|`|2i4a$-12~@pgvD;79#N
zy>5VX^lR|v-#}MBRY9MrL7-E=@&Wo_uA^Wfgd79_5ZEj~sO0H<i78=Aap+&a%Jzb5
zv2Oi4^p8U6EY6OPC6~l7tV<fVxk};$WBA?TI3e~$nEq1yWko8N2++I=CQaGoN<N=a
zS(bYP>$$*WrLbX7qnhs`f`n7m_t4V>RtIlgS&)ma>~!(G;^1bMq@RX6^~~lT<5zlA
zLM;Y8SR7uIjrP<`F(oh~1_>&LNQU<f0SOf`76cSQs?1A+;am#|uczQ!%jph%KbZM2
xEifT42?hl#4g&%j1povTq*oeEB=lU%odAlNV9OG6B%XyB1PER6^hGug_oDCQg3$l~

literal 0
HcmV?d00001

diff --git a/src/core/utils/crypto/__fixtures__/no_cert.p12 b/src/core/utils/crypto/__fixtures__/no_cert.p12
new file mode 100644
index 0000000000000000000000000000000000000000..8453fe878e7856f2a81e2ccd3cd993a7bf4c1d94
GIT binary patch
literal 2217
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
Y+O+M*U(VxtMLiQ(VR`&~z7W9wAJcfnG5`Po

literal 0
HcmV?d00001

diff --git a/src/core/utils/crypto/__fixtures__/no_key.p12 b/src/core/utils/crypto/__fixtures__/no_key.p12
new file mode 100644
index 0000000000000000000000000000000000000000..1bffb7a301b2e12fea69955d1d614f96b7060997
GIT binary patch
literal 1939
zcmV;E2W<E-f(MTR0Ru3C2U!LQDuzgg_YDCD0ic2hN(6!jMlga0LNI~{J_ZRYhDe6@
z4FLxRpn?Z4FoFjw0s#Opf(Il92`Yw2hW8Bt2LUh}1_~;MNQU<f0So~KFbxC<5%V5D
zZP_al0s#Slf(H1CBZRL$1-27m%SN$pV9ykVqR5Y`<abhspU19a(hz9%0iX~`C_#aX
zZLTH9U0x%WLQho4dY4Qkuv3IYH8gwWTC;^W2Yd_7eywxGo7xB|vZu5yp@cpLGoGQ%
zS|%yq1@2>r_(Ae65v_1U(@7bg`*ly_2ww2WB|7)w@afGwXOhO62PG+^SLX4L{qwi%
zjIru@{0Y(kOE9^p5{B~|`}&pDPo$tc!cpH(VH<Z$A=>2RTnznhj{>3FSun6%x;TT2
z2oN7o%#jgO(NI&6*u`opu`38ebYWK*cd!_)N7c1t$(;c?7qL6$9XMcDI37CXL%4`b
zYng_~z*n?3MIl%2j7m#=CQOk}xho-w^6+uSc;@3q1Yn^gv3=^vpth42S5@ue9d^s#
zQe-L}qDZ71y4@(}2a7u_i0p^}nHU&5-sV8vE@GBI$H_G9c{d_%IkDyXTiN{RI_Ie+
zl6`EddG08CY_V0p&h)+ovibv6Qy&Dkg`4bWoN17^vrp~fE#|ZKlDvZAWDh_;V}4?6
z){2~Vx!Z^r&^zDU(c!Q-_60H~wirK;Gog@(H;kzeell^gMrZgv=K$F{tSEbaVrkGw
zI*YmJ2BxMsmnd`ML1^S7^@Jx%tq6B({w#qTYoYNk*roB4@=PNAuuQuF6{J4vJ7Uy5
zcTP=rRAGvb!T*!rL+Qchqkm;Xl%0us1KFNDlIPXngy>k}um`%>NoL_2(gGi7`_2<x
zgsTF7J{)-0I6wx?Da`l#7t9onIrX>8CvYhlav7n8?H(1<yM+6Dw<8)cZhVN<L)000
z!&l(BAX$-a)N?z|tpG@x##B<m^gPlKCG&?6hV&NW2rKuzG)E##k88<j4kkV8+r(v5
z=Cmhb?Wk=_(1k|h<&m$srAj4*aeC-VhWWv~#uXFntVydNH=@f!hYq*HK@e?dcdwc+
zI~F|8tr@EgX8p60euddctSL;D<=6*qbGNg&p3BBPW6*>Pjj%W>#F!$<N}-gTGore&
zak&0F@h`(oUi1*Iggh+@@&dE%c1%CDj}ls2^`3dYaR76&{}-X)-><-7Lx)&cfKLTe
zB^0Pnmofbj3Wq}Ndq*u5GCch<LOU`7iGSu@C>wQWNYLC43zcbD_=+$PRF&eMhDSuy
zZM!bU_@DT)rI1wEaTSHEIuA4ZyAEBawsCzxi0${cT})z=>~NWUA114WZnjPED(boR
z41RrQ3OuhPM{>A+Y)SPQvt2@zLbJBcN7a&8Cmuu{UX8In${w{a`4ByrPJK!!xNge5
z6rBxH8Bqd1=-ei{i50j<61}#MZPE+TBG?KGxHSBZTT%$$@!HoN$uHN9na*VY;P`Ah
zT@UR7w*h<fA6}D2Az44x+y=rd0N<)%M4y`rNS={?R*|_9EXe&^dqgveWdYvJK^7^)
zssX9y6S6<#rR_kI0PDV*3nu>@jAcLXS&?d&v8igGB-Yl%JYvDtZNRYZjve;Td85my
zen(lH&vHmun`hbnib^(nj7qgLV_xM9h^`2(x5=V_x$gzaKj0HV#&3g`Ht^n%+rB6C
z{j$WK)dtSP!UV`zc-f^OKGbzP;o`*o1;UdQKnT_EayMzFa=F93XU4VqKTGl)O92IW
zfF1F6cvD4~H^ku2va87okjWyDJGIE?Np`|PDdeDu24sFuSdj(WVOOzCg2o}=u$YLL
z44s)}b4>uGPa`rTtn{U|rH;V!YeV0>)w?d}x*X6<(jNqhFWHwPFuRG<3;yL-XPdJB
zd^_<0q8Nuii$3Bm3?#}&iQXP&i3Wxm?nYlw;GdMlE1#mW^tK932rjv-f?c{V-0RZ)
zgXnovOE|PLJm+WAyP-47Y3IGCy~p9rj4@d>4=NyX^)P(;fRdlD=<Rf^5*jWfuS<Xs
zgIU{B9rEG6o^Q}SkzD(S1Eh*<_tyJqX+Sb*nLJyv_1cT)-Tr>~zGzc70rfW<ea`FG
z+3*-9ZWz&3y|-Dq7J!qUgMJKeU)3lKTYhm^A~$j{(oO8SmxP)Mn*9cucK?{fG)!g}
zJBD<CyX9WUd-*&u5|#?)I!kJI?U=!84al=KU(2HHXzNit!0YjU=a&lun$&bO_b#_%
zI$(_>=3WwR)-PC#Z;`Z%4+&B6-$Ej%KZa!~RFrGNVwJ*u3Nh<T@)6yWa;-i+^IZ!d
zmO9rtzS+ExrFD4@h9EYNby2yL#F@G^8M?j98CCyAD<&k>)d&1}uB>VUs7dUdyQ0ai
zXW&M}oRLiWnOW-sn_>AlTSjBB2a7a8fME$WW>Gh9$1}zl3<(Pk*(x}rlEn3x8BvL*
z61gPOsW5~vWy#vL&TCZ}H5y_sRY!vkOaTKhEifT42?hl#4g&%j1povTMY%SG6m!hQ
ZETkc{C_ohZo?Bmz1PH?Q6<RDL8_N`Sm$?7{

literal 0
HcmV?d00001

diff --git a/src/core/utils/crypto/__fixtures__/two_cas.p12 b/src/core/utils/crypto/__fixtures__/two_cas.p12
new file mode 100644
index 0000000000000000000000000000000000000000..25784a6fb9a948654c0686ff087d1eed975f9b7e
GIT binary patch
literal 4215
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
N1PC_-hj}%4$lZE6-9Z2V

literal 0
HcmV?d00001

diff --git a/src/core/utils/crypto/__fixtures__/two_keys.p12 b/src/core/utils/crypto/__fixtures__/two_keys.p12
new file mode 100644
index 0000000000000000000000000000000000000000..c934b34901a9368db3283b3f295ccdec1fa185fd
GIT binary patch
literal 4781
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
B>q`It

literal 0
HcmV?d00001

diff --git a/src/core/server/elasticsearch/elasticsearch_client_config.test.mocks.ts b/src/core/utils/crypto/index.ts
similarity index 88%
rename from src/core/server/elasticsearch/elasticsearch_client_config.test.mocks.ts
rename to src/core/utils/crypto/index.ts
index f6c6079822cb5e..9a36682cc4ecb5 100644
--- a/src/core/server/elasticsearch/elasticsearch_client_config.test.mocks.ts
+++ b/src/core/utils/crypto/index.ts
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export const mockReadFileSync = jest.fn();
-jest.mock('fs', () => ({ readFileSync: mockReadFileSync }));
+export { Pkcs12ReadResult, readPkcs12Keystore, readPkcs12Truststore } from './pkcs12';
diff --git a/src/core/utils/crypto/pkcs12.test.ts b/src/core/utils/crypto/pkcs12.test.ts
new file mode 100644
index 00000000000000..c6c28697c4bccf
--- /dev/null
+++ b/src/core/utils/crypto/pkcs12.test.ts
@@ -0,0 +1,205 @@
+/*
+ * 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 {
+  CA_CERT_PATH,
+  ES_KEY_PATH,
+  ES_CERT_PATH,
+  ES_P12_PATH,
+  ES_P12_PASSWORD,
+  ES_EMPTYPASSWORD_P12_PATH,
+  ES_NOPASSWORD_P12_PATH,
+} from '@kbn/dev-utils';
+import { NO_CA_PATH, NO_CERT_PATH, NO_KEY_PATH, TWO_CAS_PATH, TWO_KEYS_PATH } from './__fixtures__';
+import { readFileSync } from 'fs';
+
+import { readPkcs12Keystore, Pkcs12ReadResult, readPkcs12Truststore } from '.';
+
+const reformatPem = (pem: string) => {
+  // ensure consistency in line endings when comparing two PEM files
+  return pem.replace(/\r\n/g, '\n').trim();
+};
+
+const readPem = (file: string) => {
+  const raw = readFileSync(file, 'utf8');
+  // strip bag attributes that are included from a previous PKCS #12 export
+  const pem = raw.substr(raw.indexOf('-----BEGIN'));
+  return reformatPem(pem);
+};
+
+let pemCA: string;
+let pemCert: string;
+let pemKey: string;
+
+beforeAll(() => {
+  pemCA = readPem(CA_CERT_PATH);
+  pemCert = readPem(ES_CERT_PATH);
+  pemKey = readPem(ES_KEY_PATH);
+});
+
+describe('#readPkcs12Keystore', () => {
+  const expectKey = (pkcs12ReadResult: Pkcs12ReadResult) => {
+    const result = reformatPem(pkcs12ReadResult.key!);
+    expect(result).toEqual(pemKey);
+  };
+
+  const expectCert = (pkcs12ReadResult: Pkcs12ReadResult) => {
+    const result = reformatPem(pkcs12ReadResult.cert!);
+    expect(result).toEqual(pemCert);
+  };
+
+  const expectCA = (pkcs12ReadResult: Pkcs12ReadResult, ca = [pemCA]) => {
+    const result = pkcs12ReadResult.ca?.map(x => reformatPem(x));
+    expect(result).toEqual(ca);
+  };
+
+  describe('Succeeds when the correct password is used', () => {
+    let pkcs12ReadResult: Pkcs12ReadResult;
+
+    beforeAll(() => {
+      // this is expensive, just do it once
+      pkcs12ReadResult = readPkcs12Keystore(ES_P12_PATH, ES_P12_PASSWORD);
+    });
+
+    it('Extracts the PEM key', () => {
+      expectKey(pkcs12ReadResult);
+    });
+
+    it('Extracts the PEM instance certificate', () => {
+      expectCert(pkcs12ReadResult);
+    });
+
+    it('Extracts the PEM CA certificate', () => {
+      expectCA(pkcs12ReadResult);
+    });
+  });
+
+  describe('Succeeds on a key store with an empty password', () => {
+    let pkcs12ReadResult: Pkcs12ReadResult;
+
+    beforeAll(() => {
+      // this is expensive, just do it once
+      pkcs12ReadResult = readPkcs12Keystore(ES_EMPTYPASSWORD_P12_PATH, '');
+    });
+
+    it('Extracts the PEM key', () => {
+      expectKey(pkcs12ReadResult);
+    });
+
+    it('Extracts the PEM instance certificate', () => {
+      expectCert(pkcs12ReadResult);
+    });
+
+    it('Extracts the PEM CA certificate', () => {
+      expectCA(pkcs12ReadResult);
+    });
+  });
+
+  describe('Succeeds on a key store with no password', () => {
+    let pkcs12ReadResult: Pkcs12ReadResult;
+
+    beforeAll(() => {
+      // this is expensive, just do it once
+      pkcs12ReadResult = readPkcs12Keystore(ES_NOPASSWORD_P12_PATH);
+    });
+
+    it('Extracts the PEM key', () => {
+      expectKey(pkcs12ReadResult);
+    });
+
+    it('Extracts the PEM instance certificate', () => {
+      expectCert(pkcs12ReadResult);
+    });
+
+    it('Extracts the PEM CA certificate', () => {
+      expectCA(pkcs12ReadResult);
+    });
+  });
+
+  describe('Handles other key store permutations', () => {
+    it('Succeeds with no key', () => {
+      const pkcs12ReadResult = readPkcs12Keystore(NO_KEY_PATH, '');
+      expectCA(pkcs12ReadResult, [pemCert, pemCA]);
+      expect(pkcs12ReadResult.cert).toBeUndefined();
+      expect(pkcs12ReadResult.key).toBeUndefined();
+    });
+
+    it('Succeeds with no instance certificate', () => {
+      const pkcs12ReadResult = readPkcs12Keystore(NO_CERT_PATH, '');
+      expectCA(pkcs12ReadResult);
+      expect(pkcs12ReadResult.cert).toBeUndefined();
+      expectKey(pkcs12ReadResult);
+    });
+
+    it('Succeeds with no CA certificate', () => {
+      const pkcs12ReadResult = readPkcs12Keystore(NO_CA_PATH, '');
+      expect(pkcs12ReadResult.ca).toBeUndefined();
+      expectCert(pkcs12ReadResult);
+      expectKey(pkcs12ReadResult);
+    });
+
+    it('Succeeds with two CA certificates', () => {
+      const pkcs12ReadResult = readPkcs12Keystore(TWO_CAS_PATH, '');
+      expectCA(pkcs12ReadResult, [pemCA, pemCA]);
+      expectCert(pkcs12ReadResult);
+      expectKey(pkcs12ReadResult);
+    });
+  });
+
+  describe('Throws errors', () => {
+    const expectError = (password?: string) => {
+      expect(() => readPkcs12Keystore(ES_P12_PATH, password)).toThrowError(
+        'PKCS#12 MAC could not be verified. Invalid password?'
+      );
+    };
+
+    it('When an invalid password is used (incorrect)', () => {
+      expectError('incorrect');
+    });
+
+    it('When an invalid password is used (empty)', () => {
+      expectError('');
+    });
+
+    it('When an invalid password is used (undefined)', () => {
+      expectError();
+    });
+
+    it('When an invalid file path is used', () => {
+      const path = 'invalid-filepath';
+      expect(() => readPkcs12Keystore(path)).toThrowError(
+        `ENOENT: no such file or directory, open '${path}'`
+      );
+    });
+
+    it('When two keys are present', () => {
+      expect(() => readPkcs12Keystore(TWO_KEYS_PATH, '')).toThrowError(
+        'Keystore contains multiple private keys.'
+      );
+    });
+  });
+});
+
+describe('#readPkcs12Truststore', () => {
+  it('reads all certificates into one CA array and discards any certificates that have keys', () => {
+    const ca = readPkcs12Truststore(ES_P12_PATH, ES_P12_PASSWORD);
+    const result = ca?.map(x => reformatPem(x));
+    expect(result).toEqual([pemCA]);
+  });
+});
diff --git a/src/core/utils/crypto/pkcs12.ts b/src/core/utils/crypto/pkcs12.ts
new file mode 100644
index 00000000000000..74f22bb685c2ff
--- /dev/null
+++ b/src/core/utils/crypto/pkcs12.ts
@@ -0,0 +1,179 @@
+/*
+ * 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 { util, asn1, pkcs12, pki } from 'node-forge';
+import { readFileSync } from 'fs';
+
+export interface Pkcs12ReadResult {
+  ca?: string[];
+  cert?: string;
+  key?: string;
+}
+
+/**
+ * Reads a private key and certificate chain from a PKCS12 key store.
+ *
+ * @remarks
+ * The PKCS12 key store may contain the following:
+ * - 0 or more certificates contained in a `certBag` (OID
+ *  1.2.840.113549.1.12.10.1.3); if a certificate has an associated
+ *  private key it is treated as an instance certificate, otherwise it is
+ *  treated as a CA certificate
+ * - 0 or 1 private keys contained in a `keyBag` (OID
+ *  1.2.840.113549.1.12.10.1.1) or a `pkcs8ShroudedKeyBag` (OID
+ *  1.2.840.113549.1.12.10.1.2)
+ *
+ * Any other PKCS12 bags are ignored.
+ *
+ * @privateRemarks
+ * This intentionally does not allow for a separate key store password and
+ * private key password. In conventional implementations, these two values
+ * are expected to be identical, so we do not support other configurations.
+ *
+ * @param path The file path of the PKCS12 key store
+ * @param password The optional password of the key store and private key;
+ * if there is no password, this may be an empty string or `undefined`,
+ * depending on how the key store was generated.
+ * @returns the parsed private key and certificate(s) in PEM format
+ */
+export const readPkcs12Keystore = (path: string, password?: string): Pkcs12ReadResult => {
+  const p12base64 = readFileSync(path, 'base64');
+  const p12Der = util.decode64(p12base64);
+  const p12Asn1 = asn1.fromDer(p12Der);
+  const p12 = pkcs12.pkcs12FromAsn1(p12Asn1, password);
+  const keyObj = getKey(p12);
+  const { ca, cert } = getCerts(p12, keyObj?.publicKeyData);
+  return { ca, cert, key: keyObj?.key };
+};
+
+/**
+ * Reads a certificate chain from a PKCS12 trust store.
+ *
+ * @remarks
+ * The PKCS12 trust store may contain the following:
+ * - 0 or more certificates contained in a `certBag` (OID
+ *  1.2.840.113549.1.12.10.1.3); all are treated as CA certificates
+ *
+ * Any other PKCS12 bags are ignored.
+ *
+ * @param path The file path of the PKCS12 trust store
+ * @param password The optional password of the trust store; if there is
+ * no password, this may be an empty string or `undefined`, depending on
+ * how the trust store was generated.
+ * @returns the parsed certificate(s) in PEM format
+ */
+export const readPkcs12Truststore = (path: string, password?: string): string[] | undefined => {
+  const p12base64 = readFileSync(path, 'base64');
+  const p12Der = util.decode64(p12base64);
+  const p12Asn1 = asn1.fromDer(p12Der);
+  const p12 = pkcs12.pkcs12FromAsn1(p12Asn1, password);
+  const keyObj = getKey(p12);
+  const { ca } = getCerts(p12, keyObj?.publicKeyData);
+  return ca;
+};
+
+// jsbn.BigInteger as described in type definition is wrong, it doesn't include `compareTo`
+interface BigInteger {
+  data: number[];
+  t: number;
+  s: number;
+  toString(): string;
+  compareTo(bn: BigInteger): number;
+}
+
+interface PublicKeyData {
+  n: BigInteger; // modulus
+  e: BigInteger; // public exponent
+}
+
+const doesPubKeyMatch = (a?: PublicKeyData, b?: PublicKeyData) => {
+  if (a && b) {
+    return a.n.compareTo(b.n) === 0 && a.e.compareTo(b.e) === 0;
+  }
+  return false;
+};
+
+const getCerts = (p12: pkcs12.Pkcs12Pfx, pubKey?: PublicKeyData) => {
+  // OID 1.2.840.113549.1.12.10.1.3 (certBag)
+  const bags = getBags(p12, pki.oids.certBag);
+  let ca;
+  let cert;
+  if (bags && bags.length) {
+    const certs = bags.map(convertCert).filter(x => x !== undefined);
+    cert = certs.find(x => doesPubKeyMatch(x!.publicKeyData, pubKey))?.cert;
+    ca = certs.filter(x => !doesPubKeyMatch(x!.publicKeyData, pubKey)).map(x => x!.cert);
+    if (ca.length === 0) {
+      ca = undefined;
+    }
+  }
+
+  return { ca, cert };
+};
+
+export const convertCert = (bag: pkcs12.Bag) => {
+  const cert = bag.cert;
+  if (cert) {
+    const pem = pki.certificateToPem(cert);
+    const key = cert.publicKey as pki.rsa.PublicKey;
+    const publicKeyData: PublicKeyData = {
+      n: key.n as BigInteger,
+      e: key.e as BigInteger,
+    };
+    return {
+      cert: pem,
+      publicKeyData,
+    };
+  }
+  return undefined;
+};
+
+const getKey = (p12: pkcs12.Pkcs12Pfx) => {
+  // OID 1.2.840.113549.1.12.10.1.1 (keyBag) || OID 1.2.840.113549.1.12.10.1.2 (pkcs8ShroudedKeyBag)
+  const bags = [
+    ...(getBags(p12, pki.oids.keyBag) || []),
+    ...(getBags(p12, pki.oids.pkcs8ShroudedKeyBag) || []),
+  ];
+  if (bags && bags.length) {
+    if (bags.length > 1) {
+      throw new Error(`Keystore contains multiple private keys.`);
+    }
+    const key = bags[0].key as pki.rsa.PrivateKey;
+    if (key) {
+      const pem = pki.privateKeyToPem(key);
+      const publicKeyData: PublicKeyData = {
+        n: key.n as BigInteger,
+        e: key.e as BigInteger,
+      };
+      return {
+        key: pem,
+        publicKeyData,
+      };
+    }
+  }
+  return undefined;
+};
+
+const getBags = (p12: pkcs12.Pkcs12Pfx, bagType: string) => {
+  const bagObj = p12.getBags({ bagType });
+  const bags = bagObj[bagType];
+  if (bags && bags.length) {
+    return bags;
+  }
+  return undefined;
+};
diff --git a/src/core/utils/index.ts b/src/core/utils/index.ts
index 7f8645e2e2e404..7c8ed481c0a7d0 100644
--- a/src/core/utils/index.ts
+++ b/src/core/utils/index.ts
@@ -19,6 +19,7 @@
 
 export * from './assert_never';
 export * from './context';
+export * from './crypto';
 export * from './deep_freeze';
 export * from './get';
 export * from './map_to_object';
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker
index d1734e836d9831..31a5a4c13a4be2 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker
@@ -34,6 +34,10 @@ kibana_vars=(
     elasticsearch.ssl.certificateAuthorities
     elasticsearch.ssl.key
     elasticsearch.ssl.keyPassphrase
+    elasticsearch.ssl.keystore.path
+    elasticsearch.ssl.keystore.password
+    elasticsearch.ssl.truststore.path
+    elasticsearch.ssl.truststore.password
     elasticsearch.ssl.verificationMode
     elasticsearch.startupTimeout
     elasticsearch.username
@@ -73,6 +77,10 @@ kibana_vars=(
     server.ssl.enabled
     server.ssl.key
     server.ssl.keyPassphrase
+    server.ssl.keystore.path
+    server.ssl.keystore.password
+    server.ssl.truststore.path
+    server.ssl.truststore.password
     server.ssl.redirectHttpFromPort
     server.ssl.supportedProtocols
     server.xsrf.whitelist
diff --git a/src/legacy/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js b/src/legacy/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js
index 2942e76f276281..ec7d256975b27e 100644
--- a/src/legacy/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js
+++ b/src/legacy/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js
@@ -19,14 +19,10 @@
 
 import expect from '@kbn/expect';
 import moment from 'moment';
-import fs from 'fs';
-import { promisify } from 'bluebird';
 import { getElasticsearchProxyConfig } from '../elasticsearch_proxy_config';
 import https from 'https';
 import http from 'http';
 
-const readFileAsync = promisify(fs.readFile, fs);
-
 const getDefaultElasticsearchConfig = () => {
   return {
     hosts: ['http://localhost:9200', 'http://192.168.1.1:1234'],
@@ -124,10 +120,10 @@ describe('plugins/console', function() {
       it(`sets ca when certificateAuthorities are specified`, function() {
         const { agent } = getElasticsearchProxyConfig({
           ...config,
-          ssl: { ...config.ssl, certificateAuthorities: [__dirname + '/fixtures/ca.crt'] },
+          ssl: { ...config.ssl, certificateAuthorities: ['content-of-some-path'] },
         });
 
-        expect(agent.options.ca).to.contain('test ca certificate\n');
+        expect(agent.options.ca).to.contain('content-of-some-path');
       });
 
       describe('when alwaysPresentCertificate is false', () => {
@@ -137,8 +133,8 @@ describe('plugins/console', function() {
             ssl: {
               ...config.ssl,
               alwaysPresentCertificate: false,
-              certificate: __dirname + '/fixtures/cert.crt',
-              key: __dirname + '/fixtures/cert.key',
+              certificate: 'content-of-some-path',
+              key: 'content-of-another-path',
             },
           });
 
@@ -152,8 +148,8 @@ describe('plugins/console', function() {
             ssl: {
               ...config.ssl,
               alwaysPresentCertificate: false,
-              certificate: __dirname + '/fixtures/cert.crt',
-              key: __dirname + '/fixtures/cert.key',
+              certificate: 'content-of-some-path',
+              key: 'content-of-another-path',
               keyPassphrase: 'secret',
             },
           });
@@ -163,22 +159,19 @@ describe('plugins/console', function() {
       });
 
       describe('when alwaysPresentCertificate is true', () => {
-        it(`sets cert and key when certificate and key paths are specified`, async function() {
-          const certificatePath = __dirname + '/fixtures/cert.crt';
-          const keyPath = __dirname + '/fixtures/cert.key';
-
+        it(`sets cert and key when certificate and key are specified`, async function() {
           const { agent } = getElasticsearchProxyConfig({
             ...config,
             ssl: {
               ...config.ssl,
               alwaysPresentCertificate: true,
-              certificate: certificatePath,
-              key: keyPath,
+              certificate: 'content-of-some-path',
+              key: 'content-of-another-path',
             },
           });
 
-          expect(agent.options.cert).to.be(await readFileAsync(certificatePath, 'utf8'));
-          expect(agent.options.key).to.be(await readFileAsync(keyPath, 'utf8'));
+          expect(agent.options.cert).to.be('content-of-some-path');
+          expect(agent.options.key).to.be('content-of-another-path');
         });
 
         it(`sets passphrase when certificate, key and keyPassphrase are specified`, function() {
@@ -187,8 +180,8 @@ describe('plugins/console', function() {
             ssl: {
               ...config.ssl,
               alwaysPresentCertificate: true,
-              certificate: __dirname + '/fixtures/cert.crt',
-              key: __dirname + '/fixtures/cert.key',
+              certificate: 'content-of-some-path',
+              key: 'content-of-another-path',
               keyPassphrase: 'secret',
             },
           });
@@ -197,13 +190,12 @@ describe('plugins/console', function() {
         });
 
         it(`doesn't set cert when only certificate path is specified`, async function() {
-          const certificatePath = __dirname + '/fixtures/cert.crt';
           const { agent } = getElasticsearchProxyConfig({
             ...config,
             ssl: {
               ...config.ssl,
               alwaysPresentCertificate: true,
-              certificate: certificatePath,
+              certificate: 'content-of-some-path',
               key: undefined,
             },
           });
@@ -213,14 +205,13 @@ describe('plugins/console', function() {
         });
 
         it(`doesn't set key when only key path is specified`, async function() {
-          const keyPath = __dirname + '/fixtures/cert.key';
           const { agent } = getElasticsearchProxyConfig({
             ...config,
             ssl: {
               ...config.ssl,
               alwaysPresentCertificate: true,
               certificate: undefined,
-              key: keyPath,
+              key: 'content-of-some-path',
             },
           });
 
diff --git a/src/legacy/core_plugins/console/server/__tests__/fixtures/ca.crt b/src/legacy/core_plugins/console/server/__tests__/fixtures/ca.crt
deleted file mode 100644
index 075fdd038dafff..00000000000000
--- a/src/legacy/core_plugins/console/server/__tests__/fixtures/ca.crt
+++ /dev/null
@@ -1 +0,0 @@
-test ca certificate
diff --git a/src/legacy/core_plugins/console/server/__tests__/fixtures/cert.crt b/src/legacy/core_plugins/console/server/__tests__/fixtures/cert.crt
deleted file mode 100644
index 360cdfaaaa5a96..00000000000000
--- a/src/legacy/core_plugins/console/server/__tests__/fixtures/cert.crt
+++ /dev/null
@@ -1 +0,0 @@
-test certificate
diff --git a/src/legacy/core_plugins/console/server/__tests__/fixtures/cert.key b/src/legacy/core_plugins/console/server/__tests__/fixtures/cert.key
deleted file mode 100644
index 04d3bfef24188d..00000000000000
--- a/src/legacy/core_plugins/console/server/__tests__/fixtures/cert.key
+++ /dev/null
@@ -1 +0,0 @@
-test key
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_config.js b/src/legacy/core_plugins/console/server/__tests__/proxy_config.js
index 821fb8bef64d58..2a221aa2611677 100644
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_config.js
+++ b/src/legacy/core_plugins/console/server/__tests__/proxy_config.js
@@ -21,7 +21,6 @@
 
 import expect from '@kbn/expect';
 import sinon from 'sinon';
-import fs from 'fs';
 import https, { Agent as HttpsAgent } from 'https';
 import { parse as parseUrl } from 'url';
 
@@ -36,14 +35,6 @@ const parsedGoogle = parseUrl('https://google.com/search');
 const parsedLocalEs = parseUrl('https://localhost:5601/search');
 
 describe('ProxyConfig', function() {
-  beforeEach(function() {
-    sinon.stub(fs, 'readFileSync').callsFake(path => ({ path }));
-  });
-
-  afterEach(function() {
-    fs.readFileSync.restore();
-  });
-
   describe('constructor', function() {
     beforeEach(function() {
       sinon.stub(https, 'Agent');
@@ -56,7 +47,7 @@ describe('ProxyConfig', function() {
     it('uses ca to create sslAgent', function() {
       const config = new ProxyConfig({
         ssl: {
-          ca: ['path/to/ca'],
+          ca: ['content-of-some-path'],
         },
       });
 
@@ -64,7 +55,7 @@ describe('ProxyConfig', function() {
       sinon.assert.calledOnce(https.Agent);
       const sslAgentOpts = https.Agent.firstCall.args[0];
       expect(sslAgentOpts).to.eql({
-        ca: [{ path: 'path/to/ca' }],
+        ca: ['content-of-some-path'],
         cert: undefined,
         key: undefined,
         rejectUnauthorized: true,
@@ -74,8 +65,8 @@ describe('ProxyConfig', function() {
     it('uses cert, and key to create sslAgent', function() {
       const config = new ProxyConfig({
         ssl: {
-          cert: 'path/to/cert',
-          key: 'path/to/key',
+          cert: 'content-of-some-path',
+          key: 'content-of-another-path',
         },
       });
 
@@ -84,8 +75,8 @@ describe('ProxyConfig', function() {
       const sslAgentOpts = https.Agent.firstCall.args[0];
       expect(sslAgentOpts).to.eql({
         ca: undefined,
-        cert: { path: 'path/to/cert' },
-        key: { path: 'path/to/key' },
+        cert: 'content-of-some-path',
+        key: 'content-of-another-path',
         rejectUnauthorized: true,
       });
     });
@@ -93,9 +84,9 @@ describe('ProxyConfig', function() {
     it('uses ca, cert, and key to create sslAgent', function() {
       const config = new ProxyConfig({
         ssl: {
-          ca: ['path/to/ca'],
-          cert: 'path/to/cert',
-          key: 'path/to/key',
+          ca: ['content-of-some-path'],
+          cert: 'content-of-another-path',
+          key: 'content-of-yet-another-path',
           rejectUnauthorized: true,
         },
       });
@@ -104,9 +95,9 @@ describe('ProxyConfig', function() {
       sinon.assert.calledOnce(https.Agent);
       const sslAgentOpts = https.Agent.firstCall.args[0];
       expect(sslAgentOpts).to.eql({
-        ca: [{ path: 'path/to/ca' }],
-        cert: { path: 'path/to/cert' },
-        key: { path: 'path/to/key' },
+        ca: ['content-of-some-path'],
+        cert: 'content-of-another-path',
+        key: 'content-of-yet-another-path',
         rejectUnauthorized: true,
       });
     });
diff --git a/src/legacy/core_plugins/console/server/elasticsearch_proxy_config.ts b/src/legacy/core_plugins/console/server/elasticsearch_proxy_config.ts
index 9e7c814aa57a46..5f44a524e9cc8d 100644
--- a/src/legacy/core_plugins/console/server/elasticsearch_proxy_config.ts
+++ b/src/legacy/core_plugins/console/server/elasticsearch_proxy_config.ts
@@ -18,13 +18,10 @@
  */
 
 import _ from 'lodash';
-import { readFileSync } from 'fs';
 import http from 'http';
 import https from 'https';
 import url from 'url';
 
-const readFile = (file: string) => readFileSync(file, 'utf8');
-
 const createAgent = (legacyConfig: any) => {
   const target = url.parse(_.head(legacyConfig.hosts));
   if (!/^https/.test(target.protocol || '')) return new http.Agent();
@@ -49,22 +46,12 @@ const createAgent = (legacyConfig: any) => {
       throw new Error(`Unknown ssl verificationMode: ${verificationMode}`);
   }
 
-  if (
-    legacyConfig.ssl &&
-    Array.isArray(legacyConfig.ssl.certificateAuthorities) &&
-    legacyConfig.ssl.certificateAuthorities.length > 0
-  ) {
-    agentOptions.ca = legacyConfig.ssl.certificateAuthorities.map(readFile);
-  }
+  agentOptions.ca = legacyConfig.ssl?.certificateAuthorities;
 
-  if (
-    legacyConfig.ssl &&
-    legacyConfig.ssl.alwaysPresentCertificate &&
-    legacyConfig.ssl.certificate &&
-    legacyConfig.ssl.key
-  ) {
-    agentOptions.cert = readFile(legacyConfig.ssl.certificate);
-    agentOptions.key = readFile(legacyConfig.ssl.key);
+  const ignoreCertAndKey = !legacyConfig.ssl?.alwaysPresentCertificate;
+  if (!ignoreCertAndKey && legacyConfig.ssl?.certificate && legacyConfig.ssl?.key) {
+    agentOptions.cert = legacyConfig.ssl.certificate;
+    agentOptions.key = legacyConfig.ssl.key;
     agentOptions.passphrase = legacyConfig.ssl.keyPassphrase;
   }
 
diff --git a/src/legacy/core_plugins/console/server/proxy_config.js b/src/legacy/core_plugins/console/server/proxy_config.js
index 44a2769a46eb31..b8c1b11f9a0d35 100644
--- a/src/legacy/core_plugins/console/server/proxy_config.js
+++ b/src/legacy/core_plugins/console/server/proxy_config.js
@@ -20,7 +20,6 @@
 import { values } from 'lodash';
 import { format as formatUrl } from 'url';
 import { Agent as HttpsAgent } from 'https';
-import { readFileSync } from 'fs';
 
 import { WildcardMatcher } from './wildcard_matcher';
 
@@ -63,9 +62,9 @@ export class ProxyConfig {
     this.verifySsl = ssl.verify;
 
     const sslAgentOpts = {
-      ca: ssl.ca && ssl.ca.map(ca => readFileSync(ca)),
-      cert: ssl.cert && readFileSync(ssl.cert),
-      key: ssl.key && readFileSync(ssl.key),
+      ca: ssl.ca,
+      cert: ssl.cert,
+      key: ssl.key,
     };
 
     if (values(sslAgentOpts).filter(Boolean).length) {
diff --git a/test/server_integration/__fixtures__/README.md b/test/server_integration/__fixtures__/README.md
new file mode 100644
index 00000000000000..faf881202e55e1
--- /dev/null
+++ b/test/server_integration/__fixtures__/README.md
@@ -0,0 +1,79 @@
+# HTTP SSL Test Fixtures
+
+These PKCS12 files are used to test SSL with a root CA and an intermediate CA.
+
+The files that are provided by `@kbn/dev-utils` only use a root CA, so we need additional test files for this.
+
+To generate these additional test files, see the steps below.
+
+## Step 1. Set environment variables
+
+```sh
+CA1='test_root_ca'
+CA2='test_intermediate_ca'
+EE='localhost'
+```
+
+## Step 2. Generate PKCS12 key stores
+
+Using [elasticsearch-certutil](https://www.elastic.co/guide/en/elasticsearch/reference/current/certutil.html):
+
+```sh
+bin/elasticsearch-certutil ca --ca-dn "CN=Test Root CA" -days 18250 --out $CA1.p12 --pass castorepass
+bin/elasticsearch-certutil ca --ca-dn "CN=Test Intermediate CA" -days 18250 --out $CA2.p12 --pass castorepass
+bin/elasticsearch-certutil cert --ca $CA2.p12 --ca-pass castorepass --name $EE --dns $EE --out $EE.p12 --pass storepass
+```
+
+## Step 3. Convert PKCS12 key stores
+
+Using OpenSSL on macOS:
+
+```sh
+### CONVERT P12 KEYSTORES TO PEM FILES
+openssl pkcs12 -in $CA1.p12 -out $CA1.crt -nokeys -passin pass:"castorepass" -passout pass:
+openssl pkcs12 -in $CA1.p12 -nocerts -passin pass:"castorepass" -passout pass:"keypass" | openssl rsa -passin pass:"keypass" -out $CA1.key
+
+openssl pkcs12 -in $CA2.p12 -out $CA2.crt -nokeys -passin pass:"castorepass" -passout pass:
+openssl pkcs12 -in $CA2.p12 -nocerts -passin pass:"castorepass" -passout pass:"keypass" | openssl rsa -passin pass:"keypass" -out $CA2.key
+
+openssl pkcs12 -in $EE.p12 -out $EE.crt -clcerts -passin pass:"storepass" -passout pass:
+openssl pkcs12 -in $EE.p12 -nocerts -passin pass:"storepass" -passout pass:"keypass" | openssl rsa -passin pass:"keypass" -out $EE.key
+
+### RE-SIGN INTERMEDIATE CA CERT
+mkdir -p ./tmp
+openssl x509 -x509toreq -in $CA2.crt -signkey $CA2.key -out ./tmp/$CA2.csr
+dd if=/dev/urandom of=./tmp/rand bs=256 count=1
+touch ./tmp/index.txt
+echo "01" > ./tmp/serial
+cp /System/Library/OpenSSL/openssl.cnf ./tmp/
+echo "
+[ tmpcnf ]
+dir             = ./
+certs           = ./
+new_certs_dir   = ./tmp
+crl_dir         = ./tmp/crl
+database        = ./tmp/index.txt
+unique_subject  = no
+certificate     = ./$CA1.crt
+serial          = ./tmp/serial
+crlnumber       = ./tmp/crlnumber
+crl             = ./tmp/crl.pem
+private_key     = ./$CA1.key
+RANDFILE        = ./tmp/rand
+x509_extensions = v3_ca
+name_opt        = ca_default
+cert_opt        = ca_default
+default_days    = 18250
+default_crl_days= 30
+default_md      = sha256
+preserve        = no
+policy          = policy_anything
+" >> ./tmp/openssl.cnf
+
+# The next command requires user input
+openssl ca -config ./tmp/openssl.cnf -name tmpcnf -in ./tmp/$CA2.csr -out $CA2.crt -verbose
+
+### CONVERT PEM FILES BACK TO P12 KEYSTORES
+cat $CA2.key $CA2.crt $CA1.crt | openssl pkcs12 -export -name $CA2 -passout pass:"castorepass" -out $CA2.p12
+cat $EE.key $EE.crt $CA1.crt $CA2.crt | openssl pkcs12 -export -name $EE -passout pass:"storepass" -out $EE.p12
+```
diff --git a/test/server_integration/__fixtures__/index.ts b/test/server_integration/__fixtures__/index.ts
new file mode 100644
index 00000000000000..40f1ddb7fa0bac
--- /dev/null
+++ b/test/server_integration/__fixtures__/index.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { resolve } from 'path';
+
+export const CA1_CERT_PATH = resolve(__dirname, './test_root_ca.crt');
+export const CA2_CERT_PATH = resolve(__dirname, './test_intermediate_ca.crt');
+export const EE_P12_PATH = resolve(__dirname, './localhost.p12');
+export const EE_P12_PASSWORD = 'storepass';
diff --git a/test/server_integration/__fixtures__/localhost.p12 b/test/server_integration/__fixtures__/localhost.p12
new file mode 100644
index 0000000000000000000000000000000000000000..1b0d11fb880980d2f8ce3c919afe3319cab74360
GIT binary patch
literal 4184
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
bQ~R8*XOgxL5=KEqdx*bjwPTI?_mTb=_Fm)r

literal 0
HcmV?d00001

diff --git a/test/server_integration/__fixtures__/test_intermediate_ca.crt b/test/server_integration/__fixtures__/test_intermediate_ca.crt
new file mode 100644
index 00000000000000..2e143200d290a7
--- /dev/null
+++ b/test/server_integration/__fixtures__/test_intermediate_ca.crt
@@ -0,0 +1,79 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=Test Root CA
+        Validity
+            Not Before: Jan  9 15:50:00 2020 GMT
+            Not After : Dec 27 15:50:00 2069 GMT
+        Subject: CN=Test Intermediate CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:ba:bb:d5:d7:5a:0a:b0:95:43:63:73:bc:1f:3f:
+                    a4:71:3c:3f:69:96:8c:5d:e1:5b:82:95:2c:d1:b3:
+                    3b:7a:5c:f0:54:c9:d2:be:37:c7:81:ce:db:90:fa:
+                    c0:0c:e8:b7:e5:51:18:29:0b:47:89:0f:b1:e3:7f:
+                    06:f0:fe:f6:a7:e8:42:36:58:4b:c7:04:81:48:5b:
+                    20:11:be:95:6b:bd:8c:0b:1b:21:2d:26:47:0b:c5:
+                    98:59:d7:a2:35:09:4f:1a:eb:74:d4:bc:fd:df:41:
+                    45:5d:fd:a6:0e:dd:02:7e:52:a4:21:9d:ac:c7:0e:
+                    73:50:2d:7b:6e:30:05:20:a2:ee:60:fa:0e:80:7d:
+                    d0:0c:fd:24:ae:ef:96:70:7e:a3:bc:87:e4:fc:50:
+                    43:a7:a6:ef:dc:0d:7d:9e:02:73:3d:6b:b1:b3:e9:
+                    d5:98:42:2b:ed:63:c1:a2:bb:49:19:a4:5b:d6:6e:
+                    33:54:44:19:f3:51:db:a4:ea:92:67:13:5e:80:bf:
+                    6d:1f:59:e4:f0:8c:93:10:38:54:37:8f:a6:4a:42:
+                    56:5f:db:d6:d5:2c:12:58:4c:42:aa:2c:19:8c:f7:
+                    30:51:b2:2c:29:c1:6b:29:73:bc:c6:45:63:41:90:
+                    80:0a:84:d5:02:0c:9c:67:cf:73:4e:62:40:51:ee:
+                    67:03
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                B4:48:6A:C8:21:77:A5:03:CF:48:C4:62:74:26:03:3F:BC:88:8C:92
+            X509v3 Authority Key Identifier: 
+                keyid:03:9B:FF:88:CA:33:A2:71:C5:31:51:A6:DA:15:EF:44:C2:CB:D3:9F
+                DirName:/CN=Test Root CA
+                serial:78:77:49:60:3B:E7:73:18:06:75:45:A7:8E:8E:B4:4E:E4:9A:E3:B0
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         a3:10:97:ab:dd:43:8a:5b:c7:a6:b9:33:92:7b:61:fb:f0:3f:
+         54:05:50:46:9e:62:11:d3:60:59:77:93:53:48:0b:c9:cf:bc:
+         c0:3c:b4:47:f4:f6:66:2c:86:76:38:3b:5d:13:77:41:ce:d7:
+         16:ca:5e:29:33:1f:a7:ea:82:e4:0c:ad:f8:50:1d:54:cd:28:
+         a9:22:59:a8:e1:3f:05:b8:fb:5e:54:72:58:fa:a1:3e:f8:99:
+         bf:d6:50:99:8b:12:52:37:41:be:5f:c9:7d:04:46:8b:fd:8f:
+         7f:64:a1:0d:b8:2b:ca:e9:4a:54:e2:bb:8b:39:b7:87:6f:8b:
+         17:46:b4:5d:16:aa:75:5c:fb:33:29:52:51:24:7b:f2:d9:b3:
+         9b:99:bf:08:6c:2c:43:8a:74:63:c1:32:ed:6b:4a:53:88:51:
+         c2:10:dd:92:f2:6f:af:65:f1:08:5a:cc:a6:2b:54:95:2b:2a:
+         a1:90:f2:eb:08:91:26:18:44:b7:49:11:09:c1:1c:aa:2d:b2:
+         d6:56:02:34:7a:97:fb:60:c5:1e:66:84:c0:40:6f:26:52:77:
+         85:a3:ab:d5:8e:f0:d0:d0:2e:e0:6f:8a:de:72:e0:ee:96:e5:
+         5d:4a:e9:c1:4c:c6:45:c7:36:6b:7a:1a:a6:64:71:9b:7c:7e:
+         59:93:bd:b6
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDEwxUZXN0
+IFJvb3QgQ0EwIBcNMjAwMTA5MTU1MDAwWhgPMjA2OTEyMjcxNTUwMDBaMB8xHTAb
+BgNVBAMTFFRlc3QgSW50ZXJtZWRpYXRlIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAurvV11oKsJVDY3O8Hz+kcTw/aZaMXeFbgpUs0bM7elzwVMnS
+vjfHgc7bkPrADOi35VEYKQtHiQ+x438G8P72p+hCNlhLxwSBSFsgEb6Va72MCxsh
+LSZHC8WYWdeiNQlPGut01Lz930FFXf2mDt0CflKkIZ2sxw5zUC17bjAFIKLuYPoO
+gH3QDP0kru+WcH6jvIfk/FBDp6bv3A19ngJzPWuxs+nVmEIr7WPBortJGaRb1m4z
+VEQZ81HbpOqSZxNegL9tH1nk8IyTEDhUN4+mSkJWX9vW1SwSWExCqiwZjPcwUbIs
+KcFrKXO8xkVjQZCACoTVAgycZ89zTmJAUe5nAwIDAQABo4GEMIGBMB0GA1UdDgQW
+BBS0SGrIIXelA89IxGJ0JgM/vIiMkjBSBgNVHSMESzBJgBQDm/+IyjOiccUxUaba
+Fe9EwsvTn6EbpBkwFzEVMBMGA1UEAxMMVGVzdCBSb290IENBghR4d0lgO+dzGAZ1
+RaeOjrRO5JrjsDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCjEJer
+3UOKW8emuTOSe2H78D9UBVBGnmIR02BZd5NTSAvJz7zAPLRH9PZmLIZ2ODtdE3dB
+ztcWyl4pMx+n6oLkDK34UB1UzSipIlmo4T8FuPteVHJY+qE++Jm/1lCZixJSN0G+
+X8l9BEaL/Y9/ZKENuCvK6UpU4ruLObeHb4sXRrRdFqp1XPszKVJRJHvy2bObmb8I
+bCxDinRjwTLta0pTiFHCEN2S8m+vZfEIWsymK1SVKyqhkPLrCJEmGES3SREJwRyq
+LbLWVgI0epf7YMUeZoTAQG8mUneFo6vVjvDQ0C7gb4recuDuluVdSunBTMZFxzZr
+ehqmZHGbfH5Zk722
+-----END CERTIFICATE-----
diff --git a/test/server_integration/__fixtures__/test_root_ca.crt b/test/server_integration/__fixtures__/test_root_ca.crt
new file mode 100644
index 00000000000000..678c9a7467a22d
--- /dev/null
+++ b/test/server_integration/__fixtures__/test_root_ca.crt
@@ -0,0 +1,24 @@
+Bag Attributes
+    friendlyName: ca
+    localKeyID: 54 69 6D 65 20 31 35 37 38 35 38 34 39 34 35 33 30 37 
+subject=/CN=Test Root CA
+issuer=/CN=Test Root CA
+-----BEGIN CERTIFICATE-----
+MIIDETCCAfmgAwIBAgIUeHdJYDvncxgGdUWnjo60TuSa47AwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAxMMVGVzdCBSb290IENBMCAXDTIwMDEwOTE1NDkwNVoYDzIw
+NjkxMjI3MTU0OTA1WjAXMRUwEwYDVQQDEwxUZXN0IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2G9Bmax5yFvdWEMleXcFK7G0ir04/sd4v
+pRuqYhg+LhxlDOnd7HFtSsI2GGZaBktpL4eWOA8sAZ+eL89P3JV5WFDAuvlK8RZt
+ECnPzl7Yar3nhPjNO5F1xbyHCPNSiQVYx7avkLJu3sv/okA65ON+BHYijbNNwS0/
+YtZYZWF7qR6rygXiLHcCIwWwZntBAKHGsBzxZv+28xRMUGsYWHq1PI25CRfDuVub
+jC3LpAiJUTkrN5cE8Mpy6R9EH3c/qCk1I2daUKJVJhIzrUrsyNYwpCpbtrE605lK
+qsRVkxoAK5i3zZRqiQ/m4FEmr0rTmbLJw09u+jIzfye2ivNiC7PZAgMBAAGjUzBR
+MB0GA1UdDgQWBBQDm/+IyjOiccUxUabaFe9EwsvTnzAfBgNVHSMEGDAWgBQDm/+I
+yjOiccUxUabaFe9EwsvTnzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA
+A4IBAQBclwdYhVNp3I4gTzxl0kbjya28auokp1+NUhAJ++eGGeTySEzbggHWkSSw
+jXhzbwri1T+80smvj4XkbSvLzPurSxT1if4kmUDh+XApx/pQb/2l88lRdLqBCcSn
+UxrdeDGPGMAYsxH/+/s2rMoaagBb4n8dayBesqIa+Nt+Mf8cqfM30pRGqk5HtoI/
+ZUZDOQ7JJc3mg1usjA3mtgsUQ88zAH9C3fMpf/I3sr2UQqaXYZlzmh3r5U9yNYyw
+SV0NnaDd3BVJ4qOumTjlYalRJFDrvn+aNkyPN6XiwxA1qd/uVW5mIJhkoxPYWkG4
+M1b0sea/9IVucYYyXI+GyFNI7B5N
+-----END CERTIFICATE-----
diff --git a/test/server_integration/config.js b/test/server_integration/config.js
index 6928dedb9fb6f1..26e00e5fce294a 100644
--- a/test/server_integration/config.js
+++ b/test/server_integration/config.js
@@ -18,7 +18,7 @@
  */
 
 import {
-  KibanaSupertestProvider,
+  createKibanaSupertestProvider,
   KibanaSupertestWithoutAuthProvider,
   ElasticsearchSupertestProvider,
 } from './services';
@@ -30,7 +30,7 @@ export default async function({ readConfigFile }) {
   return {
     services: {
       ...commonConfig.get('services'),
-      supertest: KibanaSupertestProvider,
+      supertest: createKibanaSupertestProvider(),
       supertestWithoutAuth: KibanaSupertestWithoutAuthProvider,
       esSupertest: ElasticsearchSupertestProvider,
     },
diff --git a/test/server_integration/http/ssl/config.js b/test/server_integration/http/ssl/config.js
index 1cf4cdf6064c18..2f2e7b778d3617 100644
--- a/test/server_integration/http/ssl/config.js
+++ b/test/server_integration/http/ssl/config.js
@@ -17,12 +17,21 @@
  * under the License.
  */
 
+import { readFileSync } from 'fs';
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
+import { createKibanaSupertestProvider } from '../../services';
+
 export default async function({ readConfigFile }) {
   const httpConfig = await readConfigFile(require.resolve('../../config'));
 
   return {
     testFiles: [require.resolve('./')],
-    services: httpConfig.get('services'),
+    services: {
+      ...httpConfig.get('services'),
+      supertest: createKibanaSupertestProvider({
+        certificateAuthorities: [readFileSync(CA_CERT_PATH)],
+      }),
+    },
     servers: {
       ...httpConfig.get('servers'),
       kibana: {
@@ -39,8 +48,8 @@ export default async function({ readConfigFile }) {
       serverArgs: [
         ...httpConfig.get('kbnTestServer.serverArgs'),
         '--server.ssl.enabled=true',
-        `--server.ssl.key=${require.resolve('../../../dev_certs/server.key')}`,
-        `--server.ssl.certificate=${require.resolve('../../../dev_certs/server.crt')}`,
+        `--server.ssl.key=${KBN_KEY_PATH}`,
+        `--server.ssl.certificate=${KBN_CERT_PATH}`,
       ],
     },
   };
diff --git a/test/server_integration/http/ssl_redirect/config.js b/test/server_integration/http/ssl_redirect/config.js
index 36e68eaf8e345a..20ab4a210cc7b0 100644
--- a/test/server_integration/http/ssl_redirect/config.js
+++ b/test/server_integration/http/ssl_redirect/config.js
@@ -17,7 +17,10 @@
  * under the License.
  */
 
-import { KibanaSupertestProvider } from '../../services';
+import { readFileSync } from 'fs';
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
+
+import { createKibanaSupertestProvider } from '../../services';
 
 export default async function({ readConfigFile }) {
   const httpConfig = await readConfigFile(require.resolve('../../config'));
@@ -34,8 +37,10 @@ export default async function({ readConfigFile }) {
     testFiles: [require.resolve('./')],
     services: {
       ...httpConfig.get('services'),
-      //eslint-disable-next-line new-cap
-      supertest: arg => KibanaSupertestProvider(arg, supertestOptions),
+      supertest: createKibanaSupertestProvider({
+        certificateAuthorities: [readFileSync(CA_CERT_PATH)],
+        options: supertestOptions,
+      }),
     },
     servers: {
       ...httpConfig.get('servers'),
@@ -54,8 +59,8 @@ export default async function({ readConfigFile }) {
       serverArgs: [
         ...httpConfig.get('kbnTestServer.serverArgs'),
         '--server.ssl.enabled=true',
-        `--server.ssl.key=${require.resolve('../../../dev_certs/server.key')}`,
-        `--server.ssl.certificate=${require.resolve('../../../dev_certs/server.crt')}`,
+        `--server.ssl.key=${KBN_KEY_PATH}`,
+        `--server.ssl.certificate=${KBN_CERT_PATH}`,
         `--server.ssl.redirectHttpFromPort=${redirectPort}`,
       ],
     },
diff --git a/test/server_integration/http/ssl_with_p12/config.js b/test/server_integration/http/ssl_with_p12/config.js
new file mode 100644
index 00000000000000..e220914af54f44
--- /dev/null
+++ b/test/server_integration/http/ssl_with_p12/config.js
@@ -0,0 +1,56 @@
+/*
+ * 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 { readFileSync } from 'fs';
+import { CA_CERT_PATH, KBN_P12_PATH, KBN_P12_PASSWORD } from '@kbn/dev-utils';
+import { createKibanaSupertestProvider } from '../../services';
+
+export default async function({ readConfigFile }) {
+  const httpConfig = await readConfigFile(require.resolve('../../config'));
+
+  return {
+    testFiles: [require.resolve('./')],
+    services: {
+      ...httpConfig.get('services'),
+      supertest: createKibanaSupertestProvider({
+        certificateAuthorities: [readFileSync(CA_CERT_PATH)],
+      }),
+    },
+    servers: {
+      ...httpConfig.get('servers'),
+      kibana: {
+        ...httpConfig.get('servers.kibana'),
+        protocol: 'https',
+      },
+    },
+    junit: {
+      reportName: 'Http SSL Integration Tests',
+    },
+    esTestCluster: httpConfig.get('esTestCluster'),
+    kbnTestServer: {
+      ...httpConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...httpConfig.get('kbnTestServer.serverArgs'),
+        '--server.ssl.enabled=true',
+        `--server.ssl.keystore.path=${KBN_P12_PATH}`,
+        `--server.ssl.keystore.password=${KBN_P12_PASSWORD}`,
+      ],
+    },
+  };
+}
diff --git a/test/server_integration/http/ssl_with_p12/index.js b/test/server_integration/http/ssl_with_p12/index.js
new file mode 100644
index 00000000000000..700f30ddc21a95
--- /dev/null
+++ b/test/server_integration/http/ssl_with_p12/index.js
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export default function({ getService }) {
+  const supertest = getService('supertest');
+
+  describe('kibana server with ssl', () => {
+    it('handles requests using ssl with a P12 keystore', async () => {
+      await supertest.get('/').expect(302);
+    });
+  });
+}
diff --git a/test/server_integration/http/ssl_with_p12_intermediate/config.js b/test/server_integration/http/ssl_with_p12_intermediate/config.js
new file mode 100644
index 00000000000000..73a77425ec7741
--- /dev/null
+++ b/test/server_integration/http/ssl_with_p12_intermediate/config.js
@@ -0,0 +1,56 @@
+/*
+ * 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 { readFileSync } from 'fs';
+import { CA1_CERT_PATH, CA2_CERT_PATH, EE_P12_PATH, EE_P12_PASSWORD } from '../../__fixtures__';
+import { createKibanaSupertestProvider } from '../../services';
+
+export default async function({ readConfigFile }) {
+  const httpConfig = await readConfigFile(require.resolve('../../config'));
+
+  return {
+    testFiles: [require.resolve('./')],
+    services: {
+      ...httpConfig.get('services'),
+      supertest: createKibanaSupertestProvider({
+        certificateAuthorities: [readFileSync(CA1_CERT_PATH), readFileSync(CA2_CERT_PATH)],
+      }),
+    },
+    servers: {
+      ...httpConfig.get('servers'),
+      kibana: {
+        ...httpConfig.get('servers.kibana'),
+        protocol: 'https',
+      },
+    },
+    junit: {
+      reportName: 'Http SSL Integration Tests',
+    },
+    esTestCluster: httpConfig.get('esTestCluster'),
+    kbnTestServer: {
+      ...httpConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...httpConfig.get('kbnTestServer.serverArgs'),
+        '--server.ssl.enabled=true',
+        `--server.ssl.keystore.path=${EE_P12_PATH}`,
+        `--server.ssl.keystore.password=${EE_P12_PASSWORD}`,
+      ],
+    },
+  };
+}
diff --git a/test/server_integration/http/ssl_with_p12_intermediate/index.js b/test/server_integration/http/ssl_with_p12_intermediate/index.js
new file mode 100644
index 00000000000000..fb079a4e091c38
--- /dev/null
+++ b/test/server_integration/http/ssl_with_p12_intermediate/index.js
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export default function({ getService }) {
+  const supertest = getService('supertest');
+
+  describe('kibana server with ssl', () => {
+    it('handles requests using ssl with a P12 keystore that uses an intermediate CA', async () => {
+      await supertest.get('/').expect(302);
+    });
+  });
+}
diff --git a/test/server_integration/services/index.js b/test/server_integration/services/index.js
index 32a11f30b86835..4904bfc9eeef63 100644
--- a/test/server_integration/services/index.js
+++ b/test/server_integration/services/index.js
@@ -18,7 +18,7 @@
  */
 
 export {
-  KibanaSupertestProvider,
+  createKibanaSupertestProvider,
   KibanaSupertestWithoutAuthProvider,
   ElasticsearchSupertestProvider,
 } from './supertest';
diff --git a/test/server_integration/services/supertest.js b/test/server_integration/services/supertest.js
index c09932b0207ac6..74bb5400bc299d 100644
--- a/test/server_integration/services/supertest.js
+++ b/test/server_integration/services/supertest.js
@@ -17,25 +17,19 @@
  * under the License.
  */
 
-import { readFileSync } from 'fs';
 import { format as formatUrl } from 'url';
 
 import supertestAsPromised from 'supertest-as-promised';
 
-export function KibanaSupertestProvider({ getService }, options) {
-  const config = getService('config');
-  const kibanaServerUrl = options ? formatUrl(options) : formatUrl(config.get('servers.kibana'));
-
-  const kibanaServerCert = config
-    .get('kbnTestServer.serverArgs')
-    .filter(arg => arg.startsWith('--server.ssl.certificate'))
-    .map(arg => arg.split('=').pop())
-    .map(path => readFileSync(path))
-    .shift();
+export function createKibanaSupertestProvider({ certificateAuthorities, options } = {}) {
+  return function({ getService }) {
+    const config = getService('config');
+    const kibanaServerUrl = options ? formatUrl(options) : formatUrl(config.get('servers.kibana'));
 
-  return kibanaServerCert
-    ? supertestAsPromised.agent(kibanaServerUrl, { ca: kibanaServerCert })
-    : supertestAsPromised(kibanaServerUrl);
+    return certificateAuthorities
+      ? supertestAsPromised.agent(kibanaServerUrl, { ca: certificateAuthorities })
+      : supertestAsPromised(kibanaServerUrl);
+  };
 }
 
 export function KibanaSupertestWithoutAuthProvider({ getService }) {
diff --git a/x-pack/legacy/plugins/security/README.md b/x-pack/legacy/plugins/security/README.md
index b4786a2df6c521..068f19ba9482b1 100644
--- a/x-pack/legacy/plugins/security/README.md
+++ b/x-pack/legacy/plugins/security/README.md
@@ -1,7 +1,3 @@
 # Kibana Security Plugin
 
-1. Install the Security plugin on Kibana `bin/kibana plugin --install kibana/security/latest`
-1. Modify [kibana.yml](https://github.com/elastic/kibana/blob/master/config/kibana.yml) and add `xpack.security.encryptionKey: "something_at_least_32_characters"`
-1. Make sure that the following config options are also set: `elasticsearch.username`, `elasticsearch.password`, `server.ssl.certificate`, and `server.ssl.key` (see [Configuring Kibana to Work with Shield](https://www.elastic.co/guide/en/kibana/current/production.html#configuring-kibana-shield))
-
-Once done, open up the following url (assuming standard kibana config): [https://localhost:5601](https://localhost:5601).
+See [Configuring security in Kibana](https://www.elastic.co/guide/en/kibana/current/using-kibana-with-security.html).
diff --git a/x-pack/test/pki_api_integration/config.ts b/x-pack/test/pki_api_integration/config.ts
index 50b41ad2518278..a445b3d4943b0f 100644
--- a/x-pack/test/pki_api_integration/config.ts
+++ b/x-pack/test/pki_api_integration/config.ts
@@ -7,7 +7,7 @@
 import { resolve } from 'path';
 import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
 // @ts-ignore
-import { CA_CERT_PATH, ES_KEY_PATH, ES_CERT_PATH } from '@kbn/dev-utils';
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { services } from './services';
 
 export default async function({ readConfigFile }: FtrConfigProviderContext) {
@@ -54,8 +54,8 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
       serverArgs: [
         ...xPackAPITestsConfig.get('kbnTestServer.serverArgs'),
         '--server.ssl.enabled=true',
-        `--server.ssl.key=${ES_KEY_PATH}`,
-        `--server.ssl.certificate=${ES_CERT_PATH}`,
+        `--server.ssl.key=${KBN_KEY_PATH}`,
+        `--server.ssl.certificate=${KBN_CERT_PATH}`,
         `--server.ssl.certificateAuthorities=${JSON.stringify([
           CA_CERT_PATH,
           resolve(__dirname, './fixtures/kibana_ca.crt'),
diff --git a/x-pack/test/pki_api_integration/fixtures/README.md b/x-pack/test/pki_api_integration/fixtures/README.md
index 0fcbc76183b48d..ac2be482c6e333 100644
--- a/x-pack/test/pki_api_integration/fixtures/README.md
+++ b/x-pack/test/pki_api_integration/fixtures/README.md
@@ -1,7 +1,16 @@
 # PKI Fixtures
 
-* `es_ca.key` - the CA key used to sign certificates from @kbn/dev-utils that are used and trusted by test Elasticsearch server.
-* `first_client.p12` and `second_client.p12` - the client certificate bundles signed by `es_ca.key` and hence trusted by
-both test Kibana and Elasticsearch servers.
+* `first_client.p12` and `second_client.p12` - the client certificate bundles signed by the Elastic Stack CA (in `kbn-dev-utils`)
+and hence trusted by both test Kibana and Elasticsearch servers.
 * `untrusted_client.p12` - the client certificate bundle trusted by test Kibana server, but not test Elasticsearch test server.
-* `kibana_ca.crt` and `kibana_ca.key` - the CA certificate and key trusted by test Kibana server only.
\ No newline at end of file
+* `kibana_ca.crt` and `kibana_ca.key` - the CA certificate and key trusted by test Kibana server only.
+
+The `first_client.p12` and `second_client.p12` files were generated the same time as the other certificates in `kbn-dev-utils`, using the
+following commands:
+
+```
+bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name first_client --pass ""
+bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name second_client --pass ""
+```
+
+If that CA is ever changed, these two files must be regenerated.
diff --git a/x-pack/test/pki_api_integration/fixtures/es_ca.key b/x-pack/test/pki_api_integration/fixtures/es_ca.key
deleted file mode 100644
index 5428f86851e5ac..00000000000000
--- a/x-pack/test/pki_api_integration/fixtures/es_ca.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAjSJiqfwPZfvgHO1OZbxzgPn2EW/KewIHXygTAdL926Pm6R45
-G5H972B46NcSUoOZbOhDyvg6OKMJAICiXa85yOf3nyTo4APspR+K4AH60SEJohRF
-mZwL/OryfiKvN5n5DxC2+Hb1wouwBUJM6DP62C24ve8YWuWwNkhJqWKe1YQUzPc1
-svqvU5uaHTzvLtp++RqSDNkcIqWl5S9Ip5PtOv6MHkCaIr2g4KQzplFwhT5qVd1Q
-nYVBsQ0D8htLqUJBfjW0KHouEZpbjxJlc+EuyExS1o1+y3mVT+t2yZHAoIquh5ve
-5A7a/RGJTyoR5u1DFs4Tcx2378kjA86gCQtClwIDAQABAoIBAFTOGKMzxrztQJmh
-Lr6LIoyZpnaLygtoCK3xEprCAbB9KD9j3cTnUMMKIR0oPuY+FW8Pkczgo3ts2/fl
-U6sfo4VJfc2vDA+vy/7cmUJJbkFDrNorfDb1QW7UbqnEhazPZIzc6lUahkpETZyb
-XkMZGN3Ve3EFvojAA8ZaYYjarb52HRddLPZJ7c8ZiHfJ1jHNIvx6dIQ6CJVuovBJ
-OGbbSAK8MjUtOI2XzWNHgUqGHcjVDFysuAac3ckK14TaN4KVNRl+usAMkZwqSM5u
-j/ATFL9hx7nkzh3KWPsuOLMoLX7JN81z0YtT52wTxJoSiZKk/u91JHZ3NcrsOSPS
-oLvVkyECgYEA16qtXvtmboAbqeuXf0nF+7QD0b+MdaRFIacqTG0LpEgY9Tjgs9Pn
-6z44tHABWPVkRLNQZiky99MAq4Ci354Bk9dmylCw9ADH78VGmKWklbQEr1rw4dqm
-DHTj9NQ79SyTdiasQjnnxCilWkrO6ZUqD8og4DT5MhzfxO/ZND8arGsCgYEAp4df
-oI5lwlc1n9X/G9RQAKwNM5un8RmReleUVemjkcvWwvZVEjV0Gcc1WtjB+77Y5B9B
-CM3laURDGrAgX5VS/I2jb0xqBNUr8XccSkDQAP9UuVPZgxpS+8d0R3fxVzniHWwR
-WC2dW/Is40i/6+7AkFXhkiFiqxkvSg4pWHPazYUCgYB/gP7C+urSRZcVXJ3SuXD9
-oK3pYc/O9XGRtd0CFi4d0CpBQIFIj+27XKv1sYp6Z4oCO+k6nPzvG6Z3vrOMdUQF
-fgHddttHRvbtwLo+ISAvCaEDc0aaoMQu9SSYaKmSB+qenbqV5NorVMR9n2C5JGEb
-uKq7I1Z41C1Pp2XIx84jRQKBgQCjKvfZsjesZDJnfg9dtJlDPlARXt7gte16gkiI
-sOnOfAGtnCzZclSlMuBlnk65enVXIpW+FIQH1iOhn7+4OQE92FpBceSk1ldZdJCK
-RbwR7J5Bb0igJ4iBkA9R+KGIOmlgDLyL7MmiHyrXKCk9iynkqrDsGjY2vW3QrCBa
-9WQ73QKBgQDAYZzplO4TPoPK9AnxoW/HpSwGEO7Fb8fLyPg94CvHn4QBCFJUKuTn
-hBp/TJgF6CjQWQMr2FKVFF33Ow7+Qa96YGvmYlEjR/71D4Rlprj5JJpuO154DI3I
-YIMNTjvwEQEI+YamMarKsz0Kq+I1EYSAf6bQ4H2PgxDxwTXaLkl0RA==
------END RSA PRIVATE KEY-----
diff --git a/x-pack/test/pki_api_integration/fixtures/first_client.p12 b/x-pack/test/pki_api_integration/fixtures/first_client.p12
index 62da80d9ab80efbedd24edf322acbc1aecc38ef8..9d838199e8392672bfff64155616ac536acb4621 100644
GIT binary patch
delta 3295
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

delta 3295
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

diff --git a/x-pack/test/pki_api_integration/fixtures/second_client.p12 b/x-pack/test/pki_api_integration/fixtures/second_client.p12
index 1c85686cb7b6867525fc49e51ed4bcde26976646..f41c0e030ba793d8e4c4fa28738383797eaa54d6 100644
GIT binary patch
delta 3369
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

delta 3361
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

diff --git a/x-pack/test/saml_api_integration/fixtures/idp_metadata.xml b/x-pack/test/saml_api_integration/fixtures/idp_metadata.xml
index 132faffd416672..a890fe812987b8 100644
--- a/x-pack/test/saml_api_integration/fixtures/idp_metadata.xml
+++ b/x-pack/test/saml_api_integration/fixtures/idp_metadata.xml
@@ -6,25 +6,25 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <!-- This certificate is extracted from kibana/test/dev_certs/server.crt and should always be in sync with it -->
-          <ds:X509Certificate>MIIDMDCCAhgCCQCkOD7fnHiQrTANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJB
-            VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
-            cyBQdHkgTHRkMRIwEAYDVQQDEwlsb2NhbGhvc3QwIBcNMTYwMTE5MjExNjQ5WhgP
-            MjA4NDAyMDYyMTE2NDlaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0
-            YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMT
-            CWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALR63SnR
-            LW/Dgl0Vuy8gB6KjWwvajRWeXNgvlf6LX56oNsUFREHBLQlC2uT5R26F3tOqCDbs
-            MFNoyDjMBinXRRFJJ2Sokue7GSsGvBv41LMTHnO/MeCCbEOqghJS/QI89cV+u+Aw
-            9U+v426KAlCa1sGuE2+3/JvqdBQyheiukmGLiJ0OofpfgpYuFmKi2uYBKU3qzjUx
-            D01wQ4rCpq5nEnksGhgBeBDnheYmmDsj/wDvnz1exK/WprvTiHQ5MwuIQ4OybwgV
-            WDF+zv8PXrObrsZvD/ulrjh1cakvnCe2kDYEKMRiHUDesHS2jNJkBUe+FJo4/E3U
-            pFoYOtdoBe69BIUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQhjF91G0R662XJJ7
-            jGMudA9VbRVCow8s68I/GWPZmpKxPAxwz0xiv1eFIoiP416LX9amnx3yAmUoN4Wr
-            Cq0jsgyT1AOiSCdxkvYsqQG3SFVVt5BDLjThH66Vxi7Bach6SyATa1NG588mg7n9
-            pPJ4A1rcj+5kZuwnd52kfVLP+535lylwMyoyJa2AskieRPLNSzus2eUDTR6F+9Mb
-            eLOwp5rMl2nNYfLXUCSqEeC6uPu0yq6Tu0N0SjThfKndd2NU1fk3zyOjxyCIhGPe
-            G8VhrPY4lkJ9EE9Tuq095jwd1+q9fYzlKZWhOmg+IcOwUMgbgeWpeZTAhUIZAnia
-            4UH6NA==
+          <!-- This certificate is extracted from KBN_CERT_PATH in @kbn/dev-utils and should always be in sync with it -->
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
+ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
+wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
+FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
+OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
+s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
+vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
+BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
+V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
+z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
++frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
+TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
+b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
+cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
+eOUsdwn1yDKHRxDHyA==
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/x-pack/test/saml_api_integration/fixtures/saml_tools.ts b/x-pack/test/saml_api_integration/fixtures/saml_tools.ts
index f8862e6fb209dc..b7b94b8eeb17ad 100644
--- a/x-pack/test/saml_api_integration/fixtures/saml_tools.ts
+++ b/x-pack/test/saml_api_integration/fixtures/saml_tools.ts
@@ -12,6 +12,7 @@ import zlib from 'zlib';
 import { promisify } from 'util';
 import { parseString } from 'xml2js';
 import { SignedXml } from 'xml-crypto';
+import { KBN_KEY_PATH } from '@kbn/dev-utils';
 
 /**
  * @file Defines a set of tools that allow us to parse and generate various SAML XML messages.
@@ -24,7 +25,7 @@ const inflateRawAsync = promisify(zlib.inflateRaw);
 const deflateRawAsync = promisify(zlib.deflateRaw);
 const parseStringAsync = promisify(parseString);
 
-const signingKey = fs.readFileSync(require.resolve('../../../../test/dev_certs/server.key'));
+const signingKey = fs.readFileSync(KBN_KEY_PATH);
 const signatureAlgorithm = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
 
 export async function getSAMLRequestId(urlWithSAMLRequestId: string) {
diff --git a/yarn.lock b/yarn.lock
index 983ad570e0f680..b6e1ca8b7d27f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3882,6 +3882,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/node-forge@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-0.9.0.tgz#e9f678ec09283f9f35cb8de6c01f86be9278ac08"
+  integrity sha512-J00+BIHJOfagO1Qs67Jp5CZO3VkFxY8YKMt44oBhXr+3ZYNnl8wv/vtcJyPjuH0QZ+q7+5nnc6o/YH91ZJy2pQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/node-jose@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@types/node-jose/-/node-jose-1.1.0.tgz#26e1d234b41a39035482443ef35414bf34ba5d8b"
@@ -20224,6 +20231,11 @@ node-forge@^0.7.6:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
   integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==
 
+node-forge@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.1.tgz#775368e6846558ab6676858a4d8c6e8d16c677b5"
+  integrity sha512-G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ==
+
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"

From 982df2e5a05e5cdfa2f6aae6fbae760c1c0ad3a4 Mon Sep 17 00:00:00 2001
From: Marta Bondyra <marta.bondyra@elastic.co>
Date: Thu, 9 Jan 2020 19:11:15 +0100
Subject: [PATCH 90/96] =?UTF-8?q?fix:=20Table=20visualization=20shows=20to?=
 =?UTF-8?q?tal=20for=20duration,=20percentage=E2=80=A6=20(#54240)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vis_type_table/public/agg_table/agg_table.js       | 10 +++-------
 .../data/common/field_formats/converters/bytes.ts      |  1 +
 .../data/common/field_formats/converters/duration.ts   |  1 +
 .../data/common/field_formats/converters/number.ts     |  1 +
 .../data/common/field_formats/converters/percent.ts    |  1 +
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js b/src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js
index 07870379265c5d..3844f809a5257c 100644
--- a/src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js
+++ b/src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js
@@ -135,18 +135,15 @@ export function KbnAggTable(config, RecursionHelper) {
               }
 
               const isDate =
-                _.get(dimension, 'format.id') === 'date' ||
-                _.get(dimension, 'format.params.id') === 'date';
-              const isNumeric =
-                _.get(dimension, 'format.id') === 'number' ||
-                _.get(dimension, 'format.params.id') === 'number';
+                dimension.format?.id === 'date' || dimension.format?.params?.id === 'date';
+              const allowsNumericalAggregations = formatter?.allowsNumericalAggregations;
 
               let { totalFunc } = $scope;
               if (typeof totalFunc === 'undefined' && showPercentage) {
                 totalFunc = 'sum';
               }
 
-              if (isNumeric || isDate || totalFunc === 'count') {
+              if (allowsNumericalAggregations || isDate || totalFunc === 'count') {
                 const sum = tableRows => {
                   return _.reduce(
                     tableRows,
@@ -161,7 +158,6 @@ export function KbnAggTable(config, RecursionHelper) {
                 };
 
                 formattedColumn.sumTotal = sum(table.rows);
-
                 switch (totalFunc) {
                   case 'sum': {
                     if (!isDate) {
diff --git a/src/plugins/data/common/field_formats/converters/bytes.ts b/src/plugins/data/common/field_formats/converters/bytes.ts
index 6c6df5eb7367d8..f1110add3e7ded 100644
--- a/src/plugins/data/common/field_formats/converters/bytes.ts
+++ b/src/plugins/data/common/field_formats/converters/bytes.ts
@@ -26,4 +26,5 @@ export class BytesFormat extends NumeralFormat {
 
   id = BytesFormat.id;
   title = BytesFormat.title;
+  allowsNumericalAggregations = true;
 }
diff --git a/src/plugins/data/common/field_formats/converters/duration.ts b/src/plugins/data/common/field_formats/converters/duration.ts
index d02de1a2fd8893..8caa11be5ca793 100644
--- a/src/plugins/data/common/field_formats/converters/duration.ts
+++ b/src/plugins/data/common/field_formats/converters/duration.ts
@@ -171,6 +171,7 @@ export class DurationFormat extends FieldFormat {
   static fieldType = KBN_FIELD_TYPES.NUMBER;
   static inputFormats = inputFormats;
   static outputFormats = outputFormats;
+  allowsNumericalAggregations = true;
 
   isHuman() {
     return this.param('outputFormat') === HUMAN_FRIENDLY;
diff --git a/src/plugins/data/common/field_formats/converters/number.ts b/src/plugins/data/common/field_formats/converters/number.ts
index 6969c1551e1ccb..686329e887682d 100644
--- a/src/plugins/data/common/field_formats/converters/number.ts
+++ b/src/plugins/data/common/field_formats/converters/number.ts
@@ -26,4 +26,5 @@ export class NumberFormat extends NumeralFormat {
 
   id = NumberFormat.id;
   title = NumberFormat.title;
+  allowsNumericalAggregations = true;
 }
diff --git a/src/plugins/data/common/field_formats/converters/percent.ts b/src/plugins/data/common/field_formats/converters/percent.ts
index 2ae32c7c77f076..d839a54dd0c2cd 100644
--- a/src/plugins/data/common/field_formats/converters/percent.ts
+++ b/src/plugins/data/common/field_formats/converters/percent.ts
@@ -26,6 +26,7 @@ export class PercentFormat extends NumeralFormat {
 
   id = PercentFormat.id;
   title = PercentFormat.title;
+  allowsNumericalAggregations = true;
 
   getParamDefaults = () => ({
     pattern: this.getConfig!('format:percent:defaultPattern'),

From dfac5d894ec4a2076ab7e0475a6151a7ca021a42 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Thu, 9 Jan 2020 13:14:05 -0500
Subject: [PATCH 91/96] [Monitoring] Ensure setup mode work in a ccs
 environment (#54361)

* Ensure setup mode work in a ccs environment

* Missed this file
---
 .../server/lib/cluster/get_index_patterns.js  |  4 +-
 .../api/v1/setup/cluster_setup_status.js      |  3 +-
 .../routes/api/v1/setup/node_setup_status.js  |  3 +-
 .../apis/monitoring/setup/collection/ccs.js   | 42 +++++++++++++++++++
 .../apis/monitoring/setup/collection/index.js |  1 +
 5 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js

diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_index_patterns.js b/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_index_patterns.js
index 823495298e1e6f..6e8eb3e3c71d3d 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_index_patterns.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_index_patterns.js
@@ -13,9 +13,7 @@ import {
   INDEX_ALERTS,
 } from '../../../common/constants';
 
-export function getIndexPatterns(server, additionalPatterns = {}) {
-  // wildcard means to search _all_ clusters
-  const ccs = '*';
+export function getIndexPatterns(server, additionalPatterns = {}, ccs = '*') {
   const config = server.config();
   const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
   const kbnIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_KIBANA, ccs);
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
index 334fcc4ccc26fd..2b6f3b6e71d0fa 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
+++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
@@ -34,6 +34,7 @@ export function clusterSetupStatusRoute(server) {
           skipLiveData: Joi.boolean().default(false),
         }),
         payload: Joi.object({
+          ccs: Joi.string().optional(),
           timeRange: Joi.object({
             min: Joi.date().required(),
             max: Joi.date().required(),
@@ -49,7 +50,7 @@ export function clusterSetupStatusRoute(server) {
       // the monitoring data. `try/catch` makes it a little more explicit.
       try {
         await verifyMonitoringAuth(req);
-        const indexPatterns = getIndexPatterns(server);
+        const indexPatterns = getIndexPatterns(server, {}, req.payload.ccs);
         status = await getCollectionStatus(
           req,
           indexPatterns,
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
index 01715497cbec4b..2a615b887500d8 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
+++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
@@ -34,6 +34,7 @@ export function nodeSetupStatusRoute(server) {
           skipLiveData: Joi.boolean().default(false),
         }),
         payload: Joi.object({
+          ccs: Joi.string().optional(),
           timeRange: Joi.object({
             min: Joi.date().required(),
             max: Joi.date().required(),
@@ -49,7 +50,7 @@ export function nodeSetupStatusRoute(server) {
       // the monitoring data. `try/catch` makes it a little more explicit.
       try {
         await verifyMonitoringAuth(req);
-        const indexPatterns = getIndexPatterns(server);
+        const indexPatterns = getIndexPatterns(server, {}, req.payload.ccs);
         status = await getCollectionStatus(
           req,
           indexPatterns,
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js
new file mode 100644
index 00000000000000..4c32e311c6cf36
--- /dev/null
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js
@@ -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.
+ */
+
+export default function({ getService }) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('ccs', () => {
+    const archive = 'monitoring/setup/collection/detect_apm';
+    const timeRange = {
+      min: '2019-04-16T00:00:00.741Z',
+      max: '2019-04-16T23:59:59.741Z',
+    };
+
+    before('load archive', () => {
+      return esArchiver.load(archive);
+    });
+
+    after('unload archive', () => {
+      return esArchiver.unload(archive);
+    });
+
+    it('should not fail with a ccs parameter for cluster', async () => {
+      await supertest
+        .post('/api/monitoring/v1/setup/collection/cluster?skipLiveData=true')
+        .set('kbn-xsrf', 'xxx')
+        .send({ timeRange, ccs: '*' })
+        .expect(200);
+    });
+
+    it('should not fail with a ccs parameter for node', async () => {
+      await supertest
+        .post('/api/monitoring/v1/setup/collection/node/123?skipLiveData=true')
+        .set('kbn-xsrf', 'xxx')
+        .send({ timeRange, ccs: '*' })
+        .expect(200);
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/index.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/index.js
index 48d8b15ecbcad0..01594babbc2f42 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/index.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/index.js
@@ -16,5 +16,6 @@ export default function({ loadTestFile }) {
     loadTestFile(require.resolve('./detect_logstash_management'));
     loadTestFile(require.resolve('./detect_apm'));
     loadTestFile(require.resolve('./security'));
+    loadTestFile(require.resolve('./ccs'));
   });
 }

From f3f8f800109bd4ee44fec8ab5bcd6a1b8dca6d4a Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Thu, 9 Jan 2020 14:21:46 -0600
Subject: [PATCH 92/96] Management chrome - fix page boundary widths (#54360)

* add classes to management chrome, use EuiPageSideBar
---
 .../management_chrome/management_chrome.tsx      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/plugins/management/public/components/management_chrome/management_chrome.tsx b/src/plugins/management/public/components/management_chrome/management_chrome.tsx
index 7e5cabd32e48f8..df844e22089365 100644
--- a/src/plugins/management/public/components/management_chrome/management_chrome.tsx
+++ b/src/plugins/management/public/components/management_chrome/management_chrome.tsx
@@ -18,7 +18,7 @@
  */
 
 import * as React from 'react';
-import { EuiPage, EuiPageBody } from '@elastic/eui';
+import { EuiPage, EuiPageBody, EuiPageSideBar } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n/react';
 import { ManagementSidebarNav } from '../management_sidebar_nav';
 import { LegacySection } from '../../types';
@@ -42,12 +42,14 @@ export class ManagementChrome extends React.Component<Props> {
     return (
       <I18nProvider>
         <EuiPage>
-          <ManagementSidebarNav
-            getSections={this.props.getSections}
-            legacySections={this.props.legacySections}
-            selectedId={this.props.selectedId}
-          />
-          <EuiPageBody>
+          <EuiPageSideBar>
+            <ManagementSidebarNav
+              getSections={this.props.getSections}
+              legacySections={this.props.legacySections}
+              selectedId={this.props.selectedId}
+            />
+          </EuiPageSideBar>
+          <EuiPageBody restrictWidth={true} className="mgtPage__body">
             <div ref={this.container} />
           </EuiPageBody>
         </EuiPage>

From 73c3e53183bd7749ac5551c93e8b0f71e28c76f4 Mon Sep 17 00:00:00 2001
From: Nick Partridge <nick.ryan.partridge@gmail.com>
Date: Thu, 9 Jan 2020 14:28:57 -0600
Subject: [PATCH 93/96] [TSVB] Add domain fit option to 0 opacity tsvb line
 charts (#54314)

- Line charts is TSVB will no again fit to the data and provide a padding when away from the zero baseline
---
 package.json                                              | 2 +-
 .../public/components/vis_types/timeseries/vis.js         | 4 ++++
 yarn.lock                                                 | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index be7c95c14934b7..a91e9b80eb49d2 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.7.0",
     "@elastic/apm-rum": "^4.6.0",
-    "@elastic/charts": "^16.0.2",
+    "@elastic/charts": "^16.1.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
     "@elastic/eui": "17.3.1",
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
index 982aca8d3b8132..d269d7c3546ec7 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
@@ -79,10 +79,14 @@ export class TimeseriesVisualization extends Component {
   static getYAxisDomain = model => {
     const axisMin = get(model, 'axis_min', '').toString();
     const axisMax = get(model, 'axis_max', '').toString();
+    const fit = model.series
+      ? model.series.filter(({ hidden }) => !hidden).every(({ fill }) => fill === '0')
+      : model.fill === '0';
 
     return {
       min: axisMin.length ? Number(axisMin) : undefined,
       max: axisMax.length ? Number(axisMax) : undefined,
+      fit,
     };
   };
 
diff --git a/yarn.lock b/yarn.lock
index b6e1ca8b7d27f8..2959b6b3eaf19e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1361,10 +1361,10 @@
   dependencies:
     "@elastic/apm-rum-core" "^4.7.0"
 
-"@elastic/charts@^16.0.2":
-  version "16.0.2"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-16.0.2.tgz#35068a08a19534da62e9bcad700cc7b2a15bc55a"
-  integrity sha512-0tVyltAmAPOAfiRU1iKYk3b9++4oTn6IXvyM4SSj7Ukh5Y90XXmOtGEUPnZTiRPmup9MJi4srrm9ra9k/Kq4UQ==
+"@elastic/charts@^16.1.0":
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-16.1.0.tgz#67cf11625dcd7e1c2cf16ef53349e6a68a73f5b1"
+  integrity sha512-0jZ7thhGmYC0ZdEVkxfg6M66epCD7k7BfYIi12FnrmIK+mUD2IPhR8b2TJXvaojPryN4YTNreGRncQ9R58fOoQ==
   dependencies:
     "@types/d3-shape" "^1.3.1"
     classnames "^2.2.6"

From 6826368842657a7e25b73387708c9cbca0bd9324 Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Thu, 9 Jan 2020 16:26:35 -0500
Subject: [PATCH 94/96] Add separate describe blocks for different functional
 test data sources. (#54395)

---
 .../api_integration/apis/uptime/rest/index.ts    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts
index ef80c1d8728feb..a86411f7c49ece 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -9,10 +9,16 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 export default function({ getService, loadTestFile }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   describe('uptime REST endpoints', () => {
-    before('load heartbeat data', () => esArchiver.load('uptime/blank'));
-    after('unload', () => esArchiver.unload('uptime/blank'));
-    loadTestFile(require.resolve('./snapshot'));
-    loadTestFile(require.resolve('./monitor_latest_status'));
-    loadTestFile(require.resolve('./selected_monitor'));
+    describe('with generated data', () => {
+      before('load heartbeat data', () => esArchiver.load('uptime/blank'));
+      after('unload', () => esArchiver.unload('uptime/blank'));
+      loadTestFile(require.resolve('./snapshot'));
+    });
+    describe('with real-world data', () => {
+      before('load heartbeat data', () => esArchiver.load('uptime/full_heartbeat'));
+      after('unload', () => esArchiver.unload('uptime/full_heartbeat'));
+      loadTestFile(require.resolve('./monitor_latest_status'));
+      loadTestFile(require.resolve('./selected_monitor'));
+    });
   });
 }

From 32e61592ecc75c3f5470b6c1f953e62236790da0 Mon Sep 17 00:00:00 2001
From: Phillip Burch <phillip.burch@live.com>
Date: Thu, 9 Jan 2020 17:09:57 -0600
Subject: [PATCH 95/96] Remove graphql types (#54176)

* Fix server types

* Remove graphql types from the frontend

* More type cleanup

* Replace more types. Delete unused files

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../infra/common/http_api/node_details_api.ts |  2 +-
 .../infra/common/http_api/snapshot_api.ts     | 31 ++++--
 .../aws_ec2/toolbar_items.tsx                 | 14 +--
 .../aws_rds/toolbar_items.tsx                 | 15 +--
 .../inventory_models/aws_s3/toolbar_items.tsx | 14 +--
 .../aws_sqs/toolbar_items.tsx                 | 14 +--
 .../container/toolbar_items.tsx               |  9 +-
 .../inventory_models/host/toolbar_items.tsx   | 11 +--
 .../inventory_models/pod/toolbar_items.tsx    |  9 +-
 .../metrics_and_groupby_toolbar_items.tsx     |  4 +-
 .../public/components/inventory/layout.tsx    | 13 +--
 .../components/inventory/toolbars/toolbar.tsx | 13 +--
 .../inventory/toolbars/toolbar_wrapper.tsx    | 98 ++++++++++---------
 .../chart_context_menu.test.tsx               |  8 +-
 .../metrics_explorer/chart_context_menu.tsx   | 15 +--
 .../components/nodes_overview/index.tsx       | 40 ++++----
 .../components/nodes_overview/table.tsx       |  9 +-
 .../components/waffle/group_of_groups.tsx     |  4 +-
 .../components/waffle/group_of_nodes.tsx      |  4 +-
 .../waffle/lib/create_uptime_link.test.ts     | 21 ++--
 .../waffle/lib/create_uptime_link.ts          |  6 +-
 .../infra/public/components/waffle/map.tsx    |  7 +-
 .../infra/public/components/waffle/node.tsx   |  4 +-
 .../components/waffle/node_context_menu.tsx   |  9 +-
 .../waffle/waffle_group_by_controls.tsx       |  9 +-
 .../waffle/waffle_inventory_switcher.tsx      | 33 +++----
 .../waffle/waffle_metric_controls.tsx         | 12 +--
 .../inventory_metadata/use_inventory_meta.ts  |  4 +-
 .../containers/metadata/use_metadata.ts       |  5 +-
 .../node_details/use_node_details.ts          |  6 +-
 .../containers/waffle/nodes_to_wafflemap.ts   | 15 ++-
 .../public/containers/waffle/use_snaphot.ts   | 13 +--
 .../containers/waffle/with_waffle_options.tsx | 20 ++--
 .../infra/public/containers/with_options.tsx  |  3 +-
 x-pack/legacy/plugins/infra/public/lib/lib.ts | 20 ++--
 .../pages/link_to/redirect_to_node_detail.tsx |  6 +-
 .../pages/link_to/redirect_to_node_logs.tsx   | 12 ++-
 .../pages/metrics/components/helpers.ts       |  5 +-
 .../metrics/components/node_details_page.tsx  |  6 +-
 .../pages/metrics/components/page_body.tsx    |  5 +-
 .../pages/metrics/containers/with_metrics.tsx | 91 -----------------
 .../infra/public/pages/metrics/index.tsx      |  4 +-
 .../infra/public/pages/metrics/types.ts       |  6 +-
 .../store/local/waffle_options/actions.ts     | 13 +--
 .../store/local/waffle_options/reducer.ts     | 19 ++--
 .../lib/adapters/metrics/adapter_types.ts     | 19 ++--
 .../metrics/kibana_metrics_adapter.ts         | 19 ++--
 .../server/lib/domains/metrics_domain.ts      |  4 +-
 .../create_timerange_with_interval.ts         |  2 +-
 .../lib/snapshot/response_helpers.test.ts     |  5 +-
 .../server/lib/snapshot/response_helpers.ts   | 25 ++---
 .../infra/server/lib/snapshot/snapshot.ts     |  6 +-
 .../infra/server/lib/snapshot/types.ts        | 18 +---
 .../routes/metadata/lib/get_node_info.ts      |  5 +-
 .../lib/create_metrics_model.ts               |  3 +-
 .../infra/server/routes/node_details/index.ts |  6 +-
 .../infra/server/routes/snapshot/index.ts     | 10 +-
 .../infra/server/usage/usage_collector.ts     |  5 +-
 .../server/utils/calculate_metric_interval.ts |  4 +-
 59 files changed, 336 insertions(+), 476 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/infra/public/pages/metrics/containers/with_metrics.tsx

diff --git a/x-pack/legacy/plugins/infra/common/http_api/node_details_api.ts b/x-pack/legacy/plugins/infra/common/http_api/node_details_api.ts
index 46aab881bce4c4..0ef5ae82baeb9a 100644
--- a/x-pack/legacy/plugins/infra/common/http_api/node_details_api.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/node_details_api.ts
@@ -50,6 +50,6 @@ export const NodeDetailsRequestRT = rt.intersection([
 ]);
 
 // export type NodeDetailsRequest = InfraWrappableRequest<NodesArgs & SourceArgs>;
-
+export type NodeDetailsMetricData = rt.TypeOf<typeof NodeDetailsMetricDataRT>;
 export type NodeDetailsRequest = rt.TypeOf<typeof NodeDetailsRequestRT>;
 export type NodeDetailsMetricDataResponse = rt.TypeOf<typeof NodeDetailsMetricDataResponseRT>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts b/x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts
index 4ee0c9e23b68fd..c7c15fd8af1610 100644
--- a/x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts
@@ -19,7 +19,7 @@ export const SnapshotNodePathRT = rt.intersection([
 
 const SnapshotNodeMetricOptionalRT = rt.partial({
   value: rt.union([rt.number, rt.null]),
-  average: rt.union([rt.number, rt.null]),
+  avg: rt.union([rt.number, rt.null]),
   max: rt.union([rt.number, rt.null]),
 });
 
@@ -27,8 +27,12 @@ const SnapshotNodeMetricRequiredRT = rt.type({
   name: SnapshotMetricTypeRT,
 });
 
+export const SnapshotNodeMetricRT = rt.intersection([
+  SnapshotNodeMetricRequiredRT,
+  SnapshotNodeMetricOptionalRT,
+]);
 export const SnapshotNodeRT = rt.type({
-  metric: rt.intersection([SnapshotNodeMetricRequiredRT, SnapshotNodeMetricOptionalRT]),
+  metric: SnapshotNodeMetricRT,
   path: rt.array(SnapshotNodePathRT),
 });
 
@@ -43,18 +47,24 @@ export const InfraTimerangeInputRT = rt.type({
   from: rt.number,
 });
 
+export const SnapshotGroupByRT = rt.array(
+  rt.partial({
+    label: rt.union([rt.string, rt.null]),
+    field: rt.union([rt.string, rt.null]),
+  })
+);
+
+export const SnapshotMetricInputRT = rt.type({
+  type: SnapshotMetricTypeRT,
+});
+
 export const SnapshotRequestRT = rt.intersection([
   rt.type({
     timerange: InfraTimerangeInputRT,
     metric: rt.type({
       type: SnapshotMetricTypeRT,
     }),
-    groupBy: rt.array(
-      rt.partial({
-        label: rt.union([rt.string, rt.null]),
-        field: rt.union([rt.string, rt.null]),
-      })
-    ),
+    groupBy: SnapshotGroupByRT,
     nodeType: ItemTypeRT,
     sourceId: rt.string,
   }),
@@ -65,6 +75,11 @@ export const SnapshotRequestRT = rt.intersection([
   }),
 ]);
 
+export type SnapshotNodePath = rt.TypeOf<typeof SnapshotNodePathRT>;
+export type SnapshotMetricInput = rt.TypeOf<typeof SnapshotMetricInputRT>;
+export type InfraTimerangeInput = rt.TypeOf<typeof InfraTimerangeInputRT>;
+export type SnapshotNodeMetric = rt.TypeOf<typeof SnapshotNodeMetricRT>;
+export type SnapshotGroupBy = rt.TypeOf<typeof SnapshotGroupByRT>;
 export type SnapshotRequest = rt.TypeOf<typeof SnapshotRequestRT>;
 export type SnapshotNode = rt.TypeOf<typeof SnapshotNodeRT>;
 export type SnapshotNodeResponse = rt.TypeOf<typeof SnapshotNodeResponseRT>;
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx
index 490b5c552dcc35..4b16728a52bece 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx
@@ -7,16 +7,16 @@
 import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { InfraSnapshotMetricType } from '../../graphql/types';
 import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
+import { SnapshotMetricType } from '../types';
 
 export const AwsEC2ToolbarItems = (props: ToolbarProps) => {
-  const metricTypes = [
-    InfraSnapshotMetricType.cpu,
-    InfraSnapshotMetricType.rx,
-    InfraSnapshotMetricType.tx,
-    InfraSnapshotMetricType.diskIOReadBytes,
-    InfraSnapshotMetricType.diskIOWriteBytes,
+  const metricTypes: SnapshotMetricType[] = [
+    'cpu',
+    'rx',
+    'tx',
+    'diskIOReadBytes',
+    'diskIOWriteBytes',
   ];
   const groupByFields = [
     'cloud.availability_zone',
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx
index 86ed57e8f4c7f9..e4654825a8de1a 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx
@@ -6,17 +6,18 @@
 
 import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { InfraSnapshotMetricType } from '../../../public/graphql/types';
+
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
 import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
+import { SnapshotMetricType } from '../types';
 
 export const AwsRDSToolbarItems = (props: ToolbarProps) => {
-  const metricTypes = [
-    InfraSnapshotMetricType.cpu,
-    InfraSnapshotMetricType.rdsConnections,
-    InfraSnapshotMetricType.rdsQueriesExecuted,
-    InfraSnapshotMetricType.rdsActiveTransactions,
-    InfraSnapshotMetricType.rdsLatency,
+  const metricTypes: SnapshotMetricType[] = [
+    'cpu',
+    'rdsConnections',
+    'rdsQueriesExecuted',
+    'rdsActiveTransactions',
+    'rdsLatency',
   ];
   const groupByFields = [
     'cloud.availability_zone',
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx
index 276b6b83eb43df..d1aa48260db476 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx
@@ -6,17 +6,17 @@
 
 import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
-import { InfraSnapshotMetricType } from '../../../public/graphql/types';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
 import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
+import { SnapshotMetricType } from '../types';
 
 export const AwsS3ToolbarItems = (props: ToolbarProps) => {
-  const metricTypes = [
-    InfraSnapshotMetricType.s3BucketSize,
-    InfraSnapshotMetricType.s3NumberOfObjects,
-    InfraSnapshotMetricType.s3TotalRequests,
-    InfraSnapshotMetricType.s3DownloadBytes,
-    InfraSnapshotMetricType.s3UploadBytes,
+  const metricTypes: SnapshotMetricType[] = [
+    's3BucketSize',
+    's3NumberOfObjects',
+    's3TotalRequests',
+    's3DownloadBytes',
+    's3UploadBytes',
   ];
   const groupByFields = ['cloud.region'];
   return (
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx
index 67baa22a5e6b03..9c5ff51b2d9a21 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx
@@ -7,16 +7,16 @@
 import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { InfraSnapshotMetricType } from '../../graphql/types';
 import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
+import { SnapshotMetricType } from '../types';
 
 export const AwsSQSToolbarItems = (props: ToolbarProps) => {
-  const metricTypes = [
-    InfraSnapshotMetricType.sqsMessagesVisible,
-    InfraSnapshotMetricType.sqsMessagesDelayed,
-    InfraSnapshotMetricType.sqsMessagesSent,
-    InfraSnapshotMetricType.sqsMessagesEmpty,
-    InfraSnapshotMetricType.sqsOldestMessage,
+  const metricTypes: SnapshotMetricType[] = [
+    'sqsMessagesVisible',
+    'sqsMessagesDelayed',
+    'sqsMessagesSent',
+    'sqsMessagesEmpty',
+    'sqsOldestMessage',
   ];
   const groupByFields = ['cloud.region'];
   return (
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/container/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/container/toolbar_items.tsx
index 9ed2cbe6dea084..f1e7ea721cabd0 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/container/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/container/toolbar_items.tsx
@@ -7,15 +7,10 @@
 import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { InfraSnapshotMetricType } from '../../graphql/types';
+import { SnapshotMetricType } from '../types';
 
 export const ContainerToolbarItems = (props: ToolbarProps) => {
-  const metricTypes = [
-    InfraSnapshotMetricType.cpu,
-    InfraSnapshotMetricType.memory,
-    InfraSnapshotMetricType.rx,
-    InfraSnapshotMetricType.tx,
-  ];
+  const metricTypes: SnapshotMetricType[] = ['cpu', 'memory', 'rx', 'tx'];
   const groupByFields = [
     'host.name',
     'cloud.availability_zone',
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/host/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/host/toolbar_items.tsx
index f8df81a33a8ec0..6e0563f2f555b0 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/host/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/host/toolbar_items.tsx
@@ -7,17 +7,10 @@
 import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { InfraSnapshotMetricType } from '../../graphql/types';
+import { SnapshotMetricType } from '../types';
 
 export const HostToolbarItems = (props: ToolbarProps) => {
-  const metricTypes = [
-    InfraSnapshotMetricType.cpu,
-    InfraSnapshotMetricType.memory,
-    InfraSnapshotMetricType.load,
-    InfraSnapshotMetricType.rx,
-    InfraSnapshotMetricType.tx,
-    InfraSnapshotMetricType.logRate,
-  ];
+  const metricTypes: SnapshotMetricType[] = ['cpu', 'memory', 'load', 'rx', 'tx', 'logRate'];
   const groupByFields = [
     'cloud.availability_zone',
     'cloud.machine.type',
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/pod/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/pod/toolbar_items.tsx
index 9ef4a889dc5891..b075f10a15680f 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/pod/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/pod/toolbar_items.tsx
@@ -7,15 +7,10 @@
 import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
-import { InfraSnapshotMetricType } from '../../graphql/types';
+import { SnapshotMetricType } from '../types';
 
 export const PodToolbarItems = (props: ToolbarProps) => {
-  const metricTypes = [
-    InfraSnapshotMetricType.cpu,
-    InfraSnapshotMetricType.memory,
-    InfraSnapshotMetricType.rx,
-    InfraSnapshotMetricType.tx,
-  ];
+  const metricTypes: SnapshotMetricType[] = ['cpu', 'memory', 'rx', 'tx'];
   const groupByFields = ['kubernetes.namespace', 'kubernetes.node.name', 'service.type'];
   return (
     <MetricsAndGroupByToolbarItems
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/shared/compontents/metrics_and_groupby_toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/shared/compontents/metrics_and_groupby_toolbar_items.tsx
index c46ad5c6df952b..dd7be5619df468 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/shared/compontents/metrics_and_groupby_toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/shared/compontents/metrics_and_groupby_toolbar_items.tsx
@@ -9,14 +9,14 @@ import { EuiFlexItem } from '@elastic/eui';
 import { ToolbarProps } from '../../../../public/components/inventory/toolbars/toolbar';
 import { WaffleMetricControls } from '../../../../public/components/waffle/waffle_metric_controls';
 import { WaffleGroupByControls } from '../../../../public/components/waffle/waffle_group_by_controls';
-import { InfraSnapshotMetricType } from '../../../../public/graphql/types';
 import {
   toGroupByOpt,
   toMetricOpt,
 } from '../../../../public/components/inventory/toolbars/toolbar_wrapper';
+import { SnapshotMetricType } from '../../types';
 
 interface Props extends ToolbarProps {
-  metricTypes: InfraSnapshotMetricType[];
+  metricTypes: SnapshotMetricType[];
   groupByFields: string[];
 }
 
diff --git a/x-pack/legacy/plugins/infra/public/components/inventory/layout.tsx b/x-pack/legacy/plugins/infra/public/components/inventory/layout.tsx
index 2d4205c4a36425..4dd9803c7bfce0 100644
--- a/x-pack/legacy/plugins/infra/public/components/inventory/layout.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/inventory/layout.tsx
@@ -6,11 +6,6 @@
 
 import React from 'react';
 import { InfraWaffleMapOptions, InfraWaffleMapBounds } from '../../lib/lib';
-import {
-  InfraNodeType,
-  InfraSnapshotMetricInput,
-  InfraSnapshotGroupbyInput,
-} from '../../graphql/types';
 import { KueryFilterQuery } from '../../store/local/waffle_filter';
 
 import { NodesOverview } from '../nodes_overview';
@@ -18,10 +13,12 @@ import { Toolbar } from './toolbars/toolbar';
 import { PageContent } from '../page';
 import { useSnapshot } from '../../containers/waffle/use_snaphot';
 import { useInventoryMeta } from '../../containers/inventory_metadata/use_inventory_meta';
+import { SnapshotMetricInput, SnapshotGroupBy } from '../../../common/http_api/snapshot_api';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 export interface LayoutProps {
   options: InfraWaffleMapOptions;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   onDrilldown: (filter: KueryFilterQuery) => void;
   currentTime: number;
   onViewChange: (view: string) => void;
@@ -30,8 +27,8 @@ export interface LayoutProps {
   autoBounds: boolean;
 
   filterQuery: string | null | undefined;
-  metric: InfraSnapshotMetricInput;
-  groupBy: InfraSnapshotGroupbyInput[];
+  metric: SnapshotMetricInput;
+  groupBy: SnapshotGroupBy;
   sourceId: string;
   accountId: string;
   region: string;
diff --git a/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar.tsx b/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar.tsx
index 1188e486385ea5..ee0eceee6d1570 100644
--- a/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar.tsx
@@ -7,13 +7,9 @@
 import React, { FunctionComponent } from 'react';
 import { Action } from 'typescript-fsa';
 import { EuiFlexItem } from '@elastic/eui';
+import { SnapshotMetricInput, SnapshotGroupBy } from '../../../../common/http_api/snapshot_api';
 import { InventoryCloudAccount } from '../../../../common/http_api/inventory_meta_api';
 import { findToolbar } from '../../../../common/inventory_models/toolbars';
-import {
-  InfraNodeType,
-  InfraSnapshotMetricInput,
-  InfraSnapshotGroupbyInput,
-} from '../../../graphql/types';
 import { ToolbarWrapper } from './toolbar_wrapper';
 
 import { waffleOptionsSelectors } from '../../../store';
@@ -22,11 +18,12 @@ import { WithWaffleViewState } from '../../../containers/waffle/with_waffle_view
 import { SavedViewsToolbarControls } from '../../saved_views/toolbar_control';
 import { inventoryViewSavedObjectType } from '../../../../common/saved_objects/inventory_view';
 import { IIndexPattern } from '../../../../../../../../src/plugins/data/public';
+import { InventoryItemType } from '../../../../common/inventory_models/types';
 
 export interface ToolbarProps {
   createDerivedIndexPattern: (type: 'logs' | 'metrics' | 'both') => IIndexPattern;
-  changeMetric: (payload: InfraSnapshotMetricInput) => Action<InfraSnapshotMetricInput>;
-  changeGroupBy: (payload: InfraSnapshotGroupbyInput[]) => Action<InfraSnapshotGroupbyInput[]>;
+  changeMetric: (payload: SnapshotMetricInput) => Action<SnapshotMetricInput>;
+  changeGroupBy: (payload: SnapshotGroupBy) => Action<SnapshotGroupBy>;
   changeCustomOptions: (payload: InfraGroupByOptions[]) => Action<InfraGroupByOptions[]>;
   changeAccount: (id: string) => Action<string>;
   changeRegion: (name: string) => Action<string>;
@@ -70,7 +67,7 @@ const wrapToolbarItems = (
 };
 
 interface Props {
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   regions: string[];
   accounts: InventoryCloudAccount[];
 }
diff --git a/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar_wrapper.tsx b/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar_wrapper.tsx
index 9a31544ce4cceb..231030362438fc 100644
--- a/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar_wrapper.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar_wrapper.tsx
@@ -7,12 +7,12 @@
 import React from 'react';
 import { EuiFlexGroup } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { SnapshotMetricType } from '../../../../common/inventory_models/types';
 import { WithSource } from '../../../containers/with_source';
 import { WithWaffleOptions } from '../../../containers/waffle/with_waffle_options';
 import { Toolbar } from '../../eui/toolbar';
 import { ToolbarProps } from './toolbar';
 import { fieldToName } from '../../waffle/lib/field_to_display_name';
-import { InfraSnapshotMetricType } from '../../../graphql/types';
 
 interface Props {
   children: (props: Omit<ToolbarProps, 'accounts' | 'regions'>) => React.ReactElement;
@@ -144,123 +144,125 @@ export const toGroupByOpt = (field: string) => ({
   field,
 });
 
-export const toMetricOpt = (metric: InfraSnapshotMetricType) => {
+export const toMetricOpt = (
+  metric: SnapshotMetricType
+): { text: string; value: SnapshotMetricType } => {
   switch (metric) {
-    case InfraSnapshotMetricType.cpu:
+    case 'cpu':
       return {
         text: ToolbarTranslations.CPUUsage,
-        value: InfraSnapshotMetricType.cpu,
+        value: 'cpu',
       };
-    case InfraSnapshotMetricType.memory:
+    case 'memory':
       return {
         text: ToolbarTranslations.MemoryUsage,
-        value: InfraSnapshotMetricType.memory,
+        value: 'memory',
       };
-    case InfraSnapshotMetricType.rx:
+    case 'rx':
       return {
         text: ToolbarTranslations.InboundTraffic,
-        value: InfraSnapshotMetricType.rx,
+        value: 'rx',
       };
-    case InfraSnapshotMetricType.tx:
+    case 'tx':
       return {
         text: ToolbarTranslations.OutboundTraffic,
-        value: InfraSnapshotMetricType.tx,
+        value: 'tx',
       };
-    case InfraSnapshotMetricType.logRate:
+    case 'logRate':
       return {
         text: ToolbarTranslations.LogRate,
-        value: InfraSnapshotMetricType.logRate,
+        value: 'logRate',
       };
-    case InfraSnapshotMetricType.load:
+    case 'load':
       return {
         text: ToolbarTranslations.Load,
-        value: InfraSnapshotMetricType.load,
+        value: 'load',
       };
 
-    case InfraSnapshotMetricType.count:
+    case 'count':
       return {
         text: ToolbarTranslations.Count,
-        value: InfraSnapshotMetricType.count,
+        value: 'count',
       };
-    case InfraSnapshotMetricType.diskIOReadBytes:
+    case 'diskIOReadBytes':
       return {
         text: ToolbarTranslations.DiskIOReadBytes,
-        value: InfraSnapshotMetricType.diskIOReadBytes,
+        value: 'diskIOReadBytes',
       };
-    case InfraSnapshotMetricType.diskIOWriteBytes:
+    case 'diskIOWriteBytes':
       return {
         text: ToolbarTranslations.DiskIOWriteBytes,
-        value: InfraSnapshotMetricType.diskIOWriteBytes,
+        value: 'diskIOWriteBytes',
       };
-    case InfraSnapshotMetricType.s3BucketSize:
+    case 's3BucketSize':
       return {
         text: ToolbarTranslations.s3BucketSize,
-        value: InfraSnapshotMetricType.s3BucketSize,
+        value: 's3BucketSize',
       };
-    case InfraSnapshotMetricType.s3TotalRequests:
+    case 's3TotalRequests':
       return {
         text: ToolbarTranslations.s3TotalRequests,
-        value: InfraSnapshotMetricType.s3TotalRequests,
+        value: 's3TotalRequests',
       };
-    case InfraSnapshotMetricType.s3NumberOfObjects:
+    case 's3NumberOfObjects':
       return {
         text: ToolbarTranslations.s3NumberOfObjects,
-        value: InfraSnapshotMetricType.s3NumberOfObjects,
+        value: 's3NumberOfObjects',
       };
-    case InfraSnapshotMetricType.s3DownloadBytes:
+    case 's3DownloadBytes':
       return {
         text: ToolbarTranslations.s3DownloadBytes,
-        value: InfraSnapshotMetricType.s3DownloadBytes,
+        value: 's3DownloadBytes',
       };
-    case InfraSnapshotMetricType.s3UploadBytes:
+    case 's3UploadBytes':
       return {
         text: ToolbarTranslations.s3UploadBytes,
-        value: InfraSnapshotMetricType.s3UploadBytes,
+        value: 's3UploadBytes',
       };
-    case InfraSnapshotMetricType.rdsConnections:
+    case 'rdsConnections':
       return {
         text: ToolbarTranslations.rdsConnections,
-        value: InfraSnapshotMetricType.rdsConnections,
+        value: 'rdsConnections',
       };
-    case InfraSnapshotMetricType.rdsQueriesExecuted:
+    case 'rdsQueriesExecuted':
       return {
         text: ToolbarTranslations.rdsQueriesExecuted,
-        value: InfraSnapshotMetricType.rdsQueriesExecuted,
+        value: 'rdsQueriesExecuted',
       };
-    case InfraSnapshotMetricType.rdsActiveTransactions:
+    case 'rdsActiveTransactions':
       return {
         text: ToolbarTranslations.rdsActiveTransactions,
-        value: InfraSnapshotMetricType.rdsActiveTransactions,
+        value: 'rdsActiveTransactions',
       };
-    case InfraSnapshotMetricType.rdsLatency:
+    case 'rdsLatency':
       return {
         text: ToolbarTranslations.rdsLatency,
-        value: InfraSnapshotMetricType.rdsLatency,
+        value: 'rdsLatency',
       };
-    case InfraSnapshotMetricType.sqsMessagesVisible:
+    case 'sqsMessagesVisible':
       return {
         text: ToolbarTranslations.sqsMessagesVisible,
-        value: InfraSnapshotMetricType.sqsMessagesVisible,
+        value: 'sqsMessagesVisible',
       };
-    case InfraSnapshotMetricType.sqsMessagesDelayed:
+    case 'sqsMessagesDelayed':
       return {
         text: ToolbarTranslations.sqsMessagesDelayed,
-        value: InfraSnapshotMetricType.sqsMessagesDelayed,
+        value: 'sqsMessagesDelayed',
       };
-    case InfraSnapshotMetricType.sqsMessagesSent:
+    case 'sqsMessagesSent':
       return {
         text: ToolbarTranslations.sqsMessagesSent,
-        value: InfraSnapshotMetricType.sqsMessagesSent,
+        value: 'sqsMessagesSent',
       };
-    case InfraSnapshotMetricType.sqsMessagesEmpty:
+    case 'sqsMessagesEmpty':
       return {
         text: ToolbarTranslations.sqsMessagesEmpty,
-        value: InfraSnapshotMetricType.sqsMessagesEmpty,
+        value: 'sqsMessagesEmpty',
       };
-    case InfraSnapshotMetricType.sqsOldestMessage:
+    case 'sqsOldestMessage':
       return {
         text: ToolbarTranslations.sqsOldestMessage,
-        value: InfraSnapshotMetricType.sqsOldestMessage,
+        value: 'sqsOldestMessage',
       };
   }
 };
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
index 6c044baa56d7ce..4dd46e9ef233ad 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
@@ -8,7 +8,6 @@ import React from 'react';
 import { MetricsExplorerChartContextMenu, createNodeDetailLink } from './chart_context_menu';
 import { mount } from 'enzyme';
 import { options, source, timeRange, chartOptions } from '../../utils/fixtures/metrics_explorer';
-import { InfraNodeType } from '../../graphql/types';
 import DateMath from '@elastic/datemath';
 import { ReactWrapper } from 'enzyme';
 import { Capabilities } from 'src/core/public';
@@ -163,12 +162,7 @@ describe('MetricsExplorerChartContextMenu', () => {
       const toDateStrig = '2019-01-01T12:00:00Z';
       const to = DateMath.parse(toDateStrig, { roundUp: true })!;
       const from = DateMath.parse(fromDateStrig)!;
-      const link = createNodeDetailLink(
-        InfraNodeType.host,
-        'example-01',
-        fromDateStrig,
-        toDateStrig
-      );
+      const link = createNodeDetailLink('host', 'example-01', fromDateStrig, toDateStrig);
       expect(link).toBe(
         `#/link-to/host-detail/example-01?to=${to.valueOf()}&from=${from.valueOf()}`
       );
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
index 597386fc24ee84..298f7dd8f8d175 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
@@ -21,9 +21,9 @@ import {
   MetricsExplorerChartOptions,
 } from '../../containers/metrics_explorer/use_metrics_explorer_options';
 import { createTSVBLink } from './helpers/create_tsvb_link';
-import { InfraNodeType } from '../../graphql/types';
 import { getNodeDetailUrl } from '../../pages/link_to/redirect_to_node_detail';
 import { SourceConfiguration } from '../../utils/source_configuration';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 interface Props {
   options: MetricsExplorerOptions;
@@ -35,15 +35,18 @@ interface Props {
   chartOptions: MetricsExplorerChartOptions;
 }
 
-const fieldToNodeType = (source: SourceConfiguration, field: string): InfraNodeType | undefined => {
+const fieldToNodeType = (
+  source: SourceConfiguration,
+  field: string
+): InventoryItemType | undefined => {
   if (source.fields.host === field) {
-    return InfraNodeType.host;
+    return 'host';
   }
   if (source.fields.pod === field) {
-    return InfraNodeType.pod;
+    return 'pod';
   }
   if (source.fields.container === field) {
-    return InfraNodeType.container;
+    return 'container';
   }
 };
 
@@ -54,7 +57,7 @@ const dateMathExpressionToEpoch = (dateMathExpression: string, roundUp = false):
 };
 
 export const createNodeDetailLink = (
-  nodeType: InfraNodeType,
+  nodeType: InventoryItemType,
   nodeId: string,
   from: string,
   to: string
diff --git a/x-pack/legacy/plugins/infra/public/components/nodes_overview/index.tsx b/x-pack/legacy/plugins/infra/public/components/nodes_overview/index.tsx
index 21db0c73f612ae..8e8015ce6a82e7 100644
--- a/x-pack/legacy/plugins/infra/public/components/nodes_overview/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/nodes_overview/index.tsx
@@ -11,7 +11,6 @@ import { get, max, min } from 'lodash';
 import React from 'react';
 
 import euiStyled from '../../../../../common/eui_styled_components';
-import { InfraSnapshotMetricType, InfraSnapshotNode, InfraNodeType } from '../../graphql/types';
 import { InfraFormatterType, InfraWaffleMapBounds, InfraWaffleMapOptions } from '../../lib/lib';
 import { KueryFilterQuery } from '../../store/local/waffle_filter';
 import { createFormatter } from '../../utils/formatters';
@@ -22,10 +21,11 @@ import { ViewSwitcher } from '../waffle/view_switcher';
 import { TableView } from './table';
 import { SnapshotNode } from '../../../common/http_api/snapshot_api';
 import { convertIntervalToString } from '../../utils/convert_interval_to_string';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 interface Props {
   options: InfraWaffleMapOptions;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   nodes: SnapshotNode[];
   loading: boolean;
   reload: () => void;
@@ -49,56 +49,56 @@ interface MetricFormatters {
 }
 
 const METRIC_FORMATTERS: MetricFormatters = {
-  [InfraSnapshotMetricType.count]: { formatter: InfraFormatterType.number, template: '{{value}}' },
-  [InfraSnapshotMetricType.cpu]: {
+  ['count']: { formatter: InfraFormatterType.number, template: '{{value}}' },
+  ['cpu']: {
     formatter: InfraFormatterType.percent,
     template: '{{value}}',
   },
-  [InfraSnapshotMetricType.memory]: {
+  ['memory']: {
     formatter: InfraFormatterType.percent,
     template: '{{value}}',
   },
-  [InfraSnapshotMetricType.rx]: { formatter: InfraFormatterType.bits, template: '{{value}}/s' },
-  [InfraSnapshotMetricType.tx]: { formatter: InfraFormatterType.bits, template: '{{value}}/s' },
-  [InfraSnapshotMetricType.logRate]: {
+  ['rx']: { formatter: InfraFormatterType.bits, template: '{{value}}/s' },
+  ['tx']: { formatter: InfraFormatterType.bits, template: '{{value}}/s' },
+  ['logRate']: {
     formatter: InfraFormatterType.abbreviatedNumber,
     template: '{{value}}/s',
   },
-  [InfraSnapshotMetricType.diskIOReadBytes]: {
+  ['diskIOReadBytes']: {
     formatter: InfraFormatterType.bytes,
     template: '{{value}}/s',
   },
-  [InfraSnapshotMetricType.diskIOWriteBytes]: {
+  ['diskIOWriteBytes']: {
     formatter: InfraFormatterType.bytes,
     template: '{{value}}/s',
   },
-  [InfraSnapshotMetricType.s3BucketSize]: {
+  ['s3BucketSize']: {
     formatter: InfraFormatterType.bytes,
     template: '{{value}}',
   },
-  [InfraSnapshotMetricType.s3TotalRequests]: {
+  ['s3TotalRequests']: {
     formatter: InfraFormatterType.abbreviatedNumber,
     template: '{{value}}',
   },
-  [InfraSnapshotMetricType.s3NumberOfObjects]: {
+  ['s3NumberOfObjects']: {
     formatter: InfraFormatterType.abbreviatedNumber,
     template: '{{value}}',
   },
-  [InfraSnapshotMetricType.s3UploadBytes]: {
+  ['s3UploadBytes']: {
     formatter: InfraFormatterType.bytes,
     template: '{{value}}',
   },
-  [InfraSnapshotMetricType.s3DownloadBytes]: {
+  ['s3DownloadBytes']: {
     formatter: InfraFormatterType.bytes,
     template: '{{value}}',
   },
-  [InfraSnapshotMetricType.sqsOldestMessage]: {
+  ['sqsOldestMessage']: {
     formatter: InfraFormatterType.number,
     template: '{{value}} seconds',
   },
 };
 
-const calculateBoundsFromNodes = (nodes: InfraSnapshotNode[]): InfraWaffleMapBounds => {
+const calculateBoundsFromNodes = (nodes: SnapshotNode[]): InfraWaffleMapBounds => {
   const maxValues = nodes.map(node => node.metric.max);
   const minValues = nodes.map(node => node.metric.value);
   // if there is only one value then we need to set the bottom range to zero for min
@@ -211,11 +211,7 @@ export const NodesOverview = class extends React.Component<Props, {}> {
   // TODO: Change this to a real implimentation using the tickFormatter from the prototype as an example.
   private formatter = (val: string | number) => {
     const { metric } = this.props.options;
-    const metricFormatter = get(
-      METRIC_FORMATTERS,
-      metric.type,
-      METRIC_FORMATTERS[InfraSnapshotMetricType.count]
-    );
+    const metricFormatter = get(METRIC_FORMATTERS, metric.type, METRIC_FORMATTERS.count);
     if (val == null) {
       return '';
     }
diff --git a/x-pack/legacy/plugins/infra/public/components/nodes_overview/table.tsx b/x-pack/legacy/plugins/infra/public/components/nodes_overview/table.tsx
index 8996b170f01d21..dc0de6f6e9c69a 100644
--- a/x-pack/legacy/plugins/infra/public/components/nodes_overview/table.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/nodes_overview/table.tsx
@@ -10,14 +10,15 @@ import { i18n } from '@kbn/i18n';
 import { last } from 'lodash';
 import React from 'react';
 import { createWaffleMapNode } from '../../containers/waffle/nodes_to_wafflemap';
-import { InfraSnapshotNode, InfraSnapshotNodePath, InfraNodeType } from '../../graphql/types';
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../lib/lib';
 import { fieldToName } from '../waffle/lib/field_to_display_name';
 import { NodeContextMenu } from '../waffle/node_context_menu';
+import { InventoryItemType } from '../../../common/inventory_models/types';
+import { SnapshotNode, SnapshotNodePath } from '../../../common/http_api/snapshot_api';
 
 interface Props {
-  nodes: InfraSnapshotNode[];
-  nodeType: InfraNodeType;
+  nodes: SnapshotNode[];
+  nodeType: InventoryItemType;
   options: InfraWaffleMapOptions;
   formatter: (subject: string | number) => string;
   currentTime: number;
@@ -30,7 +31,7 @@ const initialState = {
 
 type State = Readonly<typeof initialState>;
 
-const getGroupPaths = (path: InfraSnapshotNodePath[]) => {
+const getGroupPaths = (path: SnapshotNodePath[]) => {
   switch (path.length) {
     case 3:
       return path.slice(0, 2);
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/group_of_groups.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/group_of_groups.tsx
index 7a229fbbe02ec6..60a117e3ed6171 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/group_of_groups.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/group_of_groups.tsx
@@ -7,7 +7,6 @@
 import React from 'react';
 
 import euiStyled from '../../../../../common/eui_styled_components';
-import { InfraNodeType } from '../../graphql/types';
 import {
   InfraWaffleMapBounds,
   InfraWaffleMapGroupOfGroups,
@@ -15,6 +14,7 @@ import {
 } from '../../lib/lib';
 import { GroupName } from './group_name';
 import { GroupOfNodes } from './group_of_nodes';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 interface Props {
   onDrilldown: (filter: string) => void;
@@ -22,7 +22,7 @@ interface Props {
   group: InfraWaffleMapGroupOfGroups;
   formatter: (val: number) => string;
   bounds: InfraWaffleMapBounds;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   currentTime: number;
 }
 
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/group_of_nodes.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/group_of_nodes.tsx
index c40c68cbdbf280..b47b8f6a1bf39a 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/group_of_nodes.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/group_of_nodes.tsx
@@ -7,7 +7,6 @@
 import React from 'react';
 
 import euiStyled from '../../../../../common/eui_styled_components';
-import { InfraNodeType } from '../../graphql/types';
 import {
   InfraWaffleMapBounds,
   InfraWaffleMapGroupOfNodes,
@@ -15,6 +14,7 @@ import {
 } from '../../lib/lib';
 import { GroupName } from './group_name';
 import { Node } from './node';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 interface Props {
   onDrilldown: (filter: string) => void;
@@ -23,7 +23,7 @@ interface Props {
   formatter: (val: number) => string;
   isChild: boolean;
   bounds: InfraWaffleMapBounds;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   currentTime: number;
 }
 
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/lib/create_uptime_link.test.ts b/x-pack/legacy/plugins/infra/public/components/waffle/lib/create_uptime_link.test.ts
index 6fdf8be15bc9e5..1a285ceefec0e1 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/lib/create_uptime_link.test.ts
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/lib/create_uptime_link.test.ts
@@ -10,8 +10,7 @@ import {
   InfraWaffleMapLegendMode,
   InfraFormatterType,
 } from '../../../lib/lib';
-import { InfraNodeType } from '../../../../common/graphql/types';
-import { InfraSnapshotMetricType } from '../../../graphql/types';
+import { SnapshotMetricType } from '../../../../common/inventory_models/types';
 
 const options: InfraWaffleMapOptions = {
   fields: {
@@ -24,7 +23,7 @@ const options: InfraWaffleMapOptions = {
   },
   formatter: InfraFormatterType.percent,
   formatTemplate: '{{value}}',
-  metric: { type: InfraSnapshotMetricType.cpu },
+  metric: { type: 'cpu' },
   groupBy: [],
   legend: {
     type: InfraWaffleMapLegendMode.gradient,
@@ -41,13 +40,13 @@ describe('createUptimeLink()', () => {
       ip: '10.0.1.2',
       path: [],
       metric: {
-        name: InfraSnapshotMetricType.cpu,
+        name: 'cpu' as SnapshotMetricType,
         value: 0.5,
         max: 0.8,
         avg: 0.6,
       },
     };
-    expect(createUptimeLink(options, InfraNodeType.host, node)).toBe(
+    expect(createUptimeLink(options, 'host', node)).toBe(
       '../app/uptime#/?search=host.ip:"10.0.1.2"'
     );
   });
@@ -59,13 +58,13 @@ describe('createUptimeLink()', () => {
       name: 'host-01',
       path: [],
       metric: {
-        name: InfraSnapshotMetricType.cpu,
+        name: 'cpu' as SnapshotMetricType,
         value: 0.5,
         max: 0.8,
         avg: 0.6,
       },
     };
-    expect(createUptimeLink(options, InfraNodeType.host, node)).toBe(
+    expect(createUptimeLink(options, 'host', node)).toBe(
       '../app/uptime#/?search=host.name:"host-01"'
     );
   });
@@ -77,13 +76,13 @@ describe('createUptimeLink()', () => {
       name: 'pod-01',
       path: [],
       metric: {
-        name: InfraSnapshotMetricType.cpu,
+        name: 'cpu' as SnapshotMetricType,
         value: 0.5,
         max: 0.8,
         avg: 0.6,
       },
     };
-    expect(createUptimeLink(options, InfraNodeType.pod, node)).toBe(
+    expect(createUptimeLink(options, 'pod', node)).toBe(
       '../app/uptime#/?search=kubernetes.pod.uid:"29193-pod-02939"'
     );
   });
@@ -95,13 +94,13 @@ describe('createUptimeLink()', () => {
       name: 'docker-01',
       path: [],
       metric: {
-        name: InfraSnapshotMetricType.cpu,
+        name: 'cpu' as SnapshotMetricType,
         value: 0.5,
         max: 0.8,
         avg: 0.6,
       },
     };
-    expect(createUptimeLink(options, InfraNodeType.container, node)).toBe(
+    expect(createUptimeLink(options, 'container', node)).toBe(
       '../app/uptime#/?search=container.id:"docker-1234"'
     );
   });
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/lib/create_uptime_link.ts b/x-pack/legacy/plugins/infra/public/components/waffle/lib/create_uptime_link.ts
index 7fc0d3cfeee416..05b4b6d514cd06 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/lib/create_uptime_link.ts
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/lib/create_uptime_link.ts
@@ -5,17 +5,17 @@
  */
 
 import { get } from 'lodash';
-import { InfraNodeType } from '../../../graphql/types';
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../lib/lib';
+import { InventoryItemType } from '../../../../common/inventory_models/types';
 
 const BASE_URL = '../app/uptime#/?search=';
 
 export const createUptimeLink = (
   options: InfraWaffleMapOptions,
-  nodeType: InfraNodeType,
+  nodeType: InventoryItemType,
   node: InfraWaffleMapNode
 ) => {
-  if (nodeType === InfraNodeType.host && node.ip) {
+  if (nodeType === 'host' && node.ip) {
     return `${BASE_URL}host.ip:"${node.ip}"`;
   }
   const field = get(options, ['fields', nodeType], '');
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/map.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/map.tsx
index 6c0209a60f1cd5..91fb84840f37f5 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/map.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/map.tsx
@@ -11,17 +11,18 @@ import {
   isWaffleMapGroupWithGroups,
   isWaffleMapGroupWithNodes,
 } from '../../containers/waffle/type_guards';
-import { InfraSnapshotNode, InfraNodeType } from '../../graphql/types';
 import { InfraWaffleMapBounds, InfraWaffleMapOptions } from '../../lib/lib';
 import { AutoSizer } from '../auto_sizer';
 import { GroupOfGroups } from './group_of_groups';
 import { GroupOfNodes } from './group_of_nodes';
 import { Legend } from './legend';
 import { applyWaffleMapLayout } from './lib/apply_wafflemap_layout';
+import { SnapshotNode } from '../../../common/http_api/snapshot_api';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 interface Props {
-  nodes: InfraSnapshotNode[];
-  nodeType: InfraNodeType;
+  nodes: SnapshotNode[];
+  nodeType: InventoryItemType;
   options: InfraWaffleMapOptions;
   formatter: (subject: string | number) => string;
   currentTime: number;
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/node.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/node.tsx
index f0770064c3cf99..72e2a4c8f35d7c 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/node.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/node.tsx
@@ -11,10 +11,10 @@ import { i18n } from '@kbn/i18n';
 
 import { ConditionalToolTip } from './conditional_tooltip';
 import euiStyled from '../../../../../common/eui_styled_components';
-import { InfraNodeType } from '../../graphql/types';
 import { InfraWaffleMapBounds, InfraWaffleMapNode, InfraWaffleMapOptions } from '../../lib/lib';
 import { colorFromValue } from './lib/color_from_value';
 import { NodeContextMenu } from './node_context_menu';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 const initialState = {
   isPopoverOpen: false,
@@ -28,7 +28,7 @@ interface Props {
   node: InfraWaffleMapNode;
   formatter: (val: number) => string;
   bounds: InfraWaffleMapBounds;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   currentTime: number;
 }
 
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/node_context_menu.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/node_context_menu.tsx
index cb894f37c1fce4..5a90efcc51a574 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/node_context_menu.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/node_context_menu.tsx
@@ -13,19 +13,19 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import React from 'react';
-import { InfraNodeType } from '../../graphql/types';
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../lib/lib';
 import { getNodeDetailUrl, getNodeLogsUrl } from '../../pages/link_to';
 import { createUptimeLink } from './lib/create_uptime_link';
 import { findInventoryModel } from '../../../common/inventory_models';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 interface Props {
   options: InfraWaffleMapOptions;
   currentTime: number;
   children: any;
   node: InfraWaffleMapNode;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   isPopoverOpen: boolean;
   closePopover: () => void;
   popoverPosition: EuiPopoverProps['anchorPosition'];
@@ -47,7 +47,7 @@ export const NodeContextMenu = ({
   // We need to have some exceptions until 7.0 & ECS is finalized. Reference
   // #26620 for the details for these fields.
   // TODO: This is tech debt, remove it after 7.0 & ECS migration.
-  const apmField = nodeType === InfraNodeType.host ? 'host.hostname' : inventoryModel.fields.id;
+  const apmField = nodeType === 'host' ? 'host.hostname' : inventoryModel.fields.id;
 
   const nodeLogsMenuItem = {
     name: i18n.translate('xpack.infra.nodeContextMenu.viewLogsName', {
@@ -95,8 +95,7 @@ export const NodeContextMenu = ({
   const showAPMTraceLink =
     inventoryModel.crosslinkSupport.apm && uiCapabilities?.apm && uiCapabilities?.apm.show;
   const showUptimeLink =
-    inventoryModel.crosslinkSupport.uptime &&
-    ([InfraNodeType.pod, InfraNodeType.container].includes(nodeType) || node.ip);
+    inventoryModel.crosslinkSupport.uptime && (['pod', 'container'].includes(nodeType) || node.ip);
 
   const items = [
     ...(showLogsLink ? [nodeLogsMenuItem] : []),
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
index 0a9df1f666f3d5..003eeb96cc41c4 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
@@ -17,16 +17,17 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { IFieldType } from 'src/plugins/data/public';
-import { InfraNodeType, InfraSnapshotGroupbyInput } from '../../graphql/types';
 import { InfraGroupByOptions } from '../../lib/lib';
 import { CustomFieldPanel } from './custom_field_panel';
 import euiStyled from '../../../../../common/eui_styled_components';
+import { InventoryItemType } from '../../../common/inventory_models/types';
+import { SnapshotGroupBy } from '../../../common/http_api/snapshot_api';
 
 interface Props {
   options: Array<{ text: string; field: string; toolTipContent?: string }>;
-  nodeType: InfraNodeType;
-  groupBy: InfraSnapshotGroupbyInput[];
-  onChange: (groupBy: InfraSnapshotGroupbyInput[]) => void;
+  nodeType: InventoryItemType;
+  groupBy: SnapshotGroupBy;
+  onChange: (groupBy: SnapshotGroupBy) => void;
   onChangeCustomOptions: (options: InfraGroupByOptions[]) => void;
   fields: IFieldType[];
   customOptions: InfraGroupByOptions[];
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
index 785531db2ff5ed..dec988593b0cef 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
@@ -14,20 +14,15 @@ import {
 
 import React, { useCallback, useState, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  InfraSnapshotMetricInput,
-  InfraSnapshotMetricType,
-  InfraNodeType,
-  InfraSnapshotGroupbyInput,
-} from '../../graphql/types';
 import { findInventoryModel } from '../../../common/inventory_models';
 import { InventoryItemType } from '../../../common/inventory_models/types';
+import { SnapshotMetricInput, SnapshotGroupBy } from '../../../common/http_api/snapshot_api';
 
 interface WaffleInventorySwitcherProps {
-  nodeType: InfraNodeType;
-  changeNodeType: (nodeType: InfraNodeType) => void;
-  changeGroupBy: (groupBy: InfraSnapshotGroupbyInput[]) => void;
-  changeMetric: (metric: InfraSnapshotMetricInput) => void;
+  nodeType: InventoryItemType;
+  changeNodeType: (nodeType: InventoryItemType) => void;
+  changeGroupBy: (groupBy: SnapshotGroupBy) => void;
+  changeMetric: (metric: SnapshotMetricInput) => void;
   changeAccount: (id: string) => void;
   changeRegion: (name: string) => void;
 }
@@ -49,7 +44,7 @@ export const WaffleInventorySwitcher: React.FC<WaffleInventorySwitcherProps> = (
   const closePopover = useCallback(() => setIsOpen(false), []);
   const openPopover = useCallback(() => setIsOpen(true), []);
   const goToNodeType = useCallback(
-    (targetNodeType: InfraNodeType) => {
+    (targetNodeType: InventoryItemType) => {
       closePopover();
       changeNodeType(targetNodeType);
       changeGroupBy([]);
@@ -57,18 +52,18 @@ export const WaffleInventorySwitcher: React.FC<WaffleInventorySwitcherProps> = (
       changeRegion('');
       const inventoryModel = findInventoryModel(targetNodeType);
       changeMetric({
-        type: inventoryModel.metrics.defaultSnapshot as InfraSnapshotMetricType,
+        type: inventoryModel.metrics.defaultSnapshot,
       });
     },
     [closePopover, changeNodeType, changeGroupBy, changeMetric, changeAccount, changeRegion]
   );
-  const goToHost = useCallback(() => goToNodeType('host' as InfraNodeType), [goToNodeType]);
-  const goToK8 = useCallback(() => goToNodeType('pod' as InfraNodeType), [goToNodeType]);
-  const goToDocker = useCallback(() => goToNodeType('container' as InfraNodeType), [goToNodeType]);
-  const goToAwsEC2 = useCallback(() => goToNodeType('awsEC2' as InfraNodeType), [goToNodeType]);
-  const goToAwsS3 = useCallback(() => goToNodeType('awsS3' as InfraNodeType), [goToNodeType]);
-  const goToAwsRDS = useCallback(() => goToNodeType('awsRDS' as InfraNodeType), [goToNodeType]);
-  const goToAwsSQS = useCallback(() => goToNodeType('awsSQS' as InfraNodeType), [goToNodeType]);
+  const goToHost = useCallback(() => goToNodeType('host'), [goToNodeType]);
+  const goToK8 = useCallback(() => goToNodeType('pod'), [goToNodeType]);
+  const goToDocker = useCallback(() => goToNodeType('container'), [goToNodeType]);
+  const goToAwsEC2 = useCallback(() => goToNodeType('awsEC2'), [goToNodeType]);
+  const goToAwsS3 = useCallback(() => goToNodeType('awsS3'), [goToNodeType]);
+  const goToAwsRDS = useCallback(() => goToNodeType('awsRDS'), [goToNodeType]);
+  const goToAwsSQS = useCallback(() => goToNodeType('awsSQS'), [goToNodeType]);
   const panels = useMemo(
     () =>
       [
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_metric_controls.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_metric_controls.tsx
index d5ae6fcf7f7a2b..f9e48730eaaf24 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_metric_controls.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_metric_controls.tsx
@@ -14,13 +14,13 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
-
-import { InfraSnapshotMetricInput, InfraSnapshotMetricType } from '../../graphql/types';
+import { SnapshotMetricInput } from '../../../common/http_api/snapshot_api';
+import { SnapshotMetricType } from '../../../common/inventory_models/types';
 
 interface Props {
-  options: Array<{ text: string; value: InfraSnapshotMetricType }>;
-  metric: InfraSnapshotMetricInput;
-  onChange: (metric: InfraSnapshotMetricInput) => void;
+  options: Array<{ text: string; value: SnapshotMetricType }>;
+  metric: SnapshotMetricInput;
+  onChange: (metric: SnapshotMetricInput) => void;
 }
 
 const initialState = {
@@ -90,7 +90,7 @@ export const WaffleMetricControls = class extends React.PureComponent<Props, Sta
     this.setState(state => ({ isPopoverOpen: !state.isPopoverOpen }));
   };
 
-  private handleClick = (value: InfraSnapshotMetricType) => () => {
+  private handleClick = (value: SnapshotMetricType) => () => {
     this.props.onChange({ type: value });
     this.handleClose();
   };
diff --git a/x-pack/legacy/plugins/infra/public/containers/inventory_metadata/use_inventory_meta.ts b/x-pack/legacy/plugins/infra/public/containers/inventory_metadata/use_inventory_meta.ts
index c7a7b4d61bd124..0ed1f3e35449b4 100644
--- a/x-pack/legacy/plugins/infra/public/containers/inventory_metadata/use_inventory_meta.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/inventory_metadata/use_inventory_meta.ts
@@ -13,9 +13,9 @@ import {
   InventoryMetaResponseRT,
   InventoryMetaResponse,
 } from '../../../common/http_api/inventory_meta_api';
-import { InfraNodeType } from '../../graphql/types';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
-export function useInventoryMeta(sourceId: string, nodeType: InfraNodeType) {
+export function useInventoryMeta(sourceId: string, nodeType: InventoryItemType) {
   const decodeResponse = (response: any) => {
     return pipe(
       InventoryMetaResponseRT.decode(response),
diff --git a/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts b/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts
index 83e176aea1039a..52c522ce8efd42 100644
--- a/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts
@@ -8,16 +8,15 @@ import { useEffect } from 'react';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
-import { InfraNodeType } from '../../graphql/types';
 import { InfraMetadata, InfraMetadataRT } from '../../../common/http_api/metadata_api';
 import { useHTTPRequest } from '../../hooks/use_http_request';
 import { throwErrors, createPlainError } from '../../../common/runtime_types';
-import { InventoryMetric } from '../../../common/inventory_models/types';
+import { InventoryMetric, InventoryItemType } from '../../../common/inventory_models/types';
 import { getFilteredMetrics } from './lib/get_filtered_metrics';
 
 export function useMetadata(
   nodeId: string,
-  nodeType: InfraNodeType,
+  nodeType: InventoryItemType,
   requiredMetrics: InventoryMetric[],
   sourceId: string
 ) {
diff --git a/x-pack/legacy/plugins/infra/public/containers/node_details/use_node_details.ts b/x-pack/legacy/plugins/infra/public/containers/node_details/use_node_details.ts
index e86e56a5911998..189c48ba1a70c4 100644
--- a/x-pack/legacy/plugins/infra/public/containers/node_details/use_node_details.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/node_details/use_node_details.ts
@@ -6,19 +6,19 @@
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
-import { InfraNodeType, InfraTimerangeInput } from '../../graphql/types';
 import { throwErrors, createPlainError } from '../../../common/runtime_types';
 import { useHTTPRequest } from '../../hooks/use_http_request';
 import {
   NodeDetailsMetricDataResponseRT,
   NodeDetailsMetricDataResponse,
 } from '../../../common/http_api/node_details_api';
-import { InventoryMetric } from '../../../common/inventory_models/types';
+import { InventoryMetric, InventoryItemType } from '../../../common/inventory_models/types';
+import { InfraTimerangeInput } from '../../../common/http_api/snapshot_api';
 
 export function useNodeDetails(
   metrics: InventoryMetric[],
   nodeId: string,
-  nodeType: InfraNodeType,
+  nodeType: InventoryItemType,
   sourceId: string,
   timerange: InfraTimerangeInput,
   cloudId: string
diff --git a/x-pack/legacy/plugins/infra/public/containers/waffle/nodes_to_wafflemap.ts b/x-pack/legacy/plugins/infra/public/containers/waffle/nodes_to_wafflemap.ts
index 18595d47886300..d2511ba7e669e6 100644
--- a/x-pack/legacy/plugins/infra/public/containers/waffle/nodes_to_wafflemap.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/waffle/nodes_to_wafflemap.ts
@@ -6,8 +6,6 @@
 
 import { i18n } from '@kbn/i18n';
 import { first, last } from 'lodash';
-
-import { InfraSnapshotNode, InfraSnapshotNodePath } from '../../graphql/types';
 import {
   InfraWaffleMapGroup,
   InfraWaffleMapGroupOfGroups,
@@ -15,14 +13,15 @@ import {
   InfraWaffleMapNode,
 } from '../../lib/lib';
 import { isWaffleMapGroupWithGroups, isWaffleMapGroupWithNodes } from './type_guards';
+import { SnapshotNodePath, SnapshotNode } from '../../../common/http_api/snapshot_api';
 
-export function createId(path: InfraSnapshotNodePath[]) {
+export function createId(path: SnapshotNodePath[]) {
   return path.map(p => p.value).join('/');
 }
 
 function findOrCreateGroupWithNodes(
   groups: InfraWaffleMapGroup[],
-  path: InfraSnapshotNodePath[]
+  path: SnapshotNodePath[]
 ): InfraWaffleMapGroupOfNodes {
   const id = path.length === 0 ? '__all__' : createId(path);
   /**
@@ -62,7 +61,7 @@ function findOrCreateGroupWithNodes(
 
 function findOrCreateGroupWithGroups(
   groups: InfraWaffleMapGroup[],
-  path: InfraSnapshotNodePath[]
+  path: SnapshotNodePath[]
 ): InfraWaffleMapGroupOfGroups {
   const id = path.length === 0 ? '__all__' : createId(path);
   const lastPath = last(path);
@@ -85,7 +84,7 @@ function findOrCreateGroupWithGroups(
   };
 }
 
-export function createWaffleMapNode(node: InfraSnapshotNode): InfraWaffleMapNode {
+export function createWaffleMapNode(node: SnapshotNode): InfraWaffleMapNode {
   const nodePathItem = last(node.path);
   if (!nodePathItem) {
     throw new Error('There must be at least one node path item');
@@ -106,8 +105,8 @@ function withoutGroup(group: InfraWaffleMapGroup) {
   };
 }
 
-export function nodesToWaffleMap(nodes: InfraSnapshotNode[]): InfraWaffleMapGroup[] {
-  return nodes.reduce((groups: InfraWaffleMapGroup[], node: InfraSnapshotNode) => {
+export function nodesToWaffleMap(nodes: SnapshotNode[]): InfraWaffleMapGroup[] {
+  return nodes.reduce((groups: InfraWaffleMapGroup[], node: SnapshotNode) => {
     const waffleNode = createWaffleMapNode(node);
     if (node.path.length === 2) {
       const parentGroup = findOrCreateGroupWithNodes(
diff --git a/x-pack/legacy/plugins/infra/public/containers/waffle/use_snaphot.ts b/x-pack/legacy/plugins/infra/public/containers/waffle/use_snaphot.ts
index d318d812353092..31f02f46caedac 100644
--- a/x-pack/legacy/plugins/infra/public/containers/waffle/use_snaphot.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/waffle/use_snaphot.ts
@@ -8,23 +8,20 @@ import { useEffect } from 'react';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
-import {
-  InfraNodeType,
-  InfraSnapshotMetricInput,
-  InfraSnapshotGroupbyInput,
-} from '../../graphql/types';
 import { throwErrors, createPlainError } from '../../../common/runtime_types';
 import { useHTTPRequest } from '../../hooks/use_http_request';
 import {
   SnapshotNodeResponseRT,
   SnapshotNodeResponse,
+  SnapshotGroupBy,
 } from '../../../common/http_api/snapshot_api';
+import { InventoryItemType, SnapshotMetricType } from '../../../common/inventory_models/types';
 
 export function useSnapshot(
   filterQuery: string | null | undefined,
-  metric: InfraSnapshotMetricInput,
-  groupBy: InfraSnapshotGroupbyInput[],
-  nodeType: InfraNodeType,
+  metric: { type: SnapshotMetricType },
+  groupBy: SnapshotGroupBy,
+  nodeType: InventoryItemType,
   sourceId: string,
   currentTime: number,
   accountId: string,
diff --git a/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_options.tsx b/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_options.tsx
index 6d10a753f9ed0f..45222b32aa51ff 100644
--- a/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_options.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_options.tsx
@@ -9,17 +9,17 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 
 import { isBoolean, isNumber } from 'lodash';
-import {
-  InfraSnapshotMetricInput,
-  InfraSnapshotMetricType,
-  InfraNodeType,
-  InfraSnapshotGroupbyInput,
-} from '../../graphql/types';
 import { InfraGroupByOptions } from '../../lib/lib';
 import { State, waffleOptionsActions, waffleOptionsSelectors } from '../../store';
 import { asChildFunctionRenderer } from '../../utils/typed_react';
 import { bindPlainActionCreators } from '../../utils/typed_redux';
 import { UrlStateContainer } from '../../utils/url_state';
+import { SnapshotMetricInput, SnapshotGroupBy } from '../../../common/http_api/snapshot_api';
+import {
+  SnapshotMetricTypeRT,
+  InventoryItemType,
+  ItemTypeRT,
+} from '../../../common/inventory_models/types';
 
 const selectOptionsUrlState = createSelector(
   waffleOptionsSelectors.selectMetric,
@@ -194,13 +194,13 @@ const mapToUrlState = (value: any): WaffleOptionsUrlState | undefined =>
       }
     : undefined;
 
-const isInfraNodeType = (value: any): value is InfraNodeType => value in InfraNodeType;
+const isInfraNodeType = (value: any): value is InventoryItemType => value in ItemTypeRT;
 
-const isInfraSnapshotMetricInput = (subject: any): subject is InfraSnapshotMetricInput => {
-  return subject != null && subject.type in InfraSnapshotMetricType;
+const isInfraSnapshotMetricInput = (subject: any): subject is SnapshotMetricInput => {
+  return subject != null && subject.type in SnapshotMetricTypeRT;
 };
 
-const isInfraSnapshotGroupbyInput = (subject: any): subject is InfraSnapshotGroupbyInput => {
+const isInfraSnapshotGroupbyInput = (subject: any): subject is SnapshotGroupBy => {
   return subject != null && subject.type != null;
 };
 
diff --git a/x-pack/legacy/plugins/infra/public/containers/with_options.tsx b/x-pack/legacy/plugins/infra/public/containers/with_options.tsx
index 349d7fda74f1fe..4294697fd4103e 100644
--- a/x-pack/legacy/plugins/infra/public/containers/with_options.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/with_options.tsx
@@ -7,7 +7,6 @@
 import moment from 'moment';
 import React from 'react';
 
-import { InfraSnapshotMetricType } from '../graphql/types';
 import { InfraFormatterType, InfraOptions, InfraWaffleMapLegendMode } from '../lib/lib';
 import { RendererFunction } from '../utils/typed_react';
 
@@ -24,7 +23,7 @@ const initialState = {
     wafflemap: {
       formatter: InfraFormatterType.percent,
       formatTemplate: '{{value}}',
-      metric: { type: InfraSnapshotMetricType.cpu },
+      metric: { type: 'cpu' },
       groupBy: [],
       legend: {
         type: InfraWaffleMapLegendMode.gradient,
diff --git a/x-pack/legacy/plugins/infra/public/lib/lib.ts b/x-pack/legacy/plugins/infra/public/lib/lib.ts
index 4b402ce6beafe3..9f851e185018b6 100644
--- a/x-pack/legacy/plugins/infra/public/lib/lib.ts
+++ b/x-pack/legacy/plugins/infra/public/lib/lib.ts
@@ -10,14 +10,14 @@ import ApolloClient from 'apollo-client';
 import { AxiosRequestConfig } from 'axios';
 import React from 'react';
 import { Observable } from 'rxjs';
+import { SourceQuery } from '../graphql/types';
 import {
-  InfraSnapshotMetricInput,
-  InfraSnapshotNodeMetric,
-  InfraSnapshotNodePath,
-  InfraSnapshotGroupbyInput,
+  SnapshotMetricInput,
+  SnapshotGroupBy,
   InfraTimerangeInput,
-  SourceQuery,
-} from '../graphql/types';
+  SnapshotNodeMetric,
+  SnapshotNodePath,
+} from '../../common/http_api/snapshot_api';
 
 export interface InfraFrontendLibs {
   apolloClient: InfraApolloClient;
@@ -102,8 +102,8 @@ export interface InfraWaffleMapNode {
   id: string;
   name: string;
   ip?: string | null;
-  path: InfraSnapshotNodePath[];
-  metric: InfraSnapshotNodeMetric;
+  path: SnapshotNodePath[];
+  metric: SnapshotNodeMetric;
 }
 
 export type InfraWaffleMapGroup = InfraWaffleMapGroupOfNodes | InfraWaffleMapGroupOfGroups;
@@ -165,8 +165,8 @@ export interface InfraWaffleMapOptions {
   fields?: SourceQuery.Query['source']['configuration']['fields'] | null;
   formatter: InfraFormatterType;
   formatTemplate: string;
-  metric: InfraSnapshotMetricInput;
-  groupBy: InfraSnapshotGroupbyInput[];
+  metric: SnapshotMetricInput;
+  groupBy: SnapshotGroupBy;
   legend: InfraWaffleMapLegend;
 }
 
diff --git a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
index a2cebbb96a4f0d..ec1cc8ba45332e 100644
--- a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
@@ -8,12 +8,12 @@ import React from 'react';
 import { Redirect, RouteComponentProps } from 'react-router-dom';
 
 import { replaceMetricTimeInQueryString } from '../metrics/containers/with_metrics_time';
-import { InfraNodeType } from '../../graphql/types';
 import { getFromFromLocation, getToFromLocation } from './query_params';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 type RedirectToNodeDetailProps = RouteComponentProps<{
   nodeId: string;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
 }>;
 
 export const RedirectToNodeDetail = ({
@@ -36,7 +36,7 @@ export const getNodeDetailUrl = ({
   to,
   from,
 }: {
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   nodeId: string;
   to?: number;
   from?: number;
diff --git a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
index 99b558cf1cafab..6f1fdd606dd736 100644
--- a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
@@ -14,18 +14,22 @@ import { LoadingPage } from '../../components/loading_page';
 import { replaceLogFilterInQueryString } from '../../containers/logs/log_filter';
 import { replaceLogPositionInQueryString } from '../../containers/logs/log_position';
 import { replaceSourceIdInQueryString } from '../../containers/source_id';
-import { InfraNodeType, SourceConfigurationFields } from '../../graphql/types';
+import { SourceConfigurationFields } from '../../graphql/types';
 import { getFilterFromLocation, getTimeFromLocation } from './query_params';
 import { useSource } from '../../containers/source/source';
 import { findInventoryFields } from '../../../common/inventory_models';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 type RedirectToNodeLogsType = RouteComponentProps<{
   nodeId: string;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   sourceId?: string;
 }>;
 
-const getFieldByNodeType = (nodeType: InfraNodeType, fields: SourceConfigurationFields.Fields) => {
+const getFieldByNodeType = (
+  nodeType: InventoryItemType,
+  fields: SourceConfigurationFields.Fields
+) => {
   const inventoryFields = findInventoryFields(nodeType, fields);
   return inventoryFields.id;
 };
@@ -75,6 +79,6 @@ export const getNodeLogsUrl = ({
   time,
 }: {
   nodeId: string;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   time?: number;
 }) => [`#/link-to/${nodeType}-logs/`, nodeId, ...(time ? [`?time=${time}`] : [])].join('');
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/helpers.ts b/x-pack/legacy/plugins/infra/public/pages/metrics/components/helpers.ts
index 68c459983bd72f..4449196f2fb537 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/helpers.ts
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/helpers.ts
@@ -8,13 +8,14 @@ import { ReactText } from 'react';
 import Color from 'color';
 import { get, first, last, min, max } from 'lodash';
 import { createFormatter } from '../../../utils/formatters';
-import { InfraDataSeries, InfraMetricData } from '../../../graphql/types';
+import { InfraDataSeries } from '../../../graphql/types';
 import {
   InventoryVisTypeRT,
   InventoryFormatterType,
   InventoryVisType,
 } from '../../../../common/inventory_models/types';
 import { SeriesOverrides } from '../types';
+import { NodeDetailsMetricData } from '../../../../common/http_api/node_details_api';
 
 /**
  * Returns a formatter
@@ -34,7 +35,7 @@ export const seriesHasLessThen2DataPoints = (series: InfraDataSeries): boolean =
 /**
  * Returns the minimum and maximum timestamp for a metric
  */
-export const getMaxMinTimestamp = (metric: InfraMetricData): [number, number] => {
+export const getMaxMinTimestamp = (metric: NodeDetailsMetricData): [number, number] => {
   if (metric.series.some(seriesHasLessThen2DataPoints)) {
     return [0, 0];
   }
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details_page.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details_page.tsx
index 2f4eb57cd5161f..cc662f8fd5b570 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details_page.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details_page.tsx
@@ -13,9 +13,9 @@ import {
   EuiHideFor,
   EuiTitle,
 } from '@elastic/eui';
-import { InventoryMetric } from '../../../../common/inventory_models/types';
+import { InfraTimerangeInput } from '../../../../common/http_api/snapshot_api';
+import { InventoryMetric, InventoryItemType } from '../../../../common/inventory_models/types';
 import { useNodeDetails } from '../../../containers/node_details/use_node_details';
-import { InfraNodeType, InfraTimerangeInput } from '../../../graphql/types';
 import { MetricsSideNav } from './side_nav';
 import { AutoSizer } from '../../../components/auto_sizer';
 import { MetricsTimeControls } from './time_controls';
@@ -32,7 +32,7 @@ interface Props {
   requiredMetrics: InventoryMetric[];
   nodeId: string;
   cloudId: string;
-  nodeType: InfraNodeType;
+  nodeType: InventoryItemType;
   sourceId: string;
   timeRange: MetricsTimeInput;
   parsedTimeRange: InfraTimerangeInput;
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/page_body.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/page_body.tsx
index 81c96c0ffe68d7..414b9c60adee39 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/page_body.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/page_body.tsx
@@ -8,16 +8,17 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { findLayout } from '../../../../common/inventory_models/layouts';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
-import { InfraMetricData } from '../../../graphql/types';
+
 import { MetricsTimeInput } from '../containers/with_metrics_time';
 import { InfraLoadingPanel } from '../../../components/loading';
 import { NoData } from '../../../components/empty_states';
+import { NodeDetailsMetricData } from '../../../../common/http_api/node_details_api';
 
 interface Props {
   loading: boolean;
   refetch: () => void;
   type: InventoryItemType;
-  metrics: InfraMetricData[];
+  metrics: NodeDetailsMetricData[];
   onChangeRangeTime?: (time: MetricsTimeInput) => void;
   isLiveStreaming?: boolean;
   stopLiveStreaming?: () => void;
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/containers/with_metrics.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/containers/with_metrics.tsx
deleted file mode 100644
index 6f7e411628d27b..00000000000000
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/containers/with_metrics.tsx
+++ /dev/null
@@ -1,91 +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 { ApolloError } from 'apollo-client';
-import React from 'react';
-import { Query } from 'react-apollo';
-import { i18n } from '@kbn/i18n';
-import {
-  InfraMetric,
-  InfraMetricData,
-  InfraNodeType,
-  MetricsQuery,
-  InfraTimerangeInput,
-} from '../../../graphql/types';
-import { metricsQuery } from './metrics.gql_query';
-import { InventoryMetric, InventoryMetricRT } from '../../../../common/inventory_models/types';
-
-interface WithMetricsArgs {
-  metrics: InfraMetricData[];
-  error?: ApolloError | undefined;
-  loading: boolean;
-  refetch: () => void;
-}
-
-interface WithMetricsProps {
-  children: (args: WithMetricsArgs) => React.ReactNode;
-  requiredMetrics: InventoryMetric[];
-  nodeType: InfraNodeType;
-  nodeId: string;
-  cloudId: string;
-  sourceId: string;
-  timerange: InfraTimerangeInput;
-}
-
-const isInfraMetrics = (subject: any[]): subject is InfraMetric[] => {
-  return subject.every(s => InventoryMetricRT.is(s));
-};
-
-export const WithMetrics = ({
-  children,
-  requiredMetrics,
-  sourceId,
-  timerange,
-  nodeType,
-  nodeId,
-  cloudId,
-}: WithMetricsProps) => {
-  if (!isInfraMetrics(requiredMetrics)) {
-    throw new Error(
-      i18n.translate('xpack.infra.invalidInventoryMetricsError', {
-        defaultMessage: 'One of the InfraMetric is invalid',
-      })
-    );
-  }
-
-  return (
-    <Query<MetricsQuery.Query, MetricsQuery.Variables>
-      query={metricsQuery}
-      fetchPolicy="no-cache"
-      notifyOnNetworkStatusChange
-      variables={{
-        sourceId,
-        metrics: requiredMetrics,
-        nodeType,
-        nodeId,
-        cloudId,
-        timerange,
-      }}
-    >
-      {({ data, error, loading, refetch }) => {
-        return children({
-          metrics: filterOnlyInfraMetricData(data && data.source && data.source.metrics),
-          error,
-          loading,
-          refetch,
-        });
-      }}
-    </Query>
-  );
-};
-
-const filterOnlyInfraMetricData = (
-  metrics: Array<MetricsQuery.Metrics | null> | undefined
-): InfraMetricData[] => {
-  if (!metrics) {
-    return [];
-  }
-  return metrics.filter(m => m !== null).map(m => m as InfraMetricData);
-};
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
index b7e8274802555a..4c0d2d7c93d7ac 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
@@ -10,7 +10,6 @@ import { DocumentTitle } from '../../components/document_title';
 import { Header } from '../../components/header';
 import { ColumnarPage, PageContent } from '../../components/page';
 import { WithMetricsTime, WithMetricsTimeUrlState } from './containers/with_metrics_time';
-import { InfraNodeType } from '../../graphql/types';
 import { withMetricPageProviders } from './page_providers';
 import { useMetadata } from '../../containers/metadata/use_metadata';
 import { Source } from '../../containers/source';
@@ -19,6 +18,7 @@ import { findInventoryModel } from '../../../common/inventory_models';
 import { NavItem } from './lib/side_nav_context';
 import { NodeDetailsPage } from './components/node_details_page';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { InventoryItemType } from '../../../common/inventory_models/types';
 
 const DetailPageContent = euiStyled(PageContent)`
   overflow: auto;
@@ -39,7 +39,7 @@ export const MetricDetail = withMetricPageProviders(
   withTheme(({ match, theme }: Props) => {
     const uiCapabilities = useKibana().services.application?.capabilities;
     const nodeId = match.params.node;
-    const nodeType = match.params.type as InfraNodeType;
+    const nodeType = match.params.type as InventoryItemType;
     const inventoryModel = findInventoryModel(nodeType);
     const { sourceId } = useContext(Source.Context);
     const {
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/types.ts b/x-pack/legacy/plugins/infra/public/pages/metrics/types.ts
index e752164796150f..4b9e32fddcc76c 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/types.ts
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/types.ts
@@ -6,12 +6,12 @@
 
 import rt from 'io-ts';
 import { EuiTheme } from '../../../../../common/eui_styled_components';
-import { InfraMetricData } from '../../graphql/types';
 import { InventoryFormatterTypeRT } from '../../../common/inventory_models/types';
 import { MetricsTimeInput } from './containers/with_metrics_time';
+import { NodeDetailsMetricData } from '../../../common/http_api/node_details_api';
 
 export interface LayoutProps {
-  metrics?: InfraMetricData[];
+  metrics?: NodeDetailsMetricData[];
   onChangeRangeTime?: (time: MetricsTimeInput) => void;
   isLiveStreaming?: boolean;
   stopLiveStreaming?: () => void;
@@ -55,7 +55,7 @@ export const VisSectionPropsRT = rt.partial({
 
 export type VisSectionProps = rt.TypeOf<typeof VisSectionPropsRT> & {
   id?: string;
-  metric?: InfraMetricData;
+  metric?: NodeDetailsMetricData;
   onChangeRangeTime?: (time: MetricsTimeInput) => void;
   isLiveStreaming?: boolean;
   stopLiveStreaming?: () => void;
diff --git a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/actions.ts b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/actions.ts
index d72e9e05f2aeaa..4a1b45084b08a7 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/actions.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/actions.ts
@@ -5,19 +5,16 @@
  */
 
 import actionCreatorFactory from 'typescript-fsa';
-import {
-  InfraSnapshotMetricInput,
-  InfraNodeType,
-  InfraSnapshotGroupbyInput,
-} from '../../../graphql/types';
+import { SnapshotGroupBy, SnapshotMetricInput } from '../../../../common/http_api/snapshot_api';
+import { InventoryItemType } from '../../../../common/inventory_models/types';
 import { InfraGroupByOptions, InfraWaffleMapBounds } from '../../../lib/lib';
 
 const actionCreator = actionCreatorFactory('x-pack/infra/local/waffle_options');
 
-export const changeMetric = actionCreator<InfraSnapshotMetricInput>('CHANGE_METRIC');
-export const changeGroupBy = actionCreator<InfraSnapshotGroupbyInput[]>('CHANGE_GROUP_BY');
+export const changeMetric = actionCreator<SnapshotMetricInput>('CHANGE_METRIC');
+export const changeGroupBy = actionCreator<SnapshotGroupBy>('CHANGE_GROUP_BY');
 export const changeCustomOptions = actionCreator<InfraGroupByOptions[]>('CHANGE_CUSTOM_OPTIONS');
-export const changeNodeType = actionCreator<InfraNodeType>('CHANGE_NODE_TYPE');
+export const changeNodeType = actionCreator<InventoryItemType>('CHANGE_NODE_TYPE');
 export const changeView = actionCreator<string>('CHANGE_VIEW');
 export const changeBoundsOverride = actionCreator<InfraWaffleMapBounds>('CHANGE_BOUNDS_OVERRIDE');
 export const changeAutoBounds = actionCreator<boolean>('CHANGE_AUTO_BOUNDS');
diff --git a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/reducer.ts b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/reducer.ts
index a8aa91695b3a52..9d86ffe612a288 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/reducer.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/reducer.ts
@@ -6,13 +6,7 @@
 
 import { combineReducers } from 'redux';
 import { reducerWithInitialState } from 'typescript-fsa-reducers';
-
-import {
-  InfraSnapshotMetricInput,
-  InfraSnapshotMetricType,
-  InfraNodeType,
-  InfraSnapshotGroupbyInput,
-} from '../../../graphql/types';
+import { SnapshotMetricInput, SnapshotGroupBy } from '../../../../common/http_api/snapshot_api';
 import { InfraGroupByOptions, InfraWaffleMapBounds } from '../../../lib/lib';
 import {
   changeAutoBounds,
@@ -25,11 +19,12 @@ import {
   changeAccount,
   changeRegion,
 } from './actions';
+import { InventoryItemType } from '../../../../common/inventory_models/types';
 
 export interface WaffleOptionsState {
-  metric: InfraSnapshotMetricInput;
-  groupBy: InfraSnapshotGroupbyInput[];
-  nodeType: InfraNodeType;
+  metric: SnapshotMetricInput;
+  groupBy: SnapshotGroupBy;
+  nodeType: InventoryItemType;
   view: string;
   customOptions: InfraGroupByOptions[];
   boundsOverride: InfraWaffleMapBounds;
@@ -39,9 +34,9 @@ export interface WaffleOptionsState {
 }
 
 export const initialWaffleOptionsState: WaffleOptionsState = {
-  metric: { type: InfraSnapshotMetricType.cpu },
+  metric: { type: 'cpu' },
   groupBy: [],
-  nodeType: InfraNodeType.host,
+  nodeType: 'host',
   view: 'map',
   customOptions: [],
   boundsOverride: { max: 1, min: 0 },
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/adapter_types.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
index 844eaf76049277..6659cb060b1a8e 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
@@ -6,22 +6,19 @@
 
 import { RequestHandlerContext, KibanaRequest } from 'src/core/server';
 import {
-  InfraMetric,
-  InfraMetricData,
-  InfraNodeType,
-  InfraTimerangeInput,
-} from '../../../graphql/types';
+  NodeDetailsRequest,
+  NodeDetailsMetricData,
+} from '../../../../common/http_api/node_details_api';
+import { InventoryMetric } from '../../../../common/inventory_models/types';
 import { InfraSourceConfiguration } from '../../sources';
 
-export interface InfraMetricsRequestOptions {
+export interface InfraMetricsRequestOptions
+  extends Omit<NodeDetailsRequest, 'sourceId' | 'nodeId' | 'cloudId'> {
   nodeIds: {
     nodeId: string;
     cloudId?: string | null;
   };
-  nodeType: InfraNodeType;
   sourceConfiguration: InfraSourceConfiguration;
-  timerange: InfraTimerangeInput;
-  metrics: InfraMetric[];
 }
 
 export interface InfraMetricsAdapter {
@@ -29,7 +26,7 @@ export interface InfraMetricsAdapter {
     requestContext: RequestHandlerContext,
     options: InfraMetricsRequestOptions,
     request: KibanaRequest
-  ): Promise<InfraMetricData[]>;
+  ): Promise<NodeDetailsMetricData[]>;
 }
 
 export enum InfraMetricModelQueryType {
@@ -52,7 +49,7 @@ export enum InfraMetricModelMetricType {
 }
 
 export interface InfraMetricModel {
-  id: InfraMetric;
+  id: InventoryMetric;
   requires: string[];
   index_pattern: string | string[];
   interval: string;
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
index 6acb8afbfb2491..eb5ac05644a227 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
@@ -7,12 +7,16 @@
 import { i18n } from '@kbn/i18n';
 import { flatten, get } from 'lodash';
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
-import { InfraMetric, InfraMetricData } from '../../../graphql/types';
+import { NodeDetailsMetricData } from '../../../../common/http_api/node_details_api';
 import { KibanaFramework } from '../framework/kibana_framework_adapter';
 import { InfraMetricsAdapter, InfraMetricsRequestOptions } from './adapter_types';
 import { checkValidNode } from './lib/check_valid_node';
 import { metrics, findInventoryFields } from '../../../../common/inventory_models';
-import { TSVBMetricModelCreator } from '../../../../common/inventory_models/types';
+import {
+  TSVBMetricModelCreator,
+  InventoryMetric,
+  InventoryMetricRT,
+} from '../../../../common/inventory_models/types';
 import { calculateMetricInterval } from '../../../utils/calculate_metric_interval';
 
 export class KibanaMetricsAdapter implements InfraMetricsAdapter {
@@ -26,7 +30,7 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
     requestContext: RequestHandlerContext,
     options: InfraMetricsRequestOptions,
     rawRequest: KibanaRequest
-  ): Promise<InfraMetricData[]> {
+  ): Promise<NodeDetailsMetricData[]> {
     const indexPattern = `${options.sourceConfiguration.metricAlias},${options.sourceConfiguration.logAlias}`;
     const fields = findInventoryFields(options.nodeType, options.sourceConfiguration.fields);
     const nodeField = fields.id;
@@ -58,8 +62,7 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
           );
 
           return metricIds.map((id: string) => {
-            const infraMetricId: InfraMetric = (InfraMetric as any)[id];
-            if (!infraMetricId) {
+            if (!InventoryMetricRT.is(id)) {
               throw new Error(
                 i18n.translate('xpack.infra.kibanaMetrics.invalidInfraMetricErrorMessage', {
                   defaultMessage: '{id} is not a valid InfraMetric',
@@ -69,9 +72,9 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
                 })
               );
             }
-            const panel = result[infraMetricId];
+            const panel = result[id];
             return {
-              id: infraMetricId,
+              id,
               series: panel.series.map(series => {
                 return {
                   id: series.id,
@@ -87,7 +90,7 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
   }
 
   async makeTSVBRequest(
-    metricId: InfraMetric,
+    metricId: InventoryMetric,
     options: InfraMetricsRequestOptions,
     nodeField: string,
     requestContext: RequestHandlerContext
diff --git a/x-pack/legacy/plugins/infra/server/lib/domains/metrics_domain.ts b/x-pack/legacy/plugins/infra/server/lib/domains/metrics_domain.ts
index e53e45afae5c48..ac76e264ff0ed3 100644
--- a/x-pack/legacy/plugins/infra/server/lib/domains/metrics_domain.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/domains/metrics_domain.ts
@@ -5,8 +5,8 @@
  */
 
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
-import { InfraMetricData } from '../../graphql/types';
 import { InfraMetricsAdapter, InfraMetricsRequestOptions } from '../adapters/metrics/adapter_types';
+import { NodeDetailsMetricData } from '../../../common/http_api/node_details_api';
 
 export class InfraMetricsDomain {
   private adapter: InfraMetricsAdapter;
@@ -19,7 +19,7 @@ export class InfraMetricsDomain {
     requestContext: RequestHandlerContext,
     options: InfraMetricsRequestOptions,
     rawRequest: KibanaRequest
-  ): Promise<InfraMetricData[]> {
+  ): Promise<NodeDetailsMetricData[]> {
     return await this.adapter.getMetrics(requestContext, options, rawRequest);
   }
 }
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 4bb1aefb5b2c72..6f036475a1e1cf 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
@@ -7,12 +7,12 @@
 import { uniq } from 'lodash';
 import { RequestHandlerContext } from 'kibana/server';
 import { InfraSnapshotRequestOptions } from './types';
-import { InfraTimerangeInput } from '../../../public/graphql/types';
 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';
+import { InfraTimerangeInput } from '../../../common/http_api/snapshot_api';
 
 export const createTimeRangeWithInterval = async (
   framework: KibanaFramework,
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/response_helpers.test.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/response_helpers.test.ts
index 28146624a8a894..20220aef1133df 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/response_helpers.test.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/response_helpers.test.ts
@@ -5,7 +5,6 @@
  */
 
 import { isIPv4, getIPFromBucket, InfraSnapshotNodeGroupByBucket } from './response_helpers';
-import { InfraNodeType } from '../../graphql/types';
 
 describe('InfraOps ResponseHelpers', () => {
   describe('isIPv4', () => {
@@ -44,7 +43,7 @@ describe('InfraOps ResponseHelpers', () => {
           },
         },
       };
-      expect(getIPFromBucket(InfraNodeType.host, bucket)).toBe('192.168.1.4');
+      expect(getIPFromBucket('host', bucket)).toBe('192.168.1.4');
     });
     it('should NOT return ipv6 address', () => {
       const bucket: InfraSnapshotNodeGroupByBucket = {
@@ -72,7 +71,7 @@ describe('InfraOps ResponseHelpers', () => {
           },
         },
       };
-      expect(getIPFromBucket(InfraNodeType.host, bucket)).toBe(null);
+      expect(getIPFromBucket('host', bucket)).toBe(null);
     });
   });
 });
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/response_helpers.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/response_helpers.ts
index d22f41ff152f76..12f284c363bd53 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/response_helpers.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/response_helpers.ts
@@ -7,15 +7,11 @@
 import { isNumber, last, max, sum, get } from 'lodash';
 import moment from 'moment';
 
-import {
-  InfraSnapshotMetricType,
-  InfraSnapshotNodePath,
-  InfraSnapshotNodeMetric,
-  InfraNodeType,
-} from '../../graphql/types';
 import { getIntervalInSeconds } from '../../utils/get_interval_in_seconds';
 import { InfraSnapshotRequestOptions } from './types';
 import { findInventoryModel } from '../../../common/inventory_models';
+import { InventoryItemType, SnapshotMetricType } from '../../../common/inventory_models/types';
+import { SnapshotNodeMetric, SnapshotNodePath } from '../../../common/http_api/snapshot_api';
 
 export interface InfraSnapshotNodeMetricsBucket {
   key: { id: string };
@@ -70,7 +66,7 @@ export interface InfraSnapshotNodeGroupByBucket {
 export const isIPv4 = (subject: string) => /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(subject);
 
 export const getIPFromBucket = (
-  nodeType: InfraNodeType,
+  nodeType: InventoryItemType,
   bucket: InfraSnapshotNodeGroupByBucket
 ): string | null => {
   const inventoryModel = findInventoryModel(nodeType);
@@ -92,10 +88,10 @@ export const getIPFromBucket = (
 export const getNodePath = (
   groupBucket: InfraSnapshotNodeGroupByBucket,
   options: InfraSnapshotRequestOptions
-): InfraSnapshotNodePath[] => {
+): SnapshotNodePath[] => {
   const node = groupBucket.key;
   const path = options.groupBy.map(gb => {
-    return { value: node[`${gb.field}`], label: node[`${gb.field}`] } as InfraSnapshotNodePath;
+    return { value: node[`${gb.field}`], label: node[`${gb.field}`] } as SnapshotNodePath;
   });
   const ip = getIPFromBucket(options.nodeType, groupBucket);
   path.push({ value: node.id, label: node.name || node.id, ip });
@@ -121,7 +117,7 @@ export const getNodeMetricsForLookup = (
 export const getNodeMetrics = (
   nodeBuckets: InfraSnapshotMetricsBucket[],
   options: InfraSnapshotRequestOptions
-): InfraSnapshotNodeMetric => {
+): SnapshotNodeMetric => {
   if (!nodeBuckets) {
     return {
       name: options.metric.type,
@@ -156,18 +152,15 @@ const findLastFullBucket = (
   }, last(buckets));
 };
 
-const getMetricValueFromBucket = (
-  type: InfraSnapshotMetricType,
-  bucket: InfraSnapshotMetricsBucket
-) => {
+const getMetricValueFromBucket = (type: SnapshotMetricType, bucket: InfraSnapshotMetricsBucket) => {
   const metric = bucket[type];
   return (metric && (metric.normalized_value || metric.value)) || 0;
 };
 
-function calculateMax(buckets: InfraSnapshotMetricsBucket[], type: InfraSnapshotMetricType) {
+function calculateMax(buckets: InfraSnapshotMetricsBucket[], type: SnapshotMetricType) {
   return max(buckets.map(bucket => getMetricValueFromBucket(type, bucket))) || 0;
 }
 
-function calculateAvg(buckets: InfraSnapshotMetricsBucket[], type: InfraSnapshotMetricType) {
+function calculateAvg(buckets: InfraSnapshotMetricsBucket[], type: SnapshotMetricType) {
   return sum(buckets.map(bucket => getMetricValueFromBucket(type, bucket))) / buckets.length || 0;
 }
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/snapshot.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/snapshot.ts
index 1a724673608a27..ef453be76d8d73 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/snapshot.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/snapshot.ts
@@ -5,7 +5,6 @@
  */
 
 import { RequestHandlerContext } from 'src/core/server';
-import { InfraSnapshotNode } from '../../graphql/types';
 import { InfraDatabaseSearchResponse } from '../adapters/framework';
 import { KibanaFramework } from '../adapters/framework/kibana_framework_adapter';
 import { InfraSources } from '../sources';
@@ -30,6 +29,7 @@ import { createAfterKeyHandler } from '../../utils/create_afterkey_handler';
 import { findInventoryModel } from '../../../common/inventory_models';
 import { InfraSnapshotRequestOptions } from './types';
 import { createTimeRangeWithInterval } from './create_timerange_with_interval';
+import { SnapshotNode } from '../../../common/http_api/snapshot_api';
 
 export class InfraSnapshot {
   constructor(private readonly libs: { sources: InfraSources; framework: KibanaFramework }) {}
@@ -37,7 +37,7 @@ export class InfraSnapshot {
   public async getNodes(
     requestContext: RequestHandlerContext,
     options: InfraSnapshotRequestOptions
-  ): Promise<{ nodes: InfraSnapshotNode[]; interval: string }> {
+  ): Promise<{ nodes: SnapshotNode[]; interval: string }> {
     // Both requestGroupedNodes and requestNodeMetrics may send several requests to elasticsearch
     // in order to page through the results of their respective composite aggregations.
     // Both chains of requests are supposed to run in parallel, and their results be merged
@@ -186,7 +186,7 @@ const mergeNodeBuckets = (
   nodeGroupByBuckets: InfraSnapshotNodeGroupByBucket[],
   nodeMetricsBuckets: InfraSnapshotNodeMetricsBucket[],
   options: InfraSnapshotRequestOptions
-): InfraSnapshotNode[] => {
+): SnapshotNode[] => {
   const nodeMetricsForLookup = getNodeMetricsForLookup(nodeMetricsBuckets);
 
   return nodeGroupByBuckets.map(node => {
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/types.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/types.ts
index 31823b2811121e..3627747e327e03 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/types.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/types.ts
@@ -5,21 +5,11 @@
  */
 
 import { JsonObject } from '../../../common/typed_json';
-import {
-  InfraNodeType,
-  InfraSourceConfiguration,
-  InfraTimerangeInput,
-  InfraSnapshotGroupbyInput,
-  InfraSnapshotMetricInput,
-} from '../../../public/graphql/types';
+import { InfraSourceConfiguration } from '../../../public/graphql/types';
+import { SnapshotRequest } from '../../../common/http_api/snapshot_api';
 
-export interface InfraSnapshotRequestOptions {
-  nodeType: InfraNodeType;
+export interface InfraSnapshotRequestOptions
+  extends Omit<SnapshotRequest, 'sourceId' | 'filterQuery'> {
   sourceConfiguration: InfraSourceConfiguration;
-  timerange: InfraTimerangeInput;
-  groupBy: InfraSnapshotGroupbyInput[];
-  metric: InfraSnapshotMetricInput;
   filterQuery: JsonObject | undefined;
-  accountId?: string;
-  region?: string;
 }
diff --git a/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_node_info.ts b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_node_info.ts
index 4ff0df30abedd8..751e4941647561 100644
--- a/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_node_info.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_node_info.ts
@@ -8,7 +8,6 @@ import { first, set, startsWith } from 'lodash';
 import { RequestHandlerContext } from 'src/core/server';
 import { KibanaFramework } from '../../../lib/adapters/framework/kibana_framework_adapter';
 import { InfraSourceConfiguration } from '../../../lib/sources';
-import { InfraNodeType } from '../../../graphql/types';
 import { InfraMetadataInfo } from '../../../../common/http_api/metadata_api';
 import { getPodNodeName } from './get_pod_node_name';
 import { CLOUD_METRICS_MODULES } from '../../../lib/constants';
@@ -27,7 +26,7 @@ export const getNodeInfo = async (
   // can report pod details and we can't rely on the host/cloud information associated
   // with the kubernetes.pod.uid. We need to first lookup the `kubernetes.node.name`
   // then use that to lookup the host's node information.
-  if (nodeType === InfraNodeType.pod) {
+  if (nodeType === 'pod') {
     const kubernetesNodeName = await getPodNodeName(
       framework,
       requestContext,
@@ -41,7 +40,7 @@ export const getNodeInfo = async (
         requestContext,
         sourceConfiguration,
         kubernetesNodeName,
-        InfraNodeType.host
+        'host'
       );
     }
     return {};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/create_metrics_model.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/create_metrics_model.ts
index 9e5fe16d482b2d..7e47f50c760882 100644
--- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/create_metrics_model.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/create_metrics_model.ts
@@ -6,11 +6,10 @@
 
 import { InfraMetricModelMetricType } from '../../../lib/adapters/metrics';
 import { MetricsExplorerRequestBody } from '../types';
-import { InfraMetric } from '../../../graphql/types';
 import { TSVBMetricModel } from '../../../../common/inventory_models/types';
 export const createMetricModel = (options: MetricsExplorerRequestBody): TSVBMetricModel => {
   return {
-    id: InfraMetric.custom,
+    id: 'custom',
     requires: [],
     index_pattern: options.indexPattern,
     interval: options.timerange.interval,
diff --git a/x-pack/legacy/plugins/infra/server/routes/node_details/index.ts b/x-pack/legacy/plugins/infra/server/routes/node_details/index.ts
index a9419cd27e6840..4a09615f0a17c2 100644
--- a/x-pack/legacy/plugins/infra/server/routes/node_details/index.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/node_details/index.ts
@@ -11,7 +11,7 @@ import { identity } from 'fp-ts/lib/function';
 import { InfraBackendLibs } from '../../lib/infra_types';
 import { UsageCollector } from '../../usage/usage_collector';
 import { InfraMetricsRequestOptions } from '../../lib/adapters/metrics';
-import { InfraNodeType, InfraMetric } from '../../graphql/types';
+
 import {
   NodeDetailsRequestRT,
   NodeDetailsMetricDataResponseRT,
@@ -46,9 +46,9 @@ export const initNodeDetailsRoute = (libs: InfraBackendLibs) => {
             nodeId,
             cloudId,
           },
-          nodeType: nodeType as InfraNodeType,
+          nodeType,
           sourceConfiguration: source.configuration,
-          metrics: metrics as InfraMetric[],
+          metrics,
           timerange,
         };
         return response.ok({
diff --git a/x-pack/legacy/plugins/infra/server/routes/snapshot/index.ts b/x-pack/legacy/plugins/infra/server/routes/snapshot/index.ts
index ba7f52e9ec1e7e..5f28e41d80c258 100644
--- a/x-pack/legacy/plugins/infra/server/routes/snapshot/index.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/snapshot/index.ts
@@ -11,10 +11,8 @@ import { identity } from 'fp-ts/lib/function';
 import { InfraBackendLibs } from '../../lib/infra_types';
 import { UsageCollector } from '../../usage/usage_collector';
 import { parseFilterQuery } from '../../utils/serialized_query';
-import { InfraNodeType, InfraSnapshotMetricInput } from '../../../public/graphql/types';
 import { SnapshotRequestRT, SnapshotNodeResponseRT } from '../../../common/http_api/snapshot_api';
 import { throwErrors } from '../../../common/runtime_types';
-import { InfraSnapshotRequestOptions } from '../../lib/snapshot/types';
 
 const escapeHatch = schema.object({}, { allowUnknowns: true });
 
@@ -46,16 +44,14 @@ export const initSnapshotRoute = (libs: InfraBackendLibs) => {
         );
         const source = await libs.sources.getSourceConfiguration(requestContext, sourceId);
         UsageCollector.countNode(nodeType);
-        const options: InfraSnapshotRequestOptions = {
+        const options = {
           filterQuery: parseFilterQuery(filterQuery),
           accountId,
           region,
-          // TODO: Use common infra metric and replace graphql type
-          nodeType: nodeType as InfraNodeType,
+          nodeType,
           groupBy,
           sourceConfiguration: source.configuration,
-          // TODO: Use common infra metric and replace graphql type
-          metric: metric as InfraSnapshotMetricInput,
+          metric,
           timerange,
         };
         const nodesWithInterval = await libs.snapshot.getNodes(requestContext, options);
diff --git a/x-pack/legacy/plugins/infra/server/usage/usage_collector.ts b/x-pack/legacy/plugins/infra/server/usage/usage_collector.ts
index 60b9372b135df0..26578bfd2b7941 100644
--- a/x-pack/legacy/plugins/infra/server/usage/usage_collector.ts
+++ b/x-pack/legacy/plugins/infra/server/usage/usage_collector.ts
@@ -5,7 +5,6 @@
  */
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { InfraNodeType } from '../graphql/types';
 import { InventoryItemType } from '../../common/inventory_models/types';
 
 const KIBANA_REPORTING_TYPE = 'infraops';
@@ -38,10 +37,10 @@ export class UsageCollector {
     this.maybeInitializeBucket(bucket);
 
     switch (nodeType) {
-      case InfraNodeType.pod:
+      case 'pod':
         this.counters[bucket].infraopsKubernetes += 1;
         break;
-      case InfraNodeType.container:
+      case 'container':
         this.counters[bucket].infraopsDocker += 1;
         break;
       default:
diff --git a/x-pack/legacy/plugins/infra/server/utils/calculate_metric_interval.ts b/x-pack/legacy/plugins/infra/server/utils/calculate_metric_interval.ts
index 586193a3c242db..7cbbdc0f2145be 100644
--- a/x-pack/legacy/plugins/infra/server/utils/calculate_metric_interval.ts
+++ b/x-pack/legacy/plugins/infra/server/utils/calculate_metric_interval.ts
@@ -5,9 +5,9 @@
  */
 
 import { RequestHandlerContext } from 'src/core/server';
-import { InfraNodeType } from '../graphql/types';
 import { findInventoryModel } from '../../common/inventory_models';
 import { KibanaFramework } from '../lib/adapters/framework/kibana_framework_adapter';
+import { InventoryItemType } from '../../common/inventory_models/types';
 
 interface Options {
   indexPattern: string;
@@ -27,7 +27,7 @@ export const calculateMetricInterval = async (
   requestContext: RequestHandlerContext,
   options: Options,
   modules?: string[],
-  nodeType?: InfraNodeType // TODO: check that this type still makes sense
+  nodeType?: InventoryItemType // TODO: check that this type still makes sense
 ) => {
   let from = options.timerange.from;
   if (nodeType) {

From 5853360d75ee17cd00c777d2b2c28fd2f8abd727 Mon Sep 17 00:00:00 2001
From: Patrick Mueller <patrick.mueller@elastic.co>
Date: Thu, 9 Jan 2020 18:14:53 -0500
Subject: [PATCH 96/96] pass more alert info into alert executor (#54035)

resolves https://github.com/elastic/kibana/issues/50522

The alert executor function is now passed these additional alert-specific
properties as parameters:

- spaceId
- namespace
- name
- tags
- createdBy
- updatedBy
---
 x-pack/legacy/plugins/alerting/README.md      |  7 ++
 .../server/task_runner/task_runner.test.ts    |  8 ++
 .../server/task_runner/task_runner.ts         | 33 ++++++-
 .../legacy/plugins/alerting/server/types.ts   | 18 ++++
 .../common/fixtures/plugins/alerts/index.ts   | 16 +++-
 .../common/lib/alert_utils.ts                 | 91 +++++++++++++------
 .../alerting_api_integration/common/types.ts  |  1 +
 .../security_and_spaces/scenarios.ts          |  2 +-
 .../tests/alerting/alerts.ts                  | 65 ++++++++++++-
 .../spaces_only/scenarios.ts                  | 10 ++
 .../alerting/{alerts.ts => alerts_base.ts}    | 48 ++++++----
 .../tests/alerting/alerts_default_space.ts    | 14 +++
 .../tests/alerting/alerts_space1.ts           | 14 +++
 .../spaces_only/tests/alerting/index.ts       |  3 +-
 .../spaces_only/tests/index.ts                |  5 +-
 15 files changed, 281 insertions(+), 54 deletions(-)
 rename x-pack/test/alerting_api_integration/spaces_only/tests/alerting/{alerts.ts => alerts_base.ts} (88%)
 create mode 100644 x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_default_space.ts
 create mode 100644 x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_space1.ts

diff --git a/x-pack/legacy/plugins/alerting/README.md b/x-pack/legacy/plugins/alerting/README.md
index 33679cf6fa4227..30d34bd3b436d6 100644
--- a/x-pack/legacy/plugins/alerting/README.md
+++ b/x-pack/legacy/plugins/alerting/README.md
@@ -63,6 +63,13 @@ This is the primary function for an alert type. Whenever the alert needs to exec
 |previousStartedAt|The previous date and time the alert type started a successful execution.|
 |params|Parameters for the execution. This is where the parameters you require will be passed in. (example threshold). Use alert type validation to ensure values are set before execution.|
 |state|State returned from previous execution. This is the alert level state. What the executor returns will be serialized and provided here at the next execution.|
+|alertId|The id of this alert.|
+|spaceId|The id of the space of this alert.|
+|namespace|The namespace of the space of this alert; same as spaceId, unless spaceId === 'default', then namespace = undefined.|
+|name|The name of this alert.|
+|tags|The tags associated with this alert.|
+|createdBy|The userid that created this alert.|
+|updatedBy|The userid that last updated this alert.|
 
 ### Example
 
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
index 10627c655eca86..87fa33a9cea587 100644
--- 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
@@ -75,6 +75,10 @@ describe('Task Runner', () => {
       enabled: true,
       alertTypeId: '123',
       schedule: { interval: '10s' },
+      name: 'alert-name',
+      tags: ['alert-', '-tags'],
+      createdBy: 'alert-creator',
+      updatedBy: 'alert-updater',
       mutedInstanceIds: [],
       params: {
         bar: true,
@@ -138,6 +142,10 @@ describe('Task Runner', () => {
                     `);
     expect(call.startedAt).toMatchInlineSnapshot(`1970-01-01T00:00:00.000Z`);
     expect(call.state).toMatchInlineSnapshot(`Object {}`);
+    expect(call.name).toBe('alert-name');
+    expect(call.tags).toEqual(['alert-', '-tags']);
+    expect(call.createdBy).toBe('alert-creator');
+    expect(call.updatedBy).toBe('alert-updater');
     expect(call.services.alertInstanceFactory).toBeTruthy();
     expect(call.services.callCluster).toBeTruthy();
     expect(call.services).toBeTruthy();
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
index 2347e9e608ed9f..42c332e82e0343 100644
--- a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
@@ -13,7 +13,7 @@ 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 { AlertType, RawAlert, IntervalSchedule, Services, State, AlertInfoParams } from '../types';
 import { promiseResult, map } from '../lib/result_type';
 
 type AlertInstances = Record<string, AlertInstance>;
@@ -118,13 +118,25 @@ export class TaskRunner {
 
   async executeAlertInstances(
     services: Services,
-    { params, throttle, muteAll, mutedInstanceIds }: SavedObject['attributes'],
-    executionHandler: ReturnType<typeof createExecutionHandler>
+    alertInfoParams: AlertInfoParams,
+    executionHandler: ReturnType<typeof createExecutionHandler>,
+    spaceId: string
   ): Promise<State> {
+    const {
+      params,
+      throttle,
+      muteAll,
+      mutedInstanceIds,
+      name,
+      tags,
+      createdBy,
+      updatedBy,
+    } = alertInfoParams;
     const {
       params: { alertId },
       state: { alertInstances: alertRawInstances = {}, alertTypeState = {}, previousStartedAt },
     } = this.taskInstance;
+    const namespace = this.context.spaceIdToNamespace(spaceId);
 
     const alertInstances = mapValues<AlertInstances>(
       alertRawInstances,
@@ -141,6 +153,12 @@ export class TaskRunner {
       state: alertTypeState,
       startedAt: this.taskInstance.startedAt!,
       previousStartedAt,
+      spaceId,
+      namespace,
+      name,
+      tags,
+      createdBy,
+      updatedBy,
     });
 
     // Cleanup alert instances that are no longer scheduling actions to avoid over populating the alertInstances object
@@ -175,7 +193,7 @@ export class TaskRunner {
   async validateAndRunAlert(
     services: Services,
     apiKey: string | null,
-    attributes: SavedObject['attributes'],
+    attributes: RawAlert,
     references: SavedObject['references']
   ) {
     const {
@@ -191,7 +209,12 @@ export class TaskRunner {
       attributes.actions,
       references
     );
-    return this.executeAlertInstances(services, { ...attributes, params }, executionHandler);
+    return this.executeAlertInstances(
+      services,
+      { ...attributes, params },
+      executionHandler,
+      spaceId
+    );
   }
 
   async run() {
diff --git a/x-pack/legacy/plugins/alerting/server/types.ts b/x-pack/legacy/plugins/alerting/server/types.ts
index 9b03f9b02aa0af..def86cd46e5909 100644
--- a/x-pack/legacy/plugins/alerting/server/types.ts
+++ b/x-pack/legacy/plugins/alerting/server/types.ts
@@ -32,6 +32,12 @@ export interface AlertExecutorOptions {
   services: AlertServices;
   params: Record<string, any>;
   state: State;
+  spaceId: string;
+  namespace?: string;
+  name: string;
+  tags: string[];
+  createdBy: string | null;
+  updatedBy: string | null;
 }
 
 export interface AlertType {
@@ -108,6 +114,18 @@ export interface RawAlert extends SavedObjectAttributes {
   mutedInstanceIds: string[];
 }
 
+export type AlertInfoParams = Pick<
+  RawAlert,
+  | 'params'
+  | 'throttle'
+  | 'muteAll'
+  | 'mutedInstanceIds'
+  | 'name'
+  | 'tags'
+  | 'createdBy'
+  | 'updatedBy'
+>;
+
 export interface AlertingPlugin {
   setup: PluginSetupContract;
   start: PluginStartContract;
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
index ebe741df71d79f..b5d201c1682bd4 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
@@ -202,8 +202,21 @@ export default function(kibana: any) {
         id: 'test.always-firing',
         name: 'Test: Always Firing',
         actionGroups: ['default', 'other'],
-        async executor({ services, params, state }: AlertExecutorOptions) {
+        async executor(alertExecutorOptions: AlertExecutorOptions) {
+          const {
+            services,
+            params,
+            state,
+            alertId,
+            spaceId,
+            namespace,
+            name,
+            tags,
+            createdBy,
+            updatedBy,
+          } = alertExecutorOptions;
           let group = 'default';
+          const alertInfo = { alertId, spaceId, namespace, name, tags, createdBy, updatedBy };
 
           if (params.groupsToScheduleActionsInSeries) {
             const index = state.groupInSeriesIndex || 0;
@@ -226,6 +239,7 @@ export default function(kibana: any) {
               params,
               reference: params.reference,
               source: 'alert:test.always-firing',
+              alertInfo,
             },
           });
           return {
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 c47649544f9a76..c793af359489af 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
@@ -24,6 +24,14 @@ export interface CreateAlertWithActionOpts {
   reference: string;
 }
 
+interface UpdateAlwaysFiringAction {
+  alertId: string;
+  actionId: string | undefined;
+  reference: string;
+  user: User;
+  overwrites: Record<string, any>;
+}
+
 export class AlertUtils {
   private referenceCounter = 1;
   private readonly user?: User;
@@ -176,38 +184,41 @@ export class AlertUtils {
     if (this.user) {
       request = request.auth(this.user.username, this.user.password);
     }
-    const response = await request.send({
-      enabled: true,
-      name: 'abc',
-      schedule: { interval: '1m' },
-      throttle: '1m',
-      tags: [],
-      alertTypeId: 'test.always-firing',
-      consumer: 'bar',
-      params: {
-        index: ES_TEST_INDEX_NAME,
-        reference,
-      },
-      actions: [
-        {
-          group: 'default',
-          id: this.indexRecordActionId,
-          params: {
-            index: ES_TEST_INDEX_NAME,
-            reference,
-            message:
-              'instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
-          },
-        },
-      ],
-      ...overwrites,
-    });
+    const alertBody = getDefaultAlwaysFiringAlertData(reference, actionId);
+    const response = await request.send({ ...alertBody, ...overwrites });
     if (response.statusCode === 200) {
       objRemover.add(this.space.id, response.body.id, 'alert');
     }
     return response;
   }
 
+  public async updateAlwaysFiringAction({
+    alertId,
+    actionId,
+    reference,
+    user,
+    overwrites = {},
+  }: UpdateAlwaysFiringAction) {
+    actionId = actionId || this.indexRecordActionId;
+
+    if (!actionId) {
+      throw new Error('actionId is required ');
+    }
+
+    const request = this.supertestWithoutAuth
+      .put(`${getUrlPrefix(this.space.id)}/api/alert/${alertId}`)
+      .set('kbn-xsrf', 'foo')
+      .auth(user.username, user.password);
+
+    const alertBody = getDefaultAlwaysFiringAlertData(reference, actionId);
+    delete alertBody.alertTypeId;
+    delete alertBody.enabled;
+    delete alertBody.consumer;
+
+    const response = await request.send({ ...alertBody, ...overwrites });
+    return response;
+  }
+
   public async createAlwaysFailingAction({
     objectRemover,
     overwrites = {},
@@ -251,3 +262,31 @@ export class AlertUtils {
     return response;
   }
 }
+
+function getDefaultAlwaysFiringAlertData(reference: string, actionId: string) {
+  return {
+    enabled: true,
+    name: 'abc',
+    schedule: { interval: '1m' },
+    throttle: '1m',
+    tags: [],
+    alertTypeId: 'test.always-firing',
+    consumer: 'bar',
+    params: {
+      index: ES_TEST_INDEX_NAME,
+      reference,
+    },
+    actions: [
+      {
+        group: 'default',
+        id: actionId,
+        params: {
+          index: ES_TEST_INDEX_NAME,
+          reference,
+          message:
+            'instanceContextValue: {{context.instanceContextValue}}, instanceStateValue: {{state.instanceStateValue}}',
+        },
+      },
+    ],
+  };
+}
diff --git a/x-pack/test/alerting_api_integration/common/types.ts b/x-pack/test/alerting_api_integration/common/types.ts
index e94add5bbcd288..c4a341435aaaa5 100644
--- a/x-pack/test/alerting_api_integration/common/types.ts
+++ b/x-pack/test/alerting_api_integration/common/types.ts
@@ -52,6 +52,7 @@ export interface User {
 
 export interface Space {
   id: string;
+  namespace?: string;
   name: string;
   disabledFeatures: string[];
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/scenarios.ts b/x-pack/test/alerting_api_integration/security_and_spaces/scenarios.ts
index 354d87bd11bb2d..d58fcd29e29fce 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/scenarios.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/scenarios.ts
@@ -29,7 +29,7 @@ const NoKibanaPrivileges: User = {
   },
 };
 
-const Superuser: User = {
+export const Superuser: User = {
   username: 'superuser',
   fullName: 'superuser',
   password: 'superuser-password',
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
index 69bc547e3bfc11..551498e22d5c8c 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { UserAtSpaceScenarios } from '../../scenarios';
+import { UserAtSpaceScenarios, Superuser } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
   ESTestIndexTool,
@@ -96,7 +96,9 @@ export default function alertTests({ getService }: FtrProviderContext) {
 
               // Wait for the action to index a document before disabling the alert and waiting for tasks to finish
               await esTestIndexTool.waitForDocs('action:test.index-record', reference);
-              await alertUtils.disable(response.body.id);
+
+              const alertId = response.body.id;
+              await alertUtils.disable(alertId);
               await taskManagerUtils.waitForIdle(testStart);
 
               // Ensure only 1 alert executed with proper params
@@ -113,6 +115,15 @@ export default function alertTests({ getService }: FtrProviderContext) {
                   index: ES_TEST_INDEX_NAME,
                   reference,
                 },
+                alertInfo: {
+                  alertId,
+                  spaceId: space.id,
+                  namespace: space.id,
+                  name: 'abc',
+                  tags: [],
+                  createdBy: user.fullName,
+                  updatedBy: user.fullName,
+                },
               });
 
               // Ensure only 1 action executed with proper params
@@ -142,6 +153,56 @@ export default function alertTests({ getService }: FtrProviderContext) {
           }
         });
 
+        it('should pass updated alert params to executor', async () => {
+          // create an alert
+          const reference = alertUtils.generateReference();
+          const overwrites = {
+            throttle: '1s',
+            schedule: { interval: '1s' },
+          };
+          const response = await alertUtils.createAlwaysFiringAction({ reference, overwrites });
+
+          // only need to test creation success paths
+          if (response.statusCode !== 200) return;
+
+          // update the alert with super user
+          const alertId = response.body.id;
+          const reference2 = alertUtils.generateReference();
+          const response2 = await alertUtils.updateAlwaysFiringAction({
+            alertId,
+            actionId: indexRecordActionId,
+            user: Superuser,
+            reference: reference2,
+            overwrites: {
+              name: 'def',
+              tags: ['fee', 'fi', 'fo'],
+              throttle: '1s',
+              schedule: { interval: '1s' },
+            },
+          });
+
+          expect(response2.statusCode).to.eql(200);
+
+          // make sure alert info passed to executor is correct
+          await esTestIndexTool.waitForDocs('alert:test.always-firing', reference2);
+          await alertUtils.disable(alertId);
+          const alertSearchResult = await esTestIndexTool.search(
+            'alert:test.always-firing',
+            reference2
+          );
+
+          expect(alertSearchResult.hits.total.value).to.be.greaterThan(0);
+          expect(alertSearchResult.hits.hits[0]._source.alertInfo).to.eql({
+            alertId,
+            spaceId: space.id,
+            namespace: space.id,
+            name: 'def',
+            tags: ['fee', 'fi', 'fo'],
+            createdBy: user.fullName,
+            updatedBy: Superuser.fullName,
+          });
+        });
+
         it('should handle custom retry logic when appropriate', async () => {
           const testStart = new Date();
           // We have to provide the test.rate-limit the next runAt, for testing purposes
diff --git a/x-pack/test/alerting_api_integration/spaces_only/scenarios.ts b/x-pack/test/alerting_api_integration/spaces_only/scenarios.ts
index 2b91c408d3de91..c2b3ec6148036e 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/scenarios.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/scenarios.ts
@@ -8,17 +8,27 @@ import { Space } from '../common/types';
 
 const Space1: Space = {
   id: 'space1',
+  namespace: 'space1',
   name: 'Space 1',
   disabledFeatures: [],
 };
 
 const Other: Space = {
   id: 'other',
+  namespace: 'other',
   name: 'Other',
   disabledFeatures: [],
 };
 
+const Default: Space = {
+  id: 'default',
+  namespace: undefined,
+  name: 'Default',
+  disabledFeatures: [],
+};
+
 export const Spaces = {
   space1: Space1,
   other: Other,
+  default: Default,
 };
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_base.ts
similarity index 88%
rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts
rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
index 032fee15882cf8..d9a58851afb31a 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_base.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { Response as SupertestResponse } from 'supertest';
-import { Spaces } from '../../scenarios';
+import { Space } from '../../../common/types';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
   ESTestIndexTool,
@@ -19,7 +19,7 @@ import {
 } from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
-export default function alertTests({ getService }: FtrProviderContext) {
+export function alertTests({ getService }: FtrProviderContext, space: Space) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const es = getService('legacyEs');
   const retry = getService('retry');
@@ -43,7 +43,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
       await esTestIndexTool.setup();
       await es.indices.create({ index: authorizationIndex });
       const { body: createdAction } = await supertestWithoutAuth
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/action`)
+        .post(`${getUrlPrefix(space.id)}/api/action`)
         .set('kbn-xsrf', 'foo')
         .send({
           name: 'My action',
@@ -58,7 +58,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
         .expect(200);
       indexRecordActionId = createdAction.id;
       alertUtils = new AlertUtils({
-        space: Spaces.space1,
+        space,
         supertestWithoutAuth,
         indexRecordActionId,
         objectRemover,
@@ -68,19 +68,20 @@ export default function alertTests({ getService }: FtrProviderContext) {
     after(async () => {
       await esTestIndexTool.destroy();
       await es.indices.delete({ index: authorizationIndex });
-      objectRemover.add(Spaces.space1.id, indexRecordActionId, 'action');
+      objectRemover.add(space.id, indexRecordActionId, 'action');
       await objectRemover.removeAll();
     });
 
     it('should schedule task, run alert and schedule actions', async () => {
       const reference = alertUtils.generateReference();
       const response = await alertUtils.createAlwaysFiringAction({ reference });
+      const alertId = response.body.id;
 
       expect(response.statusCode).to.eql(200);
       const alertTestRecord = (
         await esTestIndexTool.waitForDocs('alert:test.always-firing', reference)
       )[0];
-      expect(alertTestRecord._source).to.eql({
+      const expected = {
         source: 'alert:test.always-firing',
         reference,
         state: {},
@@ -88,7 +89,20 @@ export default function alertTests({ getService }: FtrProviderContext) {
           index: ES_TEST_INDEX_NAME,
           reference,
         },
-      });
+        alertInfo: {
+          alertId,
+          spaceId: space.id,
+          namespace: space.namespace,
+          name: 'abc',
+          tags: [],
+          createdBy: null,
+          updatedBy: null,
+        },
+      };
+      if (expected.alertInfo.namespace === undefined) {
+        delete expected.alertInfo.namespace;
+      }
+      expect(alertTestRecord._source).to.eql(expected);
       const actionTestRecord = (
         await esTestIndexTool.waitForDocs('action:test.index-record', reference)
       )[0];
@@ -147,7 +161,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
       const retryDate = new Date(Date.now() + 60000);
 
       const { body: createdAction } = await supertestWithoutAuth
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/action`)
+        .post(`${getUrlPrefix(space.id)}/api/action`)
         .set('kbn-xsrf', 'foo')
         .send({
           name: 'Test rate limit',
@@ -155,11 +169,11 @@ export default function alertTests({ getService }: FtrProviderContext) {
           config: {},
         })
         .expect(200);
-      objectRemover.add(Spaces.space1.id, createdAction.id, 'action');
+      objectRemover.add(space.id, createdAction.id, 'action');
 
       const reference = alertUtils.generateReference();
       const response = await supertestWithoutAuth
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alert`)
+        .post(`${getUrlPrefix(space.id)}/api/alert`)
         .set('kbn-xsrf', 'foo')
         .send(
           getTestAlertData({
@@ -184,7 +198,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
         );
 
       expect(response.statusCode).to.eql(200);
-      objectRemover.add(Spaces.space1.id, response.body.id, 'alert');
+      objectRemover.add(space.id, response.body.id, 'alert');
       const scheduledActionTask = await retry.try(async () => {
         const searchResult = await es.search({
           index: '.kibana_task_manager',
@@ -228,7 +242,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
     it('should have proper callCluster and savedObjectsClient authorization for alert type executor', async () => {
       const reference = alertUtils.generateReference();
       const response = await supertestWithoutAuth
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alert`)
+        .post(`${getUrlPrefix(space.id)}/api/alert`)
         .set('kbn-xsrf', 'foo')
         .send(
           getTestAlertData({
@@ -244,7 +258,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
         );
 
       expect(response.statusCode).to.eql(200);
-      objectRemover.add(Spaces.space1.id, response.body.id, 'alert');
+      objectRemover.add(space.id, response.body.id, 'alert');
       const alertTestRecord = (
         await esTestIndexTool.waitForDocs('alert:test.authorization', reference)
       )[0];
@@ -264,16 +278,16 @@ export default function alertTests({ getService }: FtrProviderContext) {
     it('should have proper callCluster and savedObjectsClient authorization for action type executor', async () => {
       const reference = alertUtils.generateReference();
       const { body: createdAction } = await supertestWithoutAuth
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/action`)
+        .post(`${getUrlPrefix(space.id)}/api/action`)
         .set('kbn-xsrf', 'foo')
         .send({
           name: 'My action',
           actionTypeId: 'test.authorization',
         })
         .expect(200);
-      objectRemover.add(Spaces.space1.id, createdAction.id, 'action');
+      objectRemover.add(space.id, createdAction.id, 'action');
       const response = await supertestWithoutAuth
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alert`)
+        .post(`${getUrlPrefix(space.id)}/api/alert`)
         .set('kbn-xsrf', 'foo')
         .send(
           getTestAlertData({
@@ -299,7 +313,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
         );
 
       expect(response.statusCode).to.eql(200);
-      objectRemover.add(Spaces.space1.id, response.body.id, 'alert');
+      objectRemover.add(space.id, response.body.id, 'alert');
       const actionTestRecord = (
         await esTestIndexTool.waitForDocs('action:test.authorization', reference)
       )[0];
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_default_space.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_default_space.ts
new file mode 100644
index 00000000000000..3e677952d87006
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_default_space.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { Spaces } from '../../scenarios';
+import { alertTests } from './alerts_base';
+
+// eslint-disable-next-line import/no-default-export
+export default function alertSpace1Tests(context: FtrProviderContext) {
+  alertTests(context, Spaces.default);
+}
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_space1.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_space1.ts
new file mode 100644
index 00000000000000..07ad4cd294ab39
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_space1.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { Spaces } from '../../scenarios';
+import { alertTests } from './alerts_base';
+
+// eslint-disable-next-line import/no-default-export
+export default function alertSpace1Tests(context: FtrProviderContext) {
+  alertTests(context, Spaces.space1);
+}
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts
index 1aa084356cfa49..569c0d538d473f 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts
@@ -22,6 +22,7 @@ export default function alertingTests({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./unmute_instance'));
     loadTestFile(require.resolve('./update'));
     loadTestFile(require.resolve('./update_api_key'));
-    loadTestFile(require.resolve('./alerts'));
+    loadTestFile(require.resolve('./alerts_space1'));
+    loadTestFile(require.resolve('./alerts_default_space'));
   });
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts
index f18aebaf4e6897..cb2b17980d37ae 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts
@@ -20,7 +20,10 @@ export default function alertingApiIntegrationTests({
 
     before(async () => {
       for (const space of Object.values(Spaces)) {
-        await spacesService.create(space);
+        if (space.id === 'default') continue;
+
+        const { id, name, disabledFeatures } = space;
+        await spacesService.create({ id, name, disabledFeatures });
       }
     });