From 81f3fbbf2546f33c980477ad617f910f313bdf78 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Thu, 30 Jan 2020 15:06:52 -0600
Subject: [PATCH 01/26] [APM] Service map center button (#56434)

Add center button for service map.

The fullscreen button is still there until #56351 is merged.

Add fit and padding to the layout animation.

Make the node labels wider so they aren't cut off.
---
 .../components/app/ServiceMap/Controls.tsx    | 28 +++++++++++++++++--
 .../app/ServiceMap/cytoscapeOptions.ts        | 18 +++++++++---
 2 files changed, 40 insertions(+), 6 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 5b7ddc2b450d6..07ea97f442b7f 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
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext, useState, useEffect } from 'react';
 import { EuiButtonIcon, EuiPanel } from '@elastic/eui';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
+import React, { useContext, useEffect, useState } from 'react';
+import styled from 'styled-components';
 import { CytoscapeContext } from './Cytoscape';
+import { animationOptions, nodeHeight } from './cytoscapeOptions';
 import { FullscreenPanel } from './FullscreenPanel';
 
 const ControlsContainer = styled('div')`
@@ -58,6 +59,17 @@ export function Controls() {
     }
   }, [cy]);
 
+  function center() {
+    if (cy) {
+      const eles = cy.nodes();
+      cy.animate({
+        ...animationOptions,
+        center: { eles },
+        fit: { eles, padding: nodeHeight }
+      });
+    }
+  }
+
   function zoomIn() {
     doZoom(cy, increment);
   }
@@ -82,6 +94,9 @@ export function Controls() {
   const zoomOutLabel = i18n.translate('xpack.apm.serviceMap.zoomOut', {
     defaultMessage: 'Zoom out'
   });
+  const centerLabel = i18n.translate('xpack.apm.serviceMap.center', {
+    defaultMessage: 'Center'
+  });
 
   return (
     <ControlsContainer>
@@ -103,6 +118,15 @@ export function Controls() {
           title={zoomOutLabel}
         />
       </ZoomPanel>
+      <EuiPanel hasShadow={true} paddingSize="none">
+        <Button
+          aria-label={centerLabel}
+          color="text"
+          iconType="crosshairs"
+          onClick={center}
+          title={centerLabel}
+        />
+      </EuiPanel>
       <FullscreenPanel element={mapDomElement} />
     </ControlsContainer>
   );
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
index a243021ddc5fd..f87f59f64ec70 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
@@ -7,13 +7,23 @@ import theme from '@elastic/eui/dist/eui_theme_light.json';
 import cytoscape from 'cytoscape';
 import { defaultIcon, iconForNode } from './icons';
 
+export const animationOptions: cytoscape.AnimationOptions = {
+  duration: parseInt(theme.euiAnimSpeedNormal, 10),
+  // @ts-ignore The cubic-bezier options here are not recognized by the cytoscape types
+  easing: theme.euiAnimSlightBounce
+};
+
+export const nodeHeight = parseInt(theme.avatarSizing.l.size, 10);
+
 const layout = {
   name: 'dagre',
   nodeDimensionsIncludeLabels: true,
   rankDir: 'LR',
   animate: true,
-  animationEasing: theme.euiAnimSlightBounce,
-  animationDuration: parseInt(theme.euiAnimSpeedNormal, 10)
+  animationEasing: animationOptions.easing,
+  animationDuration: animationOptions.duration,
+  fit: true,
+  padding: nodeHeight
 };
 
 function isService(el: cytoscape.NodeSingular) {
@@ -45,7 +55,7 @@ const style: cytoscape.Stylesheet[] = [
       // specifying a subset of the fonts for the label text.
       'font-family': 'Inter UI, Segoe UI, Helvetica, Arial, sans-serif',
       'font-size': theme.euiFontSizeXS,
-      height: theme.avatarSizing.l.size,
+      height: nodeHeight,
       label: 'data(label)',
       'min-zoomed-font-size': theme.euiSizeL,
       'overlay-opacity': 0,
@@ -56,7 +66,7 @@ const style: cytoscape.Stylesheet[] = [
       'text-background-padding': theme.paddingSizes.xs,
       'text-background-shape': 'roundrectangle',
       'text-margin-y': theme.paddingSizes.s,
-      'text-max-width': '85px',
+      'text-max-width': '200px',
       'text-valign': 'bottom',
       'text-wrap': 'ellipsis',
       width: theme.avatarSizing.l.size

From 472e7fbb71b5f5e0c0c82e712f7b774e8dd0bd72 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Thu, 30 Jan 2020 13:21:54 -0800
Subject: [PATCH 02/26] [DOCS] Updates example in Timelion doc (#56444)

---
 docs/visualize/timelion.asciidoc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/visualize/timelion.asciidoc b/docs/visualize/timelion.asciidoc
index 7c7ec7c995ea7..a7520227977bc 100644
--- a/docs/visualize/timelion.asciidoc
+++ b/docs/visualize/timelion.asciidoc
@@ -43,7 +43,7 @@ image::images/timelion-create01.png[]
 [[time-series-compare-data]]
 ==== Compare the data
 
-To compare the two data sets, add another series with data from the previous hour, separated by a comma:  
+To compare the two data sets, add another series with data from the previous hour, separated by a comma:
 
 [source,text]
 ----------------------------------
@@ -81,7 +81,7 @@ image::images/timelion-create03.png[]
 
 [float]
 [[time-series-title]]
-==== Add a title 
+==== Add a title
 
 Add a meaningful title:
 
@@ -169,7 +169,7 @@ Change the position and style of the legend:
 
 [source,text]
 ----------------------------------
-.es(offset=-1h,index=metricbeat-*, timefield='@timestamp', metric='avg:system.cpu.user.pct').label('last hour').lines(fill=1,width=0.5).color(gray), .es(index=metricbeat-*, timefield='@timestamp', metric='avg:system.cpu.user.pct').label('current hour').title('CPU usage over time').color(#1E90FF).legend(columns=2, position=nw) <1> 
+.es(offset=-1h,index=metricbeat-*, timefield='@timestamp', metric='avg:system.cpu.user.pct').label('last hour').lines(fill=1,width=0.5).color(gray), .es(index=metricbeat-*, timefield='@timestamp', metric='avg:system.cpu.user.pct').label('current hour').title('CPU usage over time').color(#1E90FF).legend(columns=2, position=nw) <1>
 ----------------------------------
 
 <1> `.legend()` sets the position and style of the legend. In this example, `.legend(columns=2, position=nw)` places the legend in the north west position of the visualization with two columns.
@@ -210,7 +210,7 @@ Change how the data is displayed so that you can easily monitor the inbound traf
 .es(index=metricbeat*, timefield=@timestamp, metric=max:system.network.in.bytes).derivative() <1>
 ----------------------------------
 
-<1> `.derivative` plots the change in values over time. 
+<1> `.derivative` plots the change in values over time.
 
 [role="screenshot"]
 image::images/timelion-math02.png[]
@@ -240,7 +240,7 @@ To make the visualization easier to analyze, change the data metric from bytes t
 .es(index=metricbeat*, timefield=@timestamp, metric=max:system.network.in.bytes).derivative().divide(1048576), .es(index=metricbeat*, timefield=@timestamp, metric=max:system.network.out.bytes).derivative().multiply(-1).divide(1048576) <1>
 ----------------------------------
 
-<1> `.divide()` accepts the same input as `.multiply()`, then divides the data series by the defined divisor. 
+<1> `.divide()` accepts the same input as `.multiply()`, then divides the data series by the defined divisor.
 
 [role="screenshot"]
 image::images/timelion-math04.png[]
@@ -256,7 +256,7 @@ Customize and format the visualization using functions:
 ----------------------------------
 .es(index=metricbeat*,
     timefield=@timestamp,
-    metric=max:system.network.in.byte)
+    metric=max:system.network.in.bytes)
   .derivative()
   .divide(1048576)
   .lines(fill=2, width=1)
@@ -270,7 +270,7 @@ Customize and format the visualization using functions:
   .multiply(-1)
   .divide(1048576)
   .lines(fill=2, width=1)           <3>
-  .color(blue) <                    <4>
+  .color(blue)                      <4>
     .label("Outbound traffic")
     .legend(columns=2, position=nw) <5>
 ----------------------------------

From 443470feda87d569df06fcae578962410dcd450e Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Thu, 30 Jan 2020 15:09:16 -0700
Subject: [PATCH 03/26] [reporting] remove a legacy cross-plugin import
 (#56354)

---
 .../reporting/server/usage/reporting_usage_collector.ts    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
index 40cf315a78cbb..567838391d2e7 100644
--- a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
+++ b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts
@@ -5,13 +5,14 @@
  */
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-// @ts-ignore untyped module
-import { KIBANA_STATS_TYPE_MONITORING } from '../../../monitoring/common/constants';
 import { ServerFacade, ExportTypesRegistry, ESCallCluster } from '../../types';
 import { KIBANA_REPORTING_TYPE } from '../../common/constants';
 import { getReportingUsage } from './get_reporting_usage';
 import { RangeStats } from './types';
 
+// places the reporting data as kibana stats
+const METATYPE = 'kibana_stats';
+
 /*
  * @param {Object} server
  * @return {Object} kibana usage stats type collection object
@@ -35,7 +36,7 @@ export function getReportingUsageCollector(
      */
     formatForBulkUpload: (result: RangeStats) => {
       return {
-        type: KIBANA_STATS_TYPE_MONITORING,
+        type: METATYPE,
         payload: {
           usage: {
             xpack: {

From ed7703c1f73b148fce0799149fb4d80f0aee29b6 Mon Sep 17 00:00:00 2001
From: Joel Griffith <joel.griffith@elastic.co>
Date: Thu, 30 Jan 2020 14:39:54 -0800
Subject: [PATCH 04/26] [Reporting] New Platform: moves most of our
 libs/constants and utils to np shims (#55935)

* Moves a majority of our UI lib/component and utils to np shims

* Fixing some slight np differences from legacy

* Mostly shimmed client, save for a few APIs and routing

* Fixing canvas job notifier

* Un-needed typedef file

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../workpad_header/workpad_export/index.ts    |  2 +-
 .../plugins/reporting/common/constants.ts     |  3 ++
 .../components/reporting_panel_content.tsx    | 11 ++---
 .../reporting/public/lib/download_report.ts   |  6 ++-
 .../lib/job_completion_notifications.d.ts     | 13 -----
 .../lib/job_completion_notifications.js       | 35 -------------
 .../lib/job_completion_notifications.ts       | 36 ++++++++++++++
 .../reporting/public/lib/job_queue_client.ts  | 26 ++++------
 .../reporting/public/lib/reporting_client.ts  | 49 +++++++++----------
 .../panel_actions/get_csv_panel_action.tsx    | 28 ++++-------
 .../share_context_menu/register_reporting.tsx | 20 +++++---
 11 files changed, 105 insertions(+), 124 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.d.ts
 delete mode 100644 x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.js
 create mode 100644 x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.ts

diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/index.ts b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/index.ts
index 39611dd6c2994..7f81adad6bf9b 100644
--- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/index.ts
+++ b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/index.ts
@@ -6,7 +6,7 @@
 
 import { connect } from 'react-redux';
 import { compose, withProps } from 'recompose';
-import { jobCompletionNotifications } from '../../../../../reporting/public/lib/job_completion_notifications';
+import * as jobCompletionNotifications from '../../../../../reporting/public/lib/job_completion_notifications';
 // @ts-ignore Untyped local
 import { getWorkpad, getPages } from '../../../state/selectors/workpad';
 // @ts-ignore Untyped local
diff --git a/x-pack/legacy/plugins/reporting/common/constants.ts b/x-pack/legacy/plugins/reporting/common/constants.ts
index e602d5fc608d3..1746345879192 100644
--- a/x-pack/legacy/plugins/reporting/common/constants.ts
+++ b/x-pack/legacy/plugins/reporting/common/constants.ts
@@ -14,8 +14,11 @@ export const JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY =
 export const API_BASE_URL = '/api/reporting'; // "Generation URL" from share menu
 export const API_BASE_URL_V1 = '/api/reporting/v1'; //
 export const API_BASE_GENERATE_V1 = `${API_BASE_URL_V1}/generate`;
+export const API_LIST_URL = '/api/reporting/jobs';
+export const API_GENERATE_IMMEDIATE = `${API_BASE_URL_V1}/generate/immediate/csv/saved-object`;
 
 export const CONTENT_TYPE_CSV = 'text/csv';
+export const CSV_REPORTING_ACTION = 'downloadCsvReport';
 
 export const WHITELISTED_JOB_CONTENT_TYPES = [
   'application/json',
diff --git a/x-pack/legacy/plugins/reporting/public/components/reporting_panel_content.tsx b/x-pack/legacy/plugins/reporting/public/components/reporting_panel_content.tsx
index ac966ceb99736..aaf4021302a97 100644
--- a/x-pack/legacy/plugins/reporting/public/components/reporting_panel_content.tsx
+++ b/x-pack/legacy/plugins/reporting/public/components/reporting_panel_content.tsx
@@ -7,11 +7,10 @@
 import { EuiButton, EuiCopy, EuiForm, EuiFormRow, EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component, ReactElement } from 'react';
-import { KFetchError } from 'ui/kfetch/kfetch_error';
 import { toastNotifications } from 'ui/notify';
 import url from 'url';
 import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
-import { reportingClient } from '../lib/reporting_client';
+import * as reportingClient from '../lib/reporting_client';
 
 interface Props {
   reportType: string;
@@ -217,8 +216,8 @@ class ReportingPanelContentUi extends Component<Props, State> {
         });
         this.props.onClose();
       })
-      .catch((kfetchError: KFetchError) => {
-        if (kfetchError.message === 'not exportable') {
+      .catch((error: any) => {
+        if (error.message === 'not exportable') {
           return toastNotifications.addWarning({
             title: intl.formatMessage(
               {
@@ -237,7 +236,7 @@ class ReportingPanelContentUi extends Component<Props, State> {
         }
 
         const defaultMessage =
-          kfetchError.res.status === 403 ? (
+          error?.res?.status === 403 ? (
             <FormattedMessage
               id="xpack.reporting.panelContent.noPermissionToGenerateReportDescription"
               defaultMessage="You don't have permission to generate this report."
@@ -254,7 +253,7 @@ class ReportingPanelContentUi extends Component<Props, State> {
             id: 'xpack.reporting.panelContent.notification.reportingErrorTitle',
             defaultMessage: 'Reporting error',
           }),
-          text: toMountPoint(kfetchError.message || defaultMessage),
+          text: toMountPoint(error.message || defaultMessage),
           'data-test-subj': 'queueReportError',
         });
       });
diff --git a/x-pack/legacy/plugins/reporting/public/lib/download_report.ts b/x-pack/legacy/plugins/reporting/public/lib/download_report.ts
index 18bae64f8788d..54194c87afabc 100644
--- a/x-pack/legacy/plugins/reporting/public/lib/download_report.ts
+++ b/x-pack/legacy/plugins/reporting/public/lib/download_report.ts
@@ -4,11 +4,13 @@
  * 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 { API_BASE_URL } from '../../common/constants';
 
+const { core } = npStart;
+
 export function getReportURL(jobId: string) {
-  const apiBaseUrl = chrome.addBasePath(API_BASE_URL);
+  const apiBaseUrl = core.http.basePath.prepend(API_BASE_URL);
   const downloadLink = `${apiBaseUrl}/jobs/download/${jobId}`;
 
   return downloadLink;
diff --git a/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.d.ts b/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.d.ts
deleted file mode 100644
index 3eacc3046e15a..0000000000000
--- a/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-declare class JobCompletionNotifications {
-  public add(jobId: string): void;
-}
-
-declare const jobCompletionNotifications: JobCompletionNotifications;
-
-export { jobCompletionNotifications };
diff --git a/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.js b/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.js
deleted file mode 100644
index 786082638757e..0000000000000
--- a/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY } from '../../common/constants';
-
-export const jobCompletionNotifications = {
-  add(jobId) {
-    const jobs = this.getAll();
-    jobs.push(jobId);
-    this._set(jobs);
-  },
-
-  getAll() {
-    const sessionValue = sessionStorage.getItem(JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY);
-    return sessionValue ? JSON.parse(sessionValue) : [];
-  },
-
-  remove(jobId) {
-    const jobs = this.getAll();
-    const index = jobs.indexOf(jobId);
-    if (!index) {
-      throw new Error('Unable to find job to remove it');
-    }
-
-    jobs.splice(index, 1);
-    this._set(jobs);
-  },
-
-  _set(jobs) {
-    sessionStorage.setItem(JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY, JSON.stringify(jobs));
-  },
-};
diff --git a/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.ts b/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.ts
new file mode 100644
index 0000000000000..3a61bc1e5a044
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/public/lib/job_completion_notifications.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 { JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY } from '../../common/constants';
+
+type jobId = string;
+
+const set = (jobs: any) => {
+  sessionStorage.setItem(JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY, JSON.stringify(jobs));
+};
+
+const getAll = () => {
+  const sessionValue = sessionStorage.getItem(JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY);
+  return sessionValue ? JSON.parse(sessionValue) : [];
+};
+
+export const add = (jobId: jobId) => {
+  const jobs = getAll();
+  jobs.push(jobId);
+  set(jobs);
+};
+
+export const remove = (jobId: jobId) => {
+  const jobs = getAll();
+  const index = jobs.indexOf(jobId);
+
+  if (!index) {
+    throw new Error('Unable to find job to remove it');
+  }
+
+  jobs.splice(index, 1);
+  set(jobs);
+};
diff --git a/x-pack/legacy/plugins/reporting/public/lib/job_queue_client.ts b/x-pack/legacy/plugins/reporting/public/lib/job_queue_client.ts
index 0f68c56a18bf6..281a2e1cdf9a5 100644
--- a/x-pack/legacy/plugins/reporting/public/lib/job_queue_client.ts
+++ b/x-pack/legacy/plugins/reporting/public/lib/job_queue_client.ts
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { kfetch } from 'ui/kfetch';
+import { npStart } from 'ui/new_platform';
+import { API_LIST_URL } from '../../common/constants';
 
-const API_BASE_URL = '/api/reporting/jobs';
+const { core } = npStart;
 
 export interface JobQueueEntry {
   _id: string;
@@ -52,40 +53,33 @@ export interface JobInfo {
 }
 
 class JobQueueClient {
-  public list = (page = 0, jobIds?: string[]): Promise<JobQueueEntry[]> => {
+  public list = (page = 0, jobIds: string[] = []): Promise<JobQueueEntry[]> => {
     const query = { page } as any;
-    if (jobIds && jobIds.length > 0) {
+    if (jobIds.length > 0) {
       // Only getting the first 10, to prevent URL overflows
       query.ids = jobIds.slice(0, 10).join(',');
     }
-    return kfetch({
-      method: 'GET',
-      pathname: `${API_BASE_URL}/list`,
+
+    return core.http.get(`${API_LIST_URL}/list`, {
       query,
       asSystemRequest: true,
     });
   };
 
   public total(): Promise<number> {
-    return kfetch({
-      method: 'GET',
-      pathname: `${API_BASE_URL}/count`,
+    return core.http.get(`${API_LIST_URL}/count`, {
       asSystemRequest: true,
     });
   }
 
   public getContent(jobId: string): Promise<JobContent> {
-    return kfetch({
-      method: 'GET',
-      pathname: `${API_BASE_URL}/output/${jobId}`,
+    return core.http.get(`${API_LIST_URL}/output/${jobId}`, {
       asSystemRequest: true,
     });
   }
 
   public getInfo(jobId: string): Promise<JobInfo> {
-    return kfetch({
-      method: 'GET',
-      pathname: `${API_BASE_URL}/info/${jobId}`,
+    return core.http.get(`${API_LIST_URL}/info/${jobId}`, {
       asSystemRequest: true,
     });
   }
diff --git a/x-pack/legacy/plugins/reporting/public/lib/reporting_client.ts b/x-pack/legacy/plugins/reporting/public/lib/reporting_client.ts
index b9574dfa457f3..9056c7967b4a8 100644
--- a/x-pack/legacy/plugins/reporting/public/lib/reporting_client.ts
+++ b/x-pack/legacy/plugins/reporting/public/lib/reporting_client.ts
@@ -4,13 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { kfetch } from 'ui/kfetch';
+import { npStart } from 'ui/new_platform';
+import querystring from 'querystring';
+
+const { core } = npStart;
 
 // @ts-ignore
 import rison from 'rison-node';
-import chrome from 'ui/chrome';
-import { QueryString } from 'ui/utils/query_string';
-import { jobCompletionNotifications } from './job_completion_notifications';
+import { add } from './job_completion_notifications';
 
 const API_BASE_URL = '/api/reporting/generate';
 
@@ -18,26 +19,22 @@ interface JobParams {
   [paramName: string]: any;
 }
 
-class ReportingClient {
-  public getReportingJobPath = (exportType: string, jobParams: JobParams) => {
-    return `${chrome.addBasePath(API_BASE_URL)}/${exportType}?${QueryString.param(
-      'jobParams',
-      rison.encode(jobParams)
-    )}`;
-  };
-
-  public createReportingJob = async (exportType: string, jobParams: any) => {
-    const jobParamsRison = rison.encode(jobParams);
-    const resp = await kfetch({
-      method: 'POST',
-      pathname: `${API_BASE_URL}/${exportType}`,
-      body: JSON.stringify({
-        jobParams: jobParamsRison,
-      }),
-    });
-    jobCompletionNotifications.add(resp.job.id);
-    return resp;
-  };
-}
+export const getReportingJobPath = (exportType: string, jobParams: JobParams) => {
+  const params = querystring.stringify({ jobParams: rison.encode(jobParams) });
+
+  return `${core.http.basePath.prepend(API_BASE_URL)}/${exportType}?${params}`;
+};
+
+export const createReportingJob = async (exportType: string, jobParams: any) => {
+  const jobParamsRison = rison.encode(jobParams);
+  const resp = await core.http.post(`${API_BASE_URL}/${exportType}`, {
+    method: 'POST',
+    body: JSON.stringify({
+      jobParams: jobParamsRison,
+    }),
+  });
+
+  add(resp.job.id);
 
-export const reportingClient = new ReportingClient();
+  return resp;
+};
diff --git a/x-pack/legacy/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx b/x-pack/legacy/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
index 95ca1792a7eb1..fde053f8dbdfc 100644
--- a/x-pack/legacy/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
+++ b/x-pack/legacy/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
@@ -7,11 +7,7 @@ import dateMath from '@elastic/datemath';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
 
-import { kfetch } from 'ui/kfetch';
-import { toastNotifications } from 'ui/notify';
-import chrome from 'ui/chrome';
-
-import { npSetup } from 'ui/new_platform';
+import { npSetup, npStart } from 'ui/new_platform';
 import { IAction, IncompatibleActionError } from '../../../../../../src/plugins/ui_actions/public';
 
 import {
@@ -22,11 +18,9 @@ import {
 import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants';
 import { ISearchEmbeddable } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/types';
 
-import { API_BASE_URL_V1 } from '../../common/constants';
-
-const API_BASE_URL = `${API_BASE_URL_V1}/generate/immediate/csv/saved-object`;
+import { API_GENERATE_IMMEDIATE, CSV_REPORTING_ACTION } from '../../common/constants';
 
-const CSV_REPORTING_ACTION = 'downloadCsvReport';
+const { core } = npStart;
 
 function isSavedSearchEmbeddable(
   embeddable: IEmbeddable | ISearchEmbeddable
@@ -71,12 +65,6 @@ class GetCsvReportPanelAction implements IAction<ActionContext> {
   }
 
   public isCompatible = async (context: ActionContext) => {
-    const enablePanelActionDownload = chrome.getInjected('enablePanelActionDownload');
-
-    if (!enablePanelActionDownload) {
-      return false;
-    }
-
     const { embeddable } = context;
 
     return embeddable.getInput().viewMode !== ViewMode.EDIT && embeddable.type === 'search';
@@ -100,7 +88,7 @@ class GetCsvReportPanelAction implements IAction<ActionContext> {
     const searchEmbeddable = embeddable;
     const searchRequestBody = await this.getSearchRequestBody({ searchEmbeddable });
     const state = _.pick(searchRequestBody, ['sort', 'docvalue_fields', 'query']);
-    const kibanaTimezone = chrome.getUiSettingsClient().get('dateFormat:tz');
+    const kibanaTimezone = core.uiSettings.get('dateFormat:tz');
 
     const id = `search:${embeddable.getSavedSearch().id}`;
     const filename = embeddable.getTitle();
@@ -125,7 +113,7 @@ class GetCsvReportPanelAction implements IAction<ActionContext> {
 
     this.isDownloading = true;
 
-    toastNotifications.addSuccess({
+    core.notifications.toasts.addSuccess({
       title: i18n.translate('xpack.reporting.dashboard.csvDownloadStartedTitle', {
         defaultMessage: `CSV Download Started`,
       }),
@@ -135,7 +123,8 @@ class GetCsvReportPanelAction implements IAction<ActionContext> {
       'data-test-subj': 'csvDownloadStarted',
     });
 
-    await kfetch({ method: 'POST', pathname: `${API_BASE_URL}/${id}`, body })
+    await core.http
+      .post(`${API_GENERATE_IMMEDIATE}/${id}`, { body })
       .then((rawResponse: string) => {
         this.isDownloading = false;
 
@@ -162,7 +151,7 @@ class GetCsvReportPanelAction implements IAction<ActionContext> {
 
   private onGenerationFail(error: Error) {
     this.isDownloading = false;
-    toastNotifications.addDanger({
+    core.notifications.toasts.addDanger({
       title: i18n.translate('xpack.reporting.dashboard.failedCsvDownloadTitle', {
         defaultMessage: `CSV download failed`,
       }),
@@ -175,5 +164,6 @@ class GetCsvReportPanelAction implements IAction<ActionContext> {
 }
 
 const action = new GetCsvReportPanelAction();
+
 npSetup.plugins.uiActions.registerAction(action);
 npSetup.plugins.uiActions.attachAction(CONTEXT_MENU_TRIGGER, action.id);
diff --git a/x-pack/legacy/plugins/reporting/public/share_context_menu/register_reporting.tsx b/x-pack/legacy/plugins/reporting/public/share_context_menu/register_reporting.tsx
index fb5e74664e6c6..8e0da6a69225e 100644
--- a/x-pack/legacy/plugins/reporting/public/share_context_menu/register_reporting.tsx
+++ b/x-pack/legacy/plugins/reporting/public/share_context_menu/register_reporting.tsx
@@ -14,6 +14,8 @@ import chrome from 'ui/chrome';
 import { ScreenCapturePanelContent } from '../components/screen_capture_panel_content';
 import { ShareContext } from '../../../../../../src/plugins/share/public';
 
+const { core } = npSetup;
+
 async function reportingProvider() {
   const injector = await chrome.dangerouslyGetActiveInjector();
   const getShareMenuItems = ({
@@ -35,12 +37,15 @@ async function reportingProvider() {
 
     const getReportingJobParams = () => {
       // Replace hashes with original RISON values.
-      const relativeUrl = shareableUrl.replace(window.location.origin + chrome.getBasePath(), '');
+      const relativeUrl = shareableUrl.replace(
+        window.location.origin + core.http.basePath.get(),
+        ''
+      );
 
       const browserTimezone =
-        chrome.getUiSettingsClient().get('dateFormat:tz') === 'Browser'
+        core.uiSettings.get('dateFormat:tz') === 'Browser'
           ? moment.tz.guess()
-          : chrome.getUiSettingsClient().get('dateFormat:tz');
+          : core.uiSettings.get('dateFormat:tz');
 
       return {
         ...sharingData,
@@ -52,12 +57,15 @@ async function reportingProvider() {
 
     const getPngJobParams = () => {
       // Replace hashes with original RISON values.
-      const relativeUrl = shareableUrl.replace(window.location.origin + chrome.getBasePath(), '');
+      const relativeUrl = shareableUrl.replace(
+        window.location.origin + core.http.basePath.get(),
+        ''
+      );
 
       const browserTimezone =
-        chrome.getUiSettingsClient().get('dateFormat:tz') === 'Browser'
+        core.uiSettings.get('dateFormat:tz') === 'Browser'
           ? moment.tz.guess()
-          : chrome.getUiSettingsClient().get('dateFormat:tz');
+          : core.uiSettings.get('dateFormat:tz');
 
       return {
         ...sharingData,

From 08f4b556f4e88040083528cf54941e2688ca1f21 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Fri, 31 Jan 2020 11:27:21 +0300
Subject: [PATCH 05/26] kuery_autocomplete -> convert remaining items to
 TS/Jest (#56316)

* kuery_autocomplete -> convert remaining items to TS/Jest

Closes #55487

* QuerySuggestionsTypes rename values

* remove ref to npStart

* conjunction.test.ts it -> test

* remove ts-ignore
---
 .../data/common/es_query/kuery/types.ts       |   2 +
 .../autocomplete/autocomplete_service.ts      |   6 +
 src/plugins/data/public/autocomplete/index.ts |   5 +-
 .../providers/query_suggestion_provider.ts    |  26 ++-
 .../autocomplete/{types.ts => static.ts}      |  14 +-
 src/plugins/data/public/index.ts              |   5 +-
 src/plugins/data/public/types.ts              |   2 +-
 .../query_string_input/query_string_input.tsx |   6 +-
 .../typeahead/suggestion_component.test.tsx   |   2 +-
 .../typeahead/suggestions_component.test.tsx  |   4 +-
 .../__tests__/conjunction.js                  |  48 ----
 .../kql_query_suggestion/__tests__/field.js   | 146 ------------
 .../__tests__/operator.js                     |  64 ------
 .../kql_query_suggestion/conjunction.test.ts  |  63 +++++
 .../{conjunction.js => conjunction.tsx}       |  35 +--
 .../public/kql_query_suggestion/field.test.ts | 216 ++++++++++++++++++
 .../{field.js => field.tsx}                   |  71 +++---
 .../public/kql_query_suggestion/index.js      |  58 -----
 .../public/kql_query_suggestion/index.ts      |  59 +++++
 .../escape_kuery.test.ts}                     |  45 ++--
 .../{escape_kuery.js => lib/escape_kuery.ts}  |  20 +-
 .../kql_query_suggestion/operator.test.ts     |  96 ++++++++
 .../{operator.js => operator.tsx}             |  57 +++--
 .../kql_query_suggestion/sort_prefix_first.ts |   2 +
 .../public/kql_query_suggestion/types.ts      |  15 ++
 .../public/kql_query_suggestion/value.js      |  58 -----
 .../public/kql_query_suggestion/value.test.js | 146 ------------
 .../public/kql_query_suggestion/value.test.ts | 192 ++++++++++++++++
 .../public/kql_query_suggestion/value.ts      |  62 +++++
 .../kuery_autocomplete/public/legacy.ts       |  15 +-
 .../kuery_autocomplete/public/plugin.ts       |  14 +-
 .../kuery_autocomplete/public/services.ts     |  12 +
 .../__examples__/index.stories.tsx            |   2 +-
 .../autocomplete_field/index.test.tsx         |  20 +-
 34 files changed, 915 insertions(+), 673 deletions(-)
 rename src/plugins/data/public/autocomplete/{types.ts => static.ts} (76%)
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/conjunction.js
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/field.js
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/operator.js
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.test.ts
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{conjunction.js => conjunction.tsx} (72%)
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.test.ts
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{field.js => field.tsx} (66%)
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.js
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.ts
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{__tests__/escape_kuery.js => lib/escape_kuery.test.ts} (55%)
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{escape_kuery.js => lib/escape_kuery.ts} (57%)
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.test.ts
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{operator.js => operator.tsx} (82%)
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/types.ts
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.js
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.js
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.ts
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.ts
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/services.ts

diff --git a/src/plugins/data/common/es_query/kuery/types.ts b/src/plugins/data/common/es_query/kuery/types.ts
index 86cb7e08a767c..63c52bb64dc65 100644
--- a/src/plugins/data/common/es_query/kuery/types.ts
+++ b/src/plugins/data/common/es_query/kuery/types.ts
@@ -33,6 +33,8 @@ export interface KueryParseOptions {
   startRule: string;
   allowLeadingWildcards: boolean;
   errorOnLuceneSyntax: boolean;
+  cursorSymbol?: string;
+  parseCursor?: boolean;
 }
 
 export { nodeTypes } from './node_types';
diff --git a/src/plugins/data/public/autocomplete/autocomplete_service.ts b/src/plugins/data/public/autocomplete/autocomplete_service.ts
index 0527f833b0f8c..78bd2ec85f477 100644
--- a/src/plugins/data/public/autocomplete/autocomplete_service.ts
+++ b/src/plugins/data/public/autocomplete/autocomplete_service.ts
@@ -75,3 +75,9 @@ export class AutocompleteService {
     this.querySuggestionProviders.clear();
   }
 }
+
+/** @public **/
+export type AutocompleteSetup = ReturnType<AutocompleteService['setup']>;
+
+/** @public **/
+export type AutocompleteStart = ReturnType<AutocompleteService['start']>;
diff --git a/src/plugins/data/public/autocomplete/index.ts b/src/plugins/data/public/autocomplete/index.ts
index 5b8f3ae510bfd..c2b21e84b7a38 100644
--- a/src/plugins/data/public/autocomplete/index.ts
+++ b/src/plugins/data/public/autocomplete/index.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import * as autocomplete from './static';
+export { AutocompleteService, AutocompleteSetup, AutocompleteStart } from './autocomplete_service';
 
-export { AutocompleteService } from './autocomplete_service';
-export { QuerySuggestion, QuerySuggestionType, QuerySuggestionsGetFn } from './types';
+export { autocomplete };
diff --git a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts b/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
index 53abdd44c0c3f..94054ed56f42a 100644
--- a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
+++ b/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
@@ -19,13 +19,20 @@
 
 import { IFieldType, IIndexPattern } from '../../../common/index_patterns';
 
-export type QuerySuggestionType = 'field' | 'value' | 'operator' | 'conjunction' | 'recentSearch';
+export enum QuerySuggestionsTypes {
+  Field = 'field',
+  Value = 'value',
+  Operator = 'operator',
+  Conjunction = 'conjunction',
+  RecentSearch = 'recentSearch',
+}
 
 export type QuerySuggestionsGetFn = (
   args: QuerySuggestionsGetFnArgs
 ) => Promise<QuerySuggestion[]> | undefined;
 
-interface QuerySuggestionsGetFnArgs {
+/** @public **/
+export interface QuerySuggestionsGetFnArgs {
   language: string;
   indexPatterns: IIndexPattern[];
   query: string;
@@ -35,22 +42,21 @@ interface QuerySuggestionsGetFnArgs {
   boolFilter?: any;
 }
 
-interface BasicQuerySuggestion {
-  type: QuerySuggestionType;
-  description?: string;
+/** @public **/
+export interface BasicQuerySuggestion {
+  type: QuerySuggestionsTypes;
+  description?: string | JSX.Element;
   end: number;
   start: number;
   text: string;
   cursorIndex?: number;
 }
 
-interface FieldQuerySuggestion extends BasicQuerySuggestion {
-  type: 'field';
+/** @public **/
+export interface FieldQuerySuggestion extends BasicQuerySuggestion {
+  type: QuerySuggestionsTypes.Field;
   field: IFieldType;
 }
 
-// A union type allows us to do easy type guards in the code. For example, if I want to ensure I'm
-// working with a FieldAutocompleteSuggestion, I can just do `if ('field' in suggestion)` and the
-// TypeScript compiler will narrow the type to the parts of the union that have a field prop.
 /** @public **/
 export type QuerySuggestion = BasicQuerySuggestion | FieldQuerySuggestion;
diff --git a/src/plugins/data/public/autocomplete/types.ts b/src/plugins/data/public/autocomplete/static.ts
similarity index 76%
rename from src/plugins/data/public/autocomplete/types.ts
rename to src/plugins/data/public/autocomplete/static.ts
index 759e2dd25a5bc..7d627486c6d65 100644
--- a/src/plugins/data/public/autocomplete/types.ts
+++ b/src/plugins/data/public/autocomplete/static.ts
@@ -17,17 +17,11 @@
  * under the License.
  */
 
-import { AutocompleteService } from './autocomplete_service';
-
-/** @public **/
-export type AutocompleteSetup = ReturnType<AutocompleteService['setup']>;
-
-/** @public **/
-export type AutocompleteStart = ReturnType<AutocompleteService['start']>;
-
-/** @public **/
 export {
   QuerySuggestion,
+  QuerySuggestionsTypes,
   QuerySuggestionsGetFn,
-  QuerySuggestionType,
+  QuerySuggestionsGetFnArgs,
+  BasicQuerySuggestion,
+  FieldQuerySuggestion,
 } from './providers/query_suggestion_provider';
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index bc25c64f0e96e..2fa6b8deae69d 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -18,7 +18,6 @@
  */
 
 import { PluginInitializerContext } from '../../../core/public';
-import * as autocomplete from './autocomplete';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new DataPublicPlugin(initializerContext);
@@ -44,7 +43,7 @@ export {
   RefreshInterval,
   TimeRange,
 } from '../common';
-
+export { autocomplete } from './autocomplete';
 export * from './field_formats';
 export * from './index_patterns';
 export * from './search';
@@ -70,5 +69,3 @@ export {
 // Export plugin after all other imports
 import { DataPublicPlugin } from './plugin';
 export { DataPublicPlugin as Plugin };
-
-export { autocomplete };
diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts
index 6b6ff5e62e63f..e62aba5f2713d 100644
--- a/src/plugins/data/public/types.ts
+++ b/src/plugins/data/public/types.ts
@@ -20,7 +20,7 @@
 import { CoreStart } from 'src/core/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { IUiActionsSetup, IUiActionsStart } from 'src/plugins/ui_actions/public';
-import { AutocompleteSetup, AutocompleteStart } from './autocomplete/types';
+import { AutocompleteSetup, AutocompleteStart } from './autocomplete';
 import { FieldFormatsSetup, FieldFormatsStart } from './field_formats';
 import { ISearchSetup, ISearchStart } from './search';
 import { QuerySetup, QueryStart } from './query';
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
index cf219c35bcced..7a8c0f7269fa1 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
+++ b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
@@ -89,8 +89,6 @@ const KEY_CODES = {
   END: 35,
 };
 
-const recentSearchType: autocomplete.QuerySuggestionType = 'recentSearch';
-
 export class QueryStringInputUI extends Component<Props, State> {
   public state: State = {
     isSuggestionsVisible: false,
@@ -193,7 +191,7 @@ export class QueryStringInputUI extends Component<Props, State> {
       const text = toUser(recentSearch);
       const start = 0;
       const end = query.length;
-      return { type: recentSearchType, text, start, end };
+      return { type: autocomplete.QuerySuggestionsTypes.RecentSearch, text, start, end };
     });
   };
 
@@ -343,7 +341,7 @@ export class QueryStringInputUI extends Component<Props, State> {
       selectionEnd: start + (cursorIndex ? cursorIndex : text.length),
     });
 
-    if (type === recentSearchType) {
+    if (type === autocomplete.QuerySuggestionsTypes.RecentSearch) {
       this.setState({ isSuggestionsVisible: false, index: null });
       this.onSubmit({ query: newQueryString, language: this.props.query.language });
     }
diff --git a/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx b/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
index 0c5c701642757..ba92be8947ea5 100644
--- a/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
+++ b/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
@@ -31,7 +31,7 @@ const mockSuggestion: autocomplete.QuerySuggestion = {
   end: 0,
   start: 42,
   text: 'as promised, not helpful',
-  type: 'value',
+  type: autocomplete.QuerySuggestionsTypes.Value,
 };
 
 describe('SuggestionComponent', () => {
diff --git a/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx b/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
index b84f612b6d13a..eebe438025949 100644
--- a/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
+++ b/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
@@ -33,14 +33,14 @@ const mockSuggestions: autocomplete.QuerySuggestion[] = [
     end: 0,
     start: 42,
     text: 'as promised, not helpful',
-    type: 'value',
+    type: autocomplete.QuerySuggestionsTypes.Value,
   },
   {
     description: 'This is another unhelpful suggestion',
     end: 0,
     start: 42,
     text: 'yep',
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
   },
 ];
 
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/conjunction.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/conjunction.js
deleted file mode 100644
index 94990edef5e82..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/conjunction.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { getSuggestionsProvider } from '../conjunction';
-
-describe('Kuery conjunction suggestions', function() {
-  const getSuggestions = getSuggestionsProvider();
-
-  it('should return a function', function() {
-    expect(typeof getSuggestions).to.be('function');
-  });
-
-  it('should not suggest anything for phrases not ending in whitespace', function() {
-    const text = 'foo';
-    const suggestions = getSuggestions({ text });
-    expect(suggestions).to.eql([]);
-  });
-
-  it('should suggest and/or for phrases ending in whitespace', function() {
-    const text = 'foo ';
-    const suggestions = getSuggestions({ text });
-    expect(suggestions.length).to.be(2);
-    expect(suggestions.map(suggestion => suggestion.text)).to.eql(['and ', 'or ']);
-  });
-
-  it('should suggest to insert the suggestion at the end of the string', function() {
-    const text = 'bar ';
-    const end = text.length;
-    const suggestions = getSuggestions({ text, end });
-    expect(suggestions.length).to.be(2);
-    expect(suggestions.map(suggestion => suggestion.start)).to.eql([end, end]);
-    expect(suggestions.map(suggestion => suggestion.end)).to.eql([end, end]);
-  });
-  it('should have descriptions', function() {
-    const text = ' ';
-    const suggestions = getSuggestions({ text });
-    expect(typeof suggestions).to.be('object');
-    expect(Object.keys(suggestions).length).to.be(2);
-    suggestions.forEach(suggestion => {
-      expect(typeof suggestion).to.be('object');
-      expect(suggestion).to.have.property('description');
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/field.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/field.js
deleted file mode 100644
index 6dc07da68a5ea..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/field.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { getSuggestionsProvider } from '../field';
-import indexPatternResponse from '../__fixtures__/index_pattern_response.json';
-import { isFilterable } from '../../../../../../../src/plugins/data/public';
-
-describe('Kuery field suggestions', function() {
-  let indexPattern;
-  let indexPatterns;
-  let getSuggestions;
-
-  beforeEach(() => {
-    indexPattern = indexPatternResponse;
-    indexPatterns = [indexPattern];
-    getSuggestions = getSuggestionsProvider({ indexPatterns });
-  });
-
-  it('should return a function', function() {
-    expect(typeof getSuggestions).to.be('function');
-  });
-
-  it('should return filterable fields', function() {
-    const prefix = '';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    const filterableFields = indexPattern.fields.filter(isFilterable);
-    expect(suggestions.length).to.be(filterableFields.length);
-  });
-
-  it('should filter suggestions based on the query', () => {
-    const prefix = 'machine';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    expect(suggestions.find(({ text }) => text === 'machine.os ')).to.be.ok();
-  });
-
-  it('should filter suggestions case insensitively', () => {
-    const prefix = 'MACHINE';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    expect(suggestions.find(({ text }) => text === 'machine.os ')).to.be.ok();
-  });
-
-  it('should return suggestions where the query matches somewhere in the middle', () => {
-    const prefix = '.';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    expect(suggestions.find(({ text }) => text === 'machine.os ')).to.be.ok();
-  });
-
-  it('should return field names that start with the query first', () => {
-    const prefix = 'e';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    const extensionIndex = suggestions.findIndex(({ text }) => text === 'extension ');
-    const bytesIndex = suggestions.findIndex(({ text }) => text === 'bytes ');
-    expect(extensionIndex).to.be.lessThan(bytesIndex);
-  });
-
-  it('should sort keyword fields before analyzed versions', () => {
-    const prefix = '';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    const analyzedIndex = suggestions.findIndex(({ text }) => text === 'machine.os ');
-    const keywordIndex = suggestions.findIndex(({ text }) => text === 'machine.os.raw ');
-    expect(keywordIndex).to.be.lessThan(analyzedIndex);
-  });
-
-  it('should have descriptions', function() {
-    const prefix = '';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    expect(suggestions.length).to.be.greaterThan(0);
-    suggestions.forEach(suggestion => {
-      expect(suggestion).to.have.property('description');
-    });
-  });
-
-  describe('nested fields', function() {
-    it("should automatically wrap nested fields in KQL's nested syntax", () => {
-      const prefix = 'ch';
-      const suffix = '';
-      const suggestions = getSuggestions({ prefix, suffix });
-
-      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
-      expect(suggestion.text).to.be('nestedField:{ child  }');
-
-      // For most suggestions the cursor can be placed at the end of the suggestion text, but
-      // for the nested field syntax we want to place the cursor inside the curly braces
-      expect(suggestion.cursorIndex).to.be(20);
-    });
-
-    it('should narrow suggestions to children of a nested path if provided', () => {
-      const prefix = 'ch';
-      const suffix = '';
-
-      const allSuggestions = getSuggestions({ prefix, suffix });
-      expect(allSuggestions.length).to.be.greaterThan(2);
-
-      const nestedSuggestions = getSuggestions({ prefix, suffix, nestedPath: 'nestedField' });
-      expect(nestedSuggestions).to.have.length(2);
-    });
-
-    it("should not wrap the suggestion in KQL's nested syntax if the correct nested path is already provided", () => {
-      const prefix = 'ch';
-      const suffix = '';
-
-      const suggestions = getSuggestions({ prefix, suffix, nestedPath: 'nestedField' });
-      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
-      expect(suggestion.text).to.be('child ');
-    });
-
-    it('should handle fields nested multiple levels deep', () => {
-      const prefix = 'doubly';
-      const suffix = '';
-
-      const suggestionsWithNoPath = getSuggestions({ prefix, suffix });
-      expect(suggestionsWithNoPath).to.have.length(1);
-      const [noPathSuggestion] = suggestionsWithNoPath;
-      expect(noPathSuggestion.text).to.be('nestedField.nestedChild:{ doublyNestedChild  }');
-
-      const suggestionsWithPartialPath = getSuggestions({
-        prefix,
-        suffix,
-        nestedPath: 'nestedField',
-      });
-      expect(suggestionsWithPartialPath).to.have.length(1);
-      const [partialPathSuggestion] = suggestionsWithPartialPath;
-      expect(partialPathSuggestion.text).to.be('nestedChild:{ doublyNestedChild  }');
-
-      const suggestionsWithFullPath = getSuggestions({
-        prefix,
-        suffix,
-        nestedPath: 'nestedField.nestedChild',
-      });
-      expect(suggestionsWithFullPath).to.have.length(1);
-      const [fullPathSuggestion] = suggestionsWithFullPath;
-      expect(fullPathSuggestion.text).to.be('doublyNestedChild ');
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/operator.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/operator.js
deleted file mode 100644
index c248e3e8366a9..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/operator.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { getSuggestionsProvider } from '../operator';
-import indexPatternResponse from '../__fixtures__/index_pattern_response.json';
-
-describe('Kuery operator suggestions', function() {
-  let indexPatterns;
-  let getSuggestions;
-
-  beforeEach(() => {
-    indexPatterns = [indexPatternResponse];
-    getSuggestions = getSuggestionsProvider({ indexPatterns });
-  });
-
-  it('should return a function', function() {
-    expect(typeof getSuggestions).to.be('function');
-  });
-
-  it('should not return suggestions for non-fields', () => {
-    const fieldName = 'foo';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.length).to.eql([]);
-  });
-
-  it('should return exists for every field', () => {
-    const fieldName = 'custom_user_field';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.length).to.eql(1);
-    expect(suggestions[0].text).to.be(': * ');
-  });
-
-  it('should return equals for string fields', () => {
-    const fieldName = 'machine.os';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.find(({ text }) => text === ': ')).to.be.ok();
-    expect(suggestions.find(({ text }) => text === '< ')).to.not.be.ok();
-  });
-
-  it('should return numeric operators for numeric fields', () => {
-    const fieldName = 'bytes';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.find(({ text }) => text === ': ')).to.be.ok();
-    expect(suggestions.find(({ text }) => text === '< ')).to.be.ok();
-  });
-
-  it('should have descriptions', function() {
-    const fieldName = 'bytes';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.length).to.be.greaterThan(0);
-    suggestions.forEach(suggestion => {
-      expect(suggestion).to.have.property('description');
-    });
-  });
-
-  it('should handle nested paths', () => {
-    const suggestions = getSuggestions({ fieldName: 'child', nestedPath: 'nestedField' });
-    expect(suggestions.length).to.be.greaterThan(0);
-  });
-});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.test.ts
new file mode 100644
index 0000000000000..e8aec0deec6d7
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.test.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 { setupGetConjunctionSuggestions } from './conjunction';
+import { autocomplete, esKuery } from '../../../../../../src/plugins/data/public';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+
+const mockKueryNode = (kueryNode: Partial<esKuery.KueryNode>) =>
+  (kueryNode as unknown) as esKuery.KueryNode;
+
+describe('Kuery conjunction suggestions', () => {
+  const querySuggestionsArgs = (null as unknown) as autocomplete.QuerySuggestionsGetFnArgs;
+  let getSuggestions: ReturnType<typeof setupGetConjunctionSuggestions>;
+
+  beforeEach(() => {
+    getSuggestions = setupGetConjunctionSuggestions(coreMock.createSetup());
+  });
+
+  test('should return a function', () => {
+    expect(typeof getSuggestions).toBe('function');
+  });
+
+  test('should not suggest anything for phrases not ending in whitespace', async () => {
+    const text = 'foo';
+    const suggestions = await getSuggestions(querySuggestionsArgs, mockKueryNode({ text }));
+
+    expect(suggestions).toEqual([]);
+  });
+
+  test('should suggest and/or for phrases ending in whitespace', async () => {
+    const text = 'foo ';
+    const suggestions = await getSuggestions(querySuggestionsArgs, mockKueryNode({ text }));
+
+    expect(suggestions.length).toBe(2);
+    expect(suggestions.map(suggestion => suggestion.text)).toEqual(['and ', 'or ']);
+  });
+
+  test('should suggest to insert the suggestion at the end of the string', async () => {
+    const text = 'bar ';
+    const end = text.length;
+    const suggestions = await getSuggestions(querySuggestionsArgs, mockKueryNode({ text, end }));
+
+    expect(suggestions.length).toBe(2);
+    expect(suggestions.map(suggestion => suggestion.start)).toEqual([end, end]);
+    expect(suggestions.map(suggestion => suggestion.end)).toEqual([end, end]);
+  });
+
+  test('should have descriptions', async () => {
+    const text = ' ';
+    const suggestions = await getSuggestions(querySuggestionsArgs, mockKueryNode({ text }));
+
+    expect(typeof suggestions).toBe('object');
+    expect(Object.keys(suggestions).length).toBe(2);
+
+    suggestions.forEach(suggestion => {
+      expect(typeof suggestion).toBe('object');
+      expect(suggestion).toHaveProperty('description');
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.tsx
similarity index 72%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.tsx
index 66f4e6f8eb341..f570586274fdd 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.tsx
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
+import { $Keys } from 'utility-types';
 import { FormattedMessage } from '@kbn/i18n/react';
-
-const type = 'conjunction';
+import { KqlQuerySuggestionProvider } from './types';
+import { autocomplete } from '../../../../../../src/plugins/data/public';
 
 const bothArgumentsText = (
   <FormattedMessage
@@ -24,7 +25,7 @@ const oneOrMoreArgumentsText = (
   />
 );
 
-const conjunctions = {
+const conjunctions: Record<string, JSX.Element> = {
   and: (
     <p>
       <FormattedMessage
@@ -55,18 +56,20 @@ const conjunctions = {
   ),
 };
 
-function getDescription(conjunction) {
-  return conjunctions[conjunction];
-}
+export const setupGetConjunctionSuggestions: KqlQuerySuggestionProvider = core => {
+  return (querySuggestionsArgs, { text, end }) => {
+    let suggestions: autocomplete.QuerySuggestion[] | [] = [];
+
+    if (text.endsWith(' ')) {
+      suggestions = Object.keys(conjunctions).map((key: $Keys<typeof conjunctions>) => ({
+        type: autocomplete.QuerySuggestionsTypes.Conjunction,
+        text: `${key} `,
+        description: conjunctions[key],
+        start: end,
+        end,
+      }));
+    }
 
-export function getSuggestionsProvider() {
-  return function getConjunctionSuggestions({ text, end }) {
-    if (!text.endsWith(' ')) return [];
-    const suggestions = Object.keys(conjunctions).map(conjunction => {
-      const text = `${conjunction} `;
-      const description = getDescription(conjunction);
-      return { type, text, description, start: end, end };
-    });
-    return suggestions;
+    return Promise.resolve(suggestions);
   };
-}
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.test.ts
new file mode 100644
index 0000000000000..2fd5cfd17eb69
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.test.ts
@@ -0,0 +1,216 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import indexPatternResponse from './__fixtures__/index_pattern_response.json';
+
+import { setupGetFieldSuggestions } from './field';
+import { isFilterable, autocomplete, esKuery } from '../../../../../../src/plugins/data/public';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+
+const mockKueryNode = (kueryNode: Partial<esKuery.KueryNode>) =>
+  (kueryNode as unknown) as esKuery.KueryNode;
+
+describe('Kuery field suggestions', () => {
+  let querySuggestionsArgs: autocomplete.QuerySuggestionsGetFnArgs;
+  let getSuggestions: ReturnType<typeof setupGetFieldSuggestions>;
+
+  beforeEach(() => {
+    querySuggestionsArgs = ({
+      indexPatterns: [indexPatternResponse],
+    } as unknown) as autocomplete.QuerySuggestionsGetFnArgs;
+
+    getSuggestions = setupGetFieldSuggestions(coreMock.createSetup());
+  });
+
+  test('should return a function', () => {
+    expect(typeof getSuggestions).toBe('function');
+  });
+
+  test('should return filterable fields', async () => {
+    const prefix = '';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+    const filterableFields = indexPatternResponse.fields.filter(isFilterable);
+
+    expect(suggestions.length).toBe(filterableFields.length);
+  });
+
+  test('should filter suggestions based on the query', async () => {
+    const prefix = 'machine';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+
+    expect(suggestions.find(({ text }) => text === 'machine.os ')).toBeDefined();
+  });
+
+  test('should filter suggestions case insensitively', async () => {
+    const prefix = 'MACHINE';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+
+    expect(suggestions.find(({ text }) => text === 'machine.os ')).toBeDefined();
+  });
+
+  test('should return suggestions where the query matches somewhere in the middle', async () => {
+    const prefix = '.';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+
+    expect(suggestions.find(({ text }) => text === 'machine.os ')).toBeDefined();
+  });
+
+  test('should return field names that start with the query first', async () => {
+    const prefix = 'e';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+    const extensionIndex = suggestions.findIndex(({ text }) => text === 'extension ');
+    const bytesIndex = suggestions.findIndex(({ text }) => text === 'bytes ');
+
+    expect(extensionIndex).toBeLessThan(bytesIndex);
+  });
+
+  test('should sort keyword fields before analyzed versions', async () => {
+    const prefix = '';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+    const analyzedIndex = suggestions.findIndex(({ text }) => text === 'machine.os ');
+    const keywordIndex = suggestions.findIndex(({ text }) => text === 'machine.os.raw ');
+
+    expect(keywordIndex).toBeLessThan(analyzedIndex);
+  });
+
+  test('should have descriptions', async () => {
+    const prefix = '';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+    expect(suggestions.length).toBeGreaterThan(0);
+    suggestions.forEach(suggestion => {
+      expect(suggestion).toHaveProperty('description');
+    });
+  });
+
+  describe('nested fields', () => {
+    test("should automatically wrap nested fields in KQL's nested syntax", async () => {
+      const prefix = 'ch';
+      const suffix = '';
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({ prefix, suffix })
+      );
+
+      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
+
+      expect(suggestion).toBeDefined();
+
+      if (suggestion) {
+        expect(suggestion.text).toBe('nestedField:{ child  }');
+
+        // For most suggestions the cursor can be placed at the end of the suggestion text, but
+        // for the nested field syntax we want to place the cursor inside the curly braces
+        expect(suggestion.cursorIndex).toBe(20);
+      }
+    });
+
+    test('should narrow suggestions to children of a nested path if provided', async () => {
+      const prefix = 'ch';
+      const suffix = '';
+
+      const allSuggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({ prefix, suffix })
+      );
+      expect(allSuggestions.length).toBeGreaterThan(2);
+
+      const nestedSuggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          prefix,
+          suffix,
+          nestedPath: 'nestedField',
+        })
+      );
+      expect(nestedSuggestions).toHaveLength(2);
+    });
+
+    test("should not wrap the suggestion in KQL's nested syntax if the correct nested path is already provided", async () => {
+      const prefix = 'ch';
+      const suffix = '';
+
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          prefix,
+          suffix,
+          nestedPath: 'nestedField',
+        })
+      );
+      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
+
+      expect(suggestion).toBeDefined();
+
+      if (suggestion) {
+        expect(suggestion.text).toBe('child ');
+      }
+    });
+
+    test('should handle fields nested multiple levels deep', async () => {
+      const prefix = 'doubly';
+      const suffix = '';
+
+      const suggestionsWithNoPath = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({ prefix, suffix })
+      );
+      expect(suggestionsWithNoPath).toHaveLength(1);
+      const [noPathSuggestion] = suggestionsWithNoPath;
+      expect(noPathSuggestion.text).toBe('nestedField.nestedChild:{ doublyNestedChild  }');
+
+      const suggestionsWithPartialPath = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          prefix,
+          suffix,
+          nestedPath: 'nestedField',
+        })
+      );
+      expect(suggestionsWithPartialPath).toHaveLength(1);
+      const [partialPathSuggestion] = suggestionsWithPartialPath;
+      expect(partialPathSuggestion.text).toBe('nestedChild:{ doublyNestedChild  }');
+
+      const suggestionsWithFullPath = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          prefix,
+          suffix,
+          nestedPath: 'nestedField.nestedChild',
+        })
+      );
+      expect(suggestionsWithFullPath).toHaveLength(1);
+      const [fullPathSuggestion] = suggestionsWithFullPath;
+      expect(fullPathSuggestion.text).toBe('doublyNestedChild ');
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.tsx
similarity index 66%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.tsx
index 3e5c92dfc007f..a8af884c24fc3 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.tsx
@@ -5,32 +5,42 @@
  */
 import React from 'react';
 import { flatten } from 'lodash';
-import { escapeKuery } from './escape_kuery';
-import { sortPrefixFirst } from './sort_prefix_first';
-import { isFilterable } from '../../../../../../src/plugins/data/public';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { escapeKuery } from './lib/escape_kuery';
+import { sortPrefixFirst } from './sort_prefix_first';
+import { IFieldType, isFilterable, autocomplete } from '../../../../../../src/plugins/data/public';
+import { KqlQuerySuggestionProvider } from './types';
 
-const type = 'field';
-
-function getDescription(fieldName) {
+const getDescription = (field: IFieldType) => {
   return (
     <p>
       <FormattedMessage
         id="xpack.kueryAutocomplete.filterResultsDescription"
         defaultMessage="Filter results that contain {fieldName}"
-        values={{ fieldName: <span className="kbnSuggestionItem__callout">{fieldName}</span> }}
+        values={{ fieldName: <span className="kbnSuggestionItem__callout">{field.name}</span> }}
       />
     </p>
   );
-}
+};
 
-export function getSuggestionsProvider({ indexPatterns }) {
-  const allFields = flatten(
-    indexPatterns.map(indexPattern => {
-      return indexPattern.fields.filter(isFilterable);
-    })
-  );
-  return function getFieldSuggestions({ start, end, prefix, suffix, nestedPath = '' }) {
+const keywordComparator = (first: IFieldType, second: IFieldType) => {
+  const extensions = ['raw', 'keyword'];
+  if (extensions.map(ext => `${first.name}.${ext}`).includes(second.name)) {
+    return 1;
+  } else if (extensions.map(ext => `${second.name}.${ext}`).includes(first.name)) {
+    return -1;
+  }
+
+  return first.name.localeCompare(second.name);
+};
+
+export const setupGetFieldSuggestions: KqlQuerySuggestionProvider<autocomplete.FieldQuerySuggestion> = core => {
+  return ({ indexPatterns }, { start, end, prefix, suffix, nestedPath = '' }) => {
+    const allFields = flatten(
+      indexPatterns.map(indexPattern => {
+        return indexPattern.fields.filter(isFilterable);
+      })
+    );
     const search = `${prefix}${suffix}`.trim().toLowerCase();
     const matchingFields = allFields.filter(field => {
       return (
@@ -44,7 +54,8 @@ export function getSuggestionsProvider({ indexPatterns }) {
       );
     });
     const sortedFields = sortPrefixFirst(matchingFields.sort(keywordComparator), search, 'name');
-    const suggestions = sortedFields.map(field => {
+
+    const suggestions: autocomplete.FieldQuerySuggestion[] = sortedFields.map(field => {
       const remainingPath =
         field.subType && field.subType.nested
           ? field.subType.nested.path.slice(nestedPath ? nestedPath.length + 1 : 0)
@@ -55,23 +66,23 @@ export function getSuggestionsProvider({ indexPatterns }) {
               field.name.slice(field.subType.nested.path.length + 1)
             )}  }`
           : `${escapeKuery(field.name.slice(nestedPath ? nestedPath.length + 1 : 0))} `;
-      const description = getDescription(field.name);
+      const description = getDescription(field);
       const cursorIndex =
         field.subType && field.subType.nested && remainingPath.length > 0
           ? text.length - 2
           : text.length;
-      return { type, text, description, start, end, cursorIndex, field };
+
+      return {
+        type: autocomplete.QuerySuggestionsTypes.Field,
+        text,
+        description,
+        start,
+        end,
+        cursorIndex,
+        field,
+      };
     });
-    return suggestions;
-  };
-}
 
-function keywordComparator(first, second) {
-  const extensions = ['raw', 'keyword'];
-  if (extensions.map(ext => `${first.name}.${ext}`).includes(second.name)) {
-    return 1;
-  } else if (extensions.map(ext => `${second.name}.${ext}`).includes(first.name)) {
-    return -1;
-  }
-  return first.name.localeCompare(second.name);
-}
+    return Promise.resolve(suggestions);
+  };
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.js
deleted file mode 100644
index b877f9eb852d5..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.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 { flatten, uniq } from 'lodash';
-import { getSuggestionsProvider as field } from './field';
-import { getSuggestionsProvider as value } from './value';
-import { getSuggestionsProvider as operator } from './operator';
-import { getSuggestionsProvider as conjunction } from './conjunction';
-import { esKuery } from '../../../../../../src/plugins/data/public';
-
-const cursorSymbol = '@kuery-cursor@';
-const providers = {
-  field,
-  value,
-  operator,
-  conjunction,
-};
-
-function dedup(suggestions) {
-  return uniq(suggestions, ({ type, text, start, end }) => [type, text, start, end].join('|'));
-}
-
-const getProviderByType = (type, args) => providers[type](args);
-
-export const setupKqlQuerySuggestionProvider = ({ uiSettings }) => ({
-  indexPatterns,
-  boolFilter,
-  query,
-  selectionStart,
-  selectionEnd,
-  signal,
-}) => {
-  const cursoredQuery = `${query.substr(0, selectionStart)}${cursorSymbol}${query.substr(
-    selectionEnd
-  )}`;
-
-  let cursorNode;
-  try {
-    cursorNode = esKuery.fromKueryExpression(cursoredQuery, { cursorSymbol, parseCursor: true });
-  } catch (e) {
-    cursorNode = {};
-  }
-
-  const { suggestionTypes = [] } = cursorNode;
-  const suggestionsByType = suggestionTypes.map(type =>
-    getProviderByType(type, {
-      config: uiSettings,
-      indexPatterns,
-      boolFilter,
-    })(cursorNode, signal)
-  );
-  return Promise.all(suggestionsByType).then(suggestionsByType =>
-    dedup(flatten(suggestionsByType))
-  );
-};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.ts
new file mode 100644
index 0000000000000..2cc15fe4c9280
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.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 { CoreSetup } from 'kibana/public';
+import { $Keys } from 'utility-types';
+import { flatten, uniq } from 'lodash';
+import { setupGetFieldSuggestions } from './field';
+import { setupGetValueSuggestions } from './value';
+import { setupGetOperatorSuggestions } from './operator';
+import { setupGetConjunctionSuggestions } from './conjunction';
+import { esKuery, autocomplete } from '../../../../../../src/plugins/data/public';
+
+const cursorSymbol = '@kuery-cursor@';
+
+const dedup = (suggestions: autocomplete.QuerySuggestion[]): autocomplete.QuerySuggestion[] =>
+  uniq(suggestions, ({ type, text, start, end }) => [type, text, start, end].join('|'));
+
+export const setupKqlQuerySuggestionProvider = (
+  core: CoreSetup
+): autocomplete.QuerySuggestionsGetFn => {
+  const providers = {
+    field: setupGetFieldSuggestions(core),
+    value: setupGetValueSuggestions(core),
+    operator: setupGetOperatorSuggestions(core),
+    conjunction: setupGetConjunctionSuggestions(core),
+  };
+
+  const getSuggestionsByType = (
+    cursoredQuery: string,
+    querySuggestionsArgs: autocomplete.QuerySuggestionsGetFnArgs
+  ): Array<Promise<autocomplete.QuerySuggestion[]>> | [] => {
+    try {
+      const cursorNode = esKuery.fromKueryExpression(cursoredQuery, {
+        cursorSymbol,
+        parseCursor: true,
+      });
+
+      return cursorNode.suggestionTypes.map((type: $Keys<typeof providers>) =>
+        providers[type](querySuggestionsArgs, cursorNode)
+      );
+    } catch (e) {
+      return [];
+    }
+  };
+
+  return querySuggestionsArgs => {
+    const { query, selectionStart, selectionEnd } = querySuggestionsArgs;
+    const cursoredQuery = `${query.substr(0, selectionStart)}${cursorSymbol}${query.substr(
+      selectionEnd
+    )}`;
+
+    return Promise.all(
+      getSuggestionsByType(cursoredQuery, querySuggestionsArgs)
+    ).then(suggestionsByType => dedup(flatten(suggestionsByType)));
+  };
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/escape_kuery.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.test.ts
similarity index 55%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/escape_kuery.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.test.ts
index 2127194c9a890..a4a1d977a207f 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/escape_kuery.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.test.ts
@@ -4,55 +4,62 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import expect from '@kbn/expect';
-import { escapeQuotes, escapeKuery } from '../escape_kuery';
+import { escapeQuotes, escapeKuery } from './escape_kuery';
 
-describe('Kuery escape', function() {
-  it('should escape quotes', function() {
+describe('Kuery escape', () => {
+  test('should escape quotes', () => {
     const value = 'I said, "Hello."';
     const expected = 'I said, \\"Hello.\\"';
-    expect(escapeQuotes(value)).to.be(expected);
+
+    expect(escapeQuotes(value)).toBe(expected);
   });
 
-  it('should escape special characters', function() {
+  test('should escape special characters', () => {
     const value = `This \\ has (a lot of) <special> characters, don't you *think*? "Yes."`;
     const expected = `This \\\\ has \\(a lot of\\) \\<special\\> characters, don't you \\*think\\*? \\"Yes.\\"`;
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape keywords', function() {
+  test('should escape keywords', () => {
     const value = 'foo and bar or baz not qux';
     const expected = 'foo \\and bar \\or baz \\not qux';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape keywords next to each other', function() {
+  test('should escape keywords next to each other', () => {
     const value = 'foo and bar or not baz';
     const expected = 'foo \\and bar \\or \\not baz';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should not escape keywords without surrounding spaces', function() {
+  test('should not escape keywords without surrounding spaces', () => {
     const value = 'And this has keywords, or does it not?';
     const expected = 'And this has keywords, \\or does it not?';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape uppercase keywords', function() {
+  test('should escape uppercase keywords', () => {
     const value = 'foo AND bar';
     const expected = 'foo \\AND bar';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape both keywords and special characters', function() {
+  test('should escape both keywords and special characters', () => {
     const value = 'Hello, world, and <nice> to meet you!';
     const expected = 'Hello, world, \\and \\<nice\\> to meet you!';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape newlines and tabs', () => {
+  test('should escape newlines and tabs', () => {
     const value = 'This\nhas\tnewlines\r\nwith\ttabs';
     const expected = 'This\\nhas\\tnewlines\\r\\nwith\\ttabs';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 });
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/escape_kuery.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.ts
similarity index 57%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/escape_kuery.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.ts
index 5d9bfe6143c22..a00082f8c7d7c 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/escape_kuery.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.ts
@@ -6,29 +6,29 @@
 
 import { flow } from 'lodash';
 
-export function escapeQuotes(string) {
-  return string.replace(/"/g, '\\"');
+export function escapeQuotes(str: string) {
+  return str.replace(/"/g, '\\"');
 }
 
 export const escapeKuery = flow(escapeSpecialCharacters, escapeAndOr, escapeNot, escapeWhitespace);
 
 // See the SpecialCharacter rule in kuery.peg
-function escapeSpecialCharacters(string) {
-  return string.replace(/[\\():<>"*]/g, '\\$&'); // $& means the whole matched string
+function escapeSpecialCharacters(str: string) {
+  return str.replace(/[\\():<>"*]/g, '\\$&'); // $& means the whole matched string
 }
 
 // See the Keyword rule in kuery.peg
-function escapeAndOr(string) {
-  return string.replace(/(\s+)(and|or)(\s+)/gi, '$1\\$2$3');
+function escapeAndOr(str: string) {
+  return str.replace(/(\s+)(and|or)(\s+)/gi, '$1\\$2$3');
 }
 
-function escapeNot(string) {
-  return string.replace(/not(\s+)/gi, '\\$&');
+function escapeNot(str: string) {
+  return str.replace(/not(\s+)/gi, '\\$&');
 }
 
 // See the Space rule in kuery.peg
-function escapeWhitespace(string) {
-  return string
+function escapeWhitespace(str: string) {
+  return str
     .replace(/\t/g, '\\t')
     .replace(/\r/g, '\\r')
     .replace(/\n/g, '\\n');
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.test.ts
new file mode 100644
index 0000000000000..acafc4e169c8f
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.test.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import indexPatternResponse from './__fixtures__/index_pattern_response.json';
+
+import { setupGetOperatorSuggestions } from './operator';
+import { autocomplete, esKuery } from '../../../../../../src/plugins/data/public';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+
+const mockKueryNode = (kueryNode: Partial<esKuery.KueryNode>) =>
+  (kueryNode as unknown) as esKuery.KueryNode;
+
+describe('Kuery operator suggestions', () => {
+  let getSuggestions: ReturnType<typeof setupGetOperatorSuggestions>;
+  let querySuggestionsArgs: autocomplete.QuerySuggestionsGetFnArgs;
+
+  beforeEach(() => {
+    querySuggestionsArgs = ({
+      indexPatterns: [indexPatternResponse],
+    } as unknown) as autocomplete.QuerySuggestionsGetFnArgs;
+
+    getSuggestions = setupGetOperatorSuggestions(coreMock.createSetup());
+  });
+
+  test('should return a function', () => {
+    expect(typeof getSuggestions).toBe('function');
+  });
+
+  test('should not return suggestions for non-fields', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName: 'foo' })
+    );
+
+    expect(suggestions).toEqual([]);
+  });
+
+  test('should return exists for every field', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({
+        fieldName: 'custom_user_field',
+      })
+    );
+
+    expect(suggestions.length).toEqual(1);
+    expect(suggestions[0].text).toBe(': * ');
+  });
+
+  test('should return equals for string fields', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName: 'machine.os' })
+    );
+
+    expect(suggestions.find(({ text }) => text === ': ')).toBeDefined();
+    expect(suggestions.find(({ text }) => text === '< ')).not.toBeDefined();
+  });
+
+  test('should return numeric operators for numeric fields', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName: 'bytes' })
+    );
+
+    expect(suggestions.find(({ text }) => text === ': ')).toBeDefined();
+    expect(suggestions.find(({ text }) => text === '< ')).toBeDefined();
+  });
+
+  test('should have descriptions', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName: 'bytes' })
+    );
+
+    expect(suggestions.length).toBeGreaterThan(0);
+
+    suggestions.forEach(suggestion => {
+      expect(suggestion).toHaveProperty('description');
+    });
+  });
+
+  test('should handle nested paths', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({
+        fieldName: 'child',
+        nestedPath: 'nestedField',
+      })
+    );
+
+    expect(suggestions.length).toBeGreaterThan(0);
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.tsx
similarity index 82%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.tsx
index 173a24b3f5f1e..6e9010c4310fb 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.tsx
@@ -6,8 +6,11 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { $Keys } from 'utility-types';
 import { flatten } from 'lodash';
-const type = 'operator';
+
+import { KqlQuerySuggestionProvider } from './types';
+import { autocomplete } from '../../../../../../src/plugins/data/public';
 
 const equalsText = (
   <FormattedMessage
@@ -133,36 +136,42 @@ const operators = {
         'xpack.kueryAutocomplete.existOperatorDescription.existsText' for 'exists' part."
       />
     ),
+    fieldTypes: undefined,
   },
 };
 
-function getDescription(operator) {
-  const { description } = operators[operator];
-  return <p>{description}</p>;
-}
+type Operators = $Keys<typeof operators>;
+
+const getOperatorByName = (operator: string) => operators[operator as Operators];
+const getDescription = (operator: string) => <p>{getOperatorByName(operator).description}</p>;
 
-export function getSuggestionsProvider({ indexPatterns }) {
-  const allFields = flatten(
-    indexPatterns.map(indexPattern => {
-      return indexPattern.fields.slice();
-    })
-  );
-  return function getOperatorSuggestions({ end, fieldName, nestedPath }) {
+export const setupGetOperatorSuggestions: KqlQuerySuggestionProvider = () => {
+  return ({ indexPatterns }, { end, fieldName, nestedPath }) => {
+    const allFields = flatten(
+      indexPatterns.map(indexPattern => {
+        return indexPattern.fields.slice();
+      })
+    );
     const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
-    const fields = allFields.filter(field => field.name === fullFieldName);
-    return flatten(
-      fields.map(field => {
+    const fields = allFields
+      .filter(field => field.name === fullFieldName)
+      .map(field => {
         const matchingOperators = Object.keys(operators).filter(operator => {
-          const { fieldTypes } = operators[operator];
+          const { fieldTypes } = getOperatorByName(operator);
+
           return !fieldTypes || fieldTypes.includes(field.type);
         });
-        const suggestions = matchingOperators.map(operator => {
-          const text = operator + ' ';
-          const description = getDescription(operator);
-          return { type, text, description, start: end, end };
-        });
+
+        const suggestions = matchingOperators.map(operator => ({
+          type: autocomplete.QuerySuggestionsTypes.Operator,
+          text: operator + ' ',
+          description: getDescription(operator),
+          start: end,
+          end,
+        }));
         return suggestions;
-      })
-    );
+      });
+
+    return Promise.resolve(flatten(fields));
   };
-}
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/sort_prefix_first.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/sort_prefix_first.ts
index 123e440b75231..03e1a9099f1ab 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/sort_prefix_first.ts
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/sort_prefix_first.ts
@@ -14,7 +14,9 @@ export function sortPrefixFirst(array: any[], prefix?: string | number, property
 
   const partitions = partition(array, entry => {
     const value = ('' + (property ? entry[property] : entry)).toLowerCase();
+
     return value.startsWith(lowerCasePrefix);
   });
+
   return [...partitions[0], ...partitions[1]];
 }
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/types.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/types.ts
new file mode 100644
index 0000000000000..c51b75e001b9f
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/types.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 { CoreSetup } from 'kibana/public';
+import { esKuery, autocomplete } from '../../../../../../src/plugins/data/public';
+
+export type KqlQuerySuggestionProvider<T = autocomplete.BasicQuerySuggestion> = (
+  core: CoreSetup
+) => (
+  querySuggestionsGetFnArgs: autocomplete.QuerySuggestionsGetFnArgs,
+  kueryNode: esKuery.KueryNode
+) => Promise<T[]>;
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.js
deleted file mode 100644
index 9d0d70fd95747..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.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 { flatten } from 'lodash';
-import { escapeQuotes } from './escape_kuery';
-import { npStart } from 'ui/new_platform';
-
-const type = 'value';
-
-export function getSuggestionsProvider({ indexPatterns, boolFilter }) {
-  const allFields = flatten(
-    indexPatterns.map(indexPattern => {
-      return indexPattern.fields.map(field => ({
-        ...field,
-        indexPattern,
-      }));
-    })
-  );
-
-  return function getValueSuggestions(
-    { start, end, prefix, suffix, fieldName, nestedPath },
-    signal
-  ) {
-    const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
-    const fields = allFields.filter(field => field.name === fullFieldName);
-    const query = `${prefix}${suffix}`.trim();
-    const { getValueSuggestions } = npStart.plugins.data.autocomplete;
-
-    const suggestionsByField = fields.map(field =>
-      getValueSuggestions({
-        indexPattern: field.indexPattern,
-        field,
-        query,
-        boolFilter,
-        signal,
-      }).then(data => {
-        const quotedValues = data.map(value =>
-          typeof value === 'string' ? `"${escapeQuotes(value)}"` : `${value}`
-        );
-        return wrapAsSuggestions(start, end, query, quotedValues);
-      })
-    );
-
-    return Promise.all(suggestionsByField).then(suggestions => flatten(suggestions));
-  };
-}
-
-function wrapAsSuggestions(start, end, query, values) {
-  return values
-    .filter(value => value.toLowerCase().includes(query.toLowerCase()))
-    .map(value => {
-      const text = `${value} `;
-      return { type, text, start, end };
-    });
-}
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.js
deleted file mode 100644
index f5b652d2e2164..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.js
+++ /dev/null
@@ -1,146 +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 { getSuggestionsProvider } from './value';
-import indexPatternResponse from './__fixtures__/index_pattern_response.json';
-import { npStart } from 'ui/new_platform';
-
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    plugins: {
-      data: {
-        autocomplete: {
-          getValueSuggestions: jest.fn(({ field }) => {
-            let res;
-            if (field.type === 'boolean') {
-              res = [true, false];
-            } else if (field.name === 'machine.os') {
-              res = ['Windo"ws', "Mac'", 'Linux'];
-            } else if (field.name === 'nestedField.child') {
-              res = ['foo'];
-            } else {
-              res = [];
-            }
-            return Promise.resolve(res);
-          }),
-        },
-      },
-    },
-  },
-}));
-
-describe('Kuery value suggestions', function() {
-  let indexPatterns;
-  let getSuggestions;
-
-  beforeEach(() => {
-    indexPatterns = [indexPatternResponse];
-    getSuggestions = getSuggestionsProvider({ indexPatterns });
-    jest.clearAllMocks();
-  });
-
-  test('should return a function', function() {
-    expect(typeof getSuggestions).toBe('function');
-  });
-
-  test('should not search for non existing field', async () => {
-    const fieldName = 'i_dont_exist';
-    const prefix = '';
-    const suffix = '';
-
-    const suggestions = await getSuggestions({ fieldName, prefix, suffix });
-    expect(suggestions.map(({ text }) => text)).toEqual([]);
-
-    expect(npStart.plugins.data.autocomplete.getValueSuggestions).toHaveBeenCalledTimes(0);
-  });
-
-  test('should format suggestions', async () => {
-    const start = 1;
-    const end = 5;
-    const suggestions = await getSuggestions({
-      fieldName: 'ssl',
-      prefix: '',
-      suffix: '',
-      start,
-      end,
-    });
-
-    expect(suggestions[0].type).toEqual('value');
-    expect(suggestions[0].start).toEqual(start);
-    expect(suggestions[0].end).toEqual(end);
-  });
-
-  test('should handle nested paths', async () => {
-    const suggestions = await getSuggestions({
-      fieldName: 'child',
-      nestedPath: 'nestedField',
-      prefix: '',
-      suffix: '',
-    });
-    expect(suggestions.length).toEqual(1);
-    expect(suggestions[0].text).toEqual('"foo" ');
-  });
-
-  describe('Boolean suggestions', function() {
-    test('should stringify boolean fields', async () => {
-      const suggestions = await getSuggestions({ fieldName: 'ssl', prefix: '', suffix: '' });
-
-      expect(suggestions.map(({ text }) => text)).toEqual(['true ', 'false ']);
-      expect(npStart.plugins.data.autocomplete.getValueSuggestions).toHaveBeenCalledTimes(1);
-    });
-
-    test('should filter out boolean suggestions', async () => {
-      const suggestions = await getSuggestions({ fieldName: 'ssl', prefix: 'fa', suffix: '' });
-
-      expect(suggestions.length).toEqual(1);
-    });
-  });
-
-  describe('String suggestions', function() {
-    test('should merge prefix and suffix', async () => {
-      const prefix = 'he';
-      const suffix = 'llo';
-
-      await getSuggestions({ fieldName: 'machine.os.raw', prefix, suffix });
-
-      expect(npStart.plugins.data.autocomplete.getValueSuggestions).toHaveBeenCalledTimes(1);
-      expect(npStart.plugins.data.autocomplete.getValueSuggestions).toBeCalledWith(
-        expect.objectContaining({
-          field: expect.any(Object),
-          query: prefix + suffix,
-        })
-      );
-    });
-
-    test('should escape quotes in suggestions', async () => {
-      const suggestions = await getSuggestions({ fieldName: 'machine.os', prefix: '', suffix: '' });
-
-      expect(suggestions[0].text).toEqual('"Windo\\"ws" ');
-      expect(suggestions[1].text).toEqual('"Mac\'" ');
-      expect(suggestions[2].text).toEqual('"Linux" ');
-    });
-
-    test('should filter out string suggestions', async () => {
-      const suggestions = await getSuggestions({
-        fieldName: 'machine.os',
-        prefix: 'banana',
-        suffix: '',
-      });
-
-      expect(suggestions.length).toEqual(0);
-    });
-
-    test('should partially filter out string suggestions - case insensitive', async () => {
-      const suggestions = await getSuggestions({
-        fieldName: 'machine.os',
-        prefix: 'ma',
-        suffix: '',
-      });
-
-      expect(suggestions.length).toEqual(1);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.ts
new file mode 100644
index 0000000000000..5ffe30c877868
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.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 { setupGetValueSuggestions } from './value';
+import indexPatternResponse from './__fixtures__/index_pattern_response.json';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+import { autocomplete, esKuery } from '../../../../../../src/plugins/data/public';
+import { setAutocompleteService } from '../services';
+
+const mockKueryNode = (kueryNode: Partial<esKuery.KueryNode>) =>
+  (kueryNode as unknown) as esKuery.KueryNode;
+
+describe('Kuery value suggestions', () => {
+  let getSuggestions: ReturnType<typeof setupGetValueSuggestions>;
+  let querySuggestionsArgs: autocomplete.QuerySuggestionsGetFnArgs;
+  let autocompleteServiceMock: any;
+
+  beforeEach(() => {
+    getSuggestions = setupGetValueSuggestions(coreMock.createSetup());
+    querySuggestionsArgs = ({
+      indexPatterns: [indexPatternResponse],
+    } as unknown) as autocomplete.QuerySuggestionsGetFnArgs;
+
+    autocompleteServiceMock = {
+      getValueSuggestions: jest.fn(({ field }) => {
+        let res: any[];
+
+        if (field.type === 'boolean') {
+          res = [true, false];
+        } else if (field.name === 'machine.os') {
+          res = ['Windo"ws', "Mac'", 'Linux'];
+        } else if (field.name === 'nestedField.child') {
+          res = ['foo'];
+        } else {
+          res = [];
+        }
+        return Promise.resolve(res);
+      }),
+    };
+    setAutocompleteService(autocompleteServiceMock);
+
+    jest.clearAllMocks();
+  });
+
+  test('should return a function', () => {
+    expect(typeof getSuggestions).toBe('function');
+  });
+
+  test('should not search for non existing field', async () => {
+    const fieldName = 'i_dont_exist';
+    const prefix = '';
+    const suffix = '';
+
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName, prefix, suffix })
+    );
+
+    expect(suggestions.map(({ text }) => text)).toEqual([]);
+    expect(autocompleteServiceMock.getValueSuggestions).toHaveBeenCalledTimes(0);
+  });
+
+  test('should format suggestions', async () => {
+    const start = 1;
+    const end = 5;
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({
+        fieldName: 'ssl',
+        prefix: '',
+        suffix: '',
+        start,
+        end,
+      })
+    );
+
+    expect(suggestions[0].type).toEqual('value');
+    expect(suggestions[0].start).toEqual(start);
+    expect(suggestions[0].end).toEqual(end);
+  });
+
+  test('should handle nested paths', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({
+        fieldName: 'child',
+        nestedPath: 'nestedField',
+        prefix: '',
+        suffix: '',
+      })
+    );
+
+    expect(suggestions.length).toEqual(1);
+    expect(suggestions[0].text).toEqual('"foo" ');
+  });
+
+  describe('Boolean suggestions', () => {
+    test('should stringify boolean fields', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'ssl',
+          prefix: '',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions.map(({ text }) => text)).toEqual(['true ', 'false ']);
+      expect(autocompleteServiceMock.getValueSuggestions).toHaveBeenCalledTimes(1);
+    });
+
+    test('should filter out boolean suggestions', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'ssl',
+          prefix: 'fa',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions.length).toEqual(1);
+    });
+  });
+
+  describe('String suggestions', () => {
+    test('should merge prefix and suffix', async () => {
+      const prefix = 'he';
+      const suffix = 'llo';
+
+      await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'machine.os.raw',
+          prefix,
+          suffix,
+        })
+      );
+
+      expect(autocompleteServiceMock.getValueSuggestions).toHaveBeenCalledTimes(1);
+      expect(autocompleteServiceMock.getValueSuggestions).toBeCalledWith(
+        expect.objectContaining({
+          field: expect.any(Object),
+          query: prefix + suffix,
+        })
+      );
+    });
+
+    test('should escape quotes in suggestions', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'machine.os',
+          prefix: '',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions[0].text).toEqual('"Windo\\"ws" ');
+      expect(suggestions[1].text).toEqual('"Mac\'" ');
+      expect(suggestions[2].text).toEqual('"Linux" ');
+    });
+
+    test('should filter out string suggestions', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'machine.os',
+          prefix: 'banana',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions.length).toEqual(0);
+    });
+
+    test('should partially filter out string suggestions - case insensitive', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'machine.os',
+          prefix: 'ma',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions.length).toEqual(1);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.ts
new file mode 100644
index 0000000000000..242b9ccba3508
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.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 { flatten } from 'lodash';
+import { escapeQuotes } from './lib/escape_kuery';
+import { KqlQuerySuggestionProvider } from './types';
+import { getAutocompleteService } from '../services';
+import { autocomplete } from '../../../../../../src/plugins/data/public';
+
+const wrapAsSuggestions = (start: number, end: number, query: string, values: string[]) =>
+  values
+    .filter(value => value.toLowerCase().includes(query.toLowerCase()))
+    .map(value => ({
+      type: autocomplete.QuerySuggestionsTypes.Value,
+      text: `${value} `,
+      start,
+      end,
+    }));
+
+export const setupGetValueSuggestions: KqlQuerySuggestionProvider = core => {
+  return async (
+    { indexPatterns, boolFilter, signal },
+    { start, end, prefix, suffix, fieldName, nestedPath }
+  ): Promise<autocomplete.QuerySuggestion[]> => {
+    const allFields = flatten(
+      indexPatterns.map(indexPattern =>
+        indexPattern.fields.map(field => ({
+          ...field,
+          indexPattern,
+        }))
+      )
+    );
+
+    const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
+    const fields = allFields.filter(field => field.name === fullFieldName);
+    const query = `${prefix}${suffix}`.trim();
+    const { getValueSuggestions } = getAutocompleteService();
+
+    const data = await Promise.all(
+      fields.map(field =>
+        getValueSuggestions({
+          indexPattern: field.indexPattern,
+          field,
+          query,
+          boolFilter,
+          signal,
+        }).then(valueSuggestions => {
+          const quotedValues = valueSuggestions.map(value =>
+            typeof value === 'string' ? `"${escapeQuotes(value)}"` : `${value}`
+          );
+
+          return wrapAsSuggestions(start, end, query, quotedValues);
+        })
+      )
+    );
+
+    return flatten(data);
+  };
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/legacy.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/legacy.ts
index 52abe21c055ee..303fe8c557fbd 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/legacy.ts
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/legacy.ts
@@ -8,13 +8,20 @@ import { PluginInitializerContext } from 'src/core/public';
 import { npSetup, npStart } from 'ui/new_platform';
 
 import { plugin } from './index';
-import { KueryAutocompletePluginSetupDependencies } from './plugin';
+import {
+  KueryAutocompletePluginSetupDependencies,
+  KueryAutocompletePluginStartDependencies,
+} from './plugin';
 
-const plugins: Readonly<KueryAutocompletePluginSetupDependencies> = {
+const pluginsSetup: Readonly<KueryAutocompletePluginSetupDependencies> = {
   data: npSetup.plugins.data,
 };
 
+const pluginsStart: Readonly<KueryAutocompletePluginStartDependencies> = {
+  data: npStart.plugins.data,
+};
+
 const pluginInstance = plugin({} as PluginInitializerContext);
 
-export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core);
+export const setup = pluginInstance.setup(npSetup.core, pluginsSetup);
+export const start = pluginInstance.start(npStart.core, pluginsStart);
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/plugin.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/plugin.ts
index 216e0f49ccd34..81737c4636532 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/plugin.ts
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/plugin.ts
@@ -6,8 +6,7 @@
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { Plugin as DataPublicPlugin } from '../../../../../src/plugins/data/public';
-
-// @ts-ignore
+import { setAutocompleteService } from './services';
 import { setupKqlQuerySuggestionProvider } from './kql_query_suggestion';
 
 /** @internal */
@@ -15,6 +14,11 @@ export interface KueryAutocompletePluginSetupDependencies {
   data: ReturnType<DataPublicPlugin['setup']>;
 }
 
+/** @internal */
+export interface KueryAutocompletePluginStartDependencies {
+  data: ReturnType<DataPublicPlugin['start']>;
+}
+
 const KUERY_LANGUAGE_NAME = 'kuery';
 
 /** @internal */
@@ -26,12 +30,12 @@ export class KueryAutocompletePlugin implements Plugin<Promise<void>, void> {
   }
 
   public async setup(core: CoreSetup, plugins: KueryAutocompletePluginSetupDependencies) {
-    const kueryProvider = setupKqlQuerySuggestionProvider(core, plugins);
+    const kueryProvider = setupKqlQuerySuggestionProvider(core);
 
     plugins.data.autocomplete.addQuerySuggestionProvider(KUERY_LANGUAGE_NAME, kueryProvider);
   }
 
-  public start(core: CoreStart) {
-    // nothing to do here yet
+  public start(core: CoreStart, plugins: KueryAutocompletePluginStartDependencies) {
+    setAutocompleteService(plugins.data.autocomplete);
   }
 }
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/services.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/services.ts
new file mode 100644
index 0000000000000..1ec48e597f636
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/services.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createGetterSetter } from '../../../../../src/plugins/kibana_utils/public';
+import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+
+export const [getAutocompleteService, setAutocompleteService] = createGetterSetter<
+  DataPublicPluginStart['autocomplete']
+>('Autocomplete');
diff --git a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx
index 4d92e8cb1335d..85e2b3b3fe384 100644
--- a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx
@@ -16,7 +16,7 @@ const suggestion: autocomplete.QuerySuggestion = {
   end: 3,
   start: 1,
   text: 'Text...',
-  type: 'value',
+  type: autocomplete.QuerySuggestionsTypes.Value,
 };
 
 storiesOf('components/SuggestionItem', module).add('example', () => (
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 ef16f79a4b83c..552aaa5889719 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
@@ -18,7 +18,7 @@ import { AutocompleteField } from '.';
 
 const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.ephemeral_id ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.ephemeral_id</span></p>',
@@ -26,7 +26,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.hostname ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.hostname</span></p>',
@@ -34,7 +34,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.id ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.id</span></p>',
@@ -42,7 +42,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.name ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.name</span></p>',
@@ -50,7 +50,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.type ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.type</span></p>',
@@ -58,7 +58,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.version ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.version</span></p>',
@@ -66,7 +66,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.test1 ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.test1</span></p>',
@@ -74,7 +74,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.test2 ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.test2</span></p>',
@@ -82,7 +82,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.test3 ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.test3</span></p>',
@@ -90,7 +90,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.test4 ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.test4</span></p>',

From 6942f3e48e5d92f3c8c1a48b6200b30a484b427b Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Fri, 31 Jan 2020 10:53:09 +0100
Subject: [PATCH 06/26] Fix setting filters without $store value (#56304)

Follow up on: #56213

AddFilters method had logic which ensured that $store exists in filter object, but setFilters was missing that.
---
 .../filter_manager/filter_manager.test.ts     | 51 +++++++++++++++++--
 .../query/filter_manager/filter_manager.ts    | 22 +++++---
 2 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
index 1ade48b3537c8..8c790ac2ddc46 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -29,9 +29,16 @@ import { esFilters } from '../../../common';
 import { coreMock } from '../../../../../core/public/mocks';
 const setupMock = coreMock.createSetup();
 
-setupMock.uiSettings.get.mockImplementation((key: string) => {
-  return true;
-});
+const uiSettingsMock = (pinnedByDefault: boolean) => (key: string) => {
+  switch (key) {
+    case 'filters:pinnedByDefault':
+      return pinnedByDefault;
+    default:
+      throw new Error(`Unexpected uiSettings key in FilterManager mock: ${key}`);
+  }
+};
+
+setupMock.uiSettings.get.mockImplementation(uiSettingsMock(true));
 
 describe('filter_manager', () => {
   let updateSubscription: Subscription | undefined;
@@ -224,6 +231,44 @@ describe('filter_manager', () => {
       expect(newGlobalFilters).toHaveLength(2);
       expect(newAppFilters).toHaveLength(1);
     });
+
+    test('set filter with no state, and force pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+
+      filterManager.setFilters([f1], true);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+    });
+
+    test('set filter with no state, and no pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+
+      filterManager.setFilters([f1], false);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+    });
+
+    test('set filters with default pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+      setupMock.uiSettings.get.mockImplementationOnce(uiSettingsMock(true));
+
+      filterManager.setFilters([f1]);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+    });
+
+    test('set filters without default pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+
+      setupMock.uiSettings.get.mockImplementationOnce(uiSettingsMock(false));
+      filterManager.setFilters([f1]);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+    });
   });
 
   describe('add filters', () => {
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
index 6c5cdbaffce5e..aa77f10d89f63 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -124,7 +124,10 @@ export class FilterManager {
 
   /* Setters */
 
-  public addFilters(filters: esFilters.Filter[] | esFilters.Filter, pinFilterStatus?: boolean) {
+  public addFilters(
+    filters: esFilters.Filter[] | esFilters.Filter,
+    pinFilterStatus: boolean = this.uiSettings.get('filters:pinnedByDefault')
+  ) {
     if (!Array.isArray(filters)) {
       filters = [filters];
     }
@@ -133,12 +136,6 @@ export class FilterManager {
       return;
     }
 
-    if (pinFilterStatus === undefined) {
-      pinFilterStatus = this.uiSettings.get('filters:pinnedByDefault');
-    }
-
-    // Set the store of all filters. For now.
-    // In the future, all filters should come in with filter state store already set.
     const store = pinFilterStatus
       ? esFilters.FilterStateStore.GLOBAL_STATE
       : esFilters.FilterStateStore.APP_STATE;
@@ -157,7 +154,16 @@ export class FilterManager {
     this.handleStateUpdate(newFilters);
   }
 
-  public setFilters(newFilters: esFilters.Filter[]) {
+  public setFilters(
+    newFilters: esFilters.Filter[],
+    pinFilterStatus: boolean = this.uiSettings.get('filters:pinnedByDefault')
+  ) {
+    const store = pinFilterStatus
+      ? esFilters.FilterStateStore.GLOBAL_STATE
+      : esFilters.FilterStateStore.APP_STATE;
+
+    FilterManager.setFiltersStore(newFilters, store);
+
     const mappedFilters = mapAndFlattenFilters(newFilters);
     const newPartitionedFilters = FilterManager.partitionFilters(mappedFilters);
     const mergedFilters = this.mergeIncomingFilters(newPartitionedFilters);

From 31fae2528710da354f5806ebacaeb73e4fdcf173 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Fri, 31 Jan 2020 14:09:11 +0100
Subject: [PATCH 07/26] [Uptime] Improve layout in details status panel
 (#56193)

* improve layout

* hide map on small screen

* fix layout and conflicts

* update snaps

* update

* increase marging

* formatting issue

* wrap item to 100%

* layout refactor

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../monitor_status.bar.test.tsx.snap          |   2 +-
 .../__snapshots__/location_map.test.tsx.snap  | 204 ++++++++++--------
 .../location_missing.test.tsx.snap            |  27 +--
 .../location_status_tags.test.tsx.snap        |  34 ++-
 .../functional/location_map/location_map.tsx  |  46 +++-
 .../location_map/location_missing.tsx         |  21 +-
 .../location_map/location_status_tags.tsx     |   7 +-
 .../monitor_status_bar/monitor_status_bar.tsx |   2 +-
 .../monitor_status_details.tsx                |  13 +-
 .../uptime/public/pages/page_header.tsx       |   2 +-
 10 files changed, 237 insertions(+), 121 deletions(-)

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 17588ae53ed00..ff63b3695fb8d 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,7 +2,7 @@
 
 exports[`MonitorStatusBar component renders duration in ms, not us 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--directionColumn euiFlexGroup--responsive"
+  class="euiFlexGroup euiFlexGroup--directionColumn"
 >
   <div
     class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_map.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_map.test.tsx.snap
index 2ed3512c9c21a..ed50bc0be382a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_map.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_map.test.tsx.snap
@@ -2,10 +2,11 @@
 
 exports[`LocationMap component doesnt shows warning if geo is provided 1`] = `
 <EuiErrorBoundary>
-  <EuiFlexGroup>
-    <EuiFlexItem
-      grow={false}
-    >
+  <Styled(EuiFlexGroup)
+    gutterSize="none"
+    wrap={true}
+  >
+    <Styled(EuiFlexItem)>
       <LocationStatusTags
         locations={
           Array [
@@ -40,38 +41,47 @@ exports[`LocationMap component doesnt shows warning if geo is provided 1`] = `
           ]
         }
       />
-    </EuiFlexItem>
+    </Styled(EuiFlexItem)>
     <EuiFlexItem
-      grow={true}
+      grow={false}
     >
-      <styled.div>
-        <EmbeddedMap
-          downPoints={Array []}
-          upPoints={
-            Array [
-              Object {
-                "lat": "40.730610",
-                "lon": " -73.935242",
-              },
-              Object {
-                "lat": "52.487448",
-                "lon": " 13.394798",
-              },
-            ]
-          }
-        />
-      </styled.div>
+      <EuiHideFor
+        sizes={
+          Array [
+            "xs",
+          ]
+        }
+      >
+        <styled.div>
+          <EmbeddedMap
+            downPoints={Array []}
+            upPoints={
+              Array [
+                Object {
+                  "lat": "40.730610",
+                  "lon": " -73.935242",
+                },
+                Object {
+                  "lat": "52.487448",
+                  "lon": " 13.394798",
+                },
+              ]
+            }
+          />
+        </styled.div>
+      </EuiHideFor>
     </EuiFlexItem>
-  </EuiFlexGroup>
+  </Styled(EuiFlexGroup)>
 </EuiErrorBoundary>
 `;
 
 exports[`LocationMap component renders correctly against snapshot 1`] = `
 <EuiErrorBoundary>
-  <EuiFlexGroup>
-    <EuiFlexItem
-      grow={false}
-    >
+  <Styled(EuiFlexGroup)
+    gutterSize="none"
+    wrap={true}
+  >
+    <Styled(EuiFlexItem)>
       <LocationStatusTags
         locations={
           Array [
@@ -116,39 +126,48 @@ exports[`LocationMap component renders correctly against snapshot 1`] = `
           ]
         }
       />
-    </EuiFlexItem>
+    </Styled(EuiFlexItem)>
     <EuiFlexItem
-      grow={true}
+      grow={false}
     >
-      <LocationMissingWarning />
-      <styled.div>
-        <EmbeddedMap
-          downPoints={Array []}
-          upPoints={
-            Array [
-              Object {
-                "lat": "40.730610",
-                "lon": " -73.935242",
-              },
-              Object {
-                "lat": "52.487448",
-                "lon": " 13.394798",
-              },
-            ]
-          }
-        />
-      </styled.div>
+      <EuiHideFor
+        sizes={
+          Array [
+            "xs",
+          ]
+        }
+      >
+        <LocationMissingWarning />
+        <styled.div>
+          <EmbeddedMap
+            downPoints={Array []}
+            upPoints={
+              Array [
+                Object {
+                  "lat": "40.730610",
+                  "lon": " -73.935242",
+                },
+                Object {
+                  "lat": "52.487448",
+                  "lon": " 13.394798",
+                },
+              ]
+            }
+          />
+        </styled.div>
+      </EuiHideFor>
     </EuiFlexItem>
-  </EuiFlexGroup>
+  </Styled(EuiFlexGroup)>
 </EuiErrorBoundary>
 `;
 
 exports[`LocationMap component renders named locations that have missing geo data 1`] = `
 <EuiErrorBoundary>
-  <EuiFlexGroup>
-    <EuiFlexItem
-      grow={false}
-    >
+  <Styled(EuiFlexGroup)
+    gutterSize="none"
+    wrap={true}
+  >
+    <Styled(EuiFlexItem)>
       <LocationStatusTags
         locations={
           Array [
@@ -166,28 +185,37 @@ exports[`LocationMap component renders named locations that have missing geo dat
           ]
         }
       />
-    </EuiFlexItem>
+    </Styled(EuiFlexItem)>
     <EuiFlexItem
-      grow={true}
+      grow={false}
     >
-      <LocationMissingWarning />
-      <styled.div>
-        <EmbeddedMap
-          downPoints={Array []}
-          upPoints={Array []}
-        />
-      </styled.div>
+      <EuiHideFor
+        sizes={
+          Array [
+            "xs",
+          ]
+        }
+      >
+        <LocationMissingWarning />
+        <styled.div>
+          <EmbeddedMap
+            downPoints={Array []}
+            upPoints={Array []}
+          />
+        </styled.div>
+      </EuiHideFor>
     </EuiFlexItem>
-  </EuiFlexGroup>
+  </Styled(EuiFlexGroup)>
 </EuiErrorBoundary>
 `;
 
 exports[`LocationMap component shows warning if geo information is missing 1`] = `
 <EuiErrorBoundary>
-  <EuiFlexGroup>
-    <EuiFlexItem
-      grow={false}
-    >
+  <Styled(EuiFlexGroup)
+    gutterSize="none"
+    wrap={true}
+  >
+    <Styled(EuiFlexItem)>
       <LocationStatusTags
         locations={
           Array [
@@ -218,25 +246,33 @@ exports[`LocationMap component shows warning if geo information is missing 1`] =
           ]
         }
       />
-    </EuiFlexItem>
+    </Styled(EuiFlexItem)>
     <EuiFlexItem
-      grow={true}
+      grow={false}
     >
-      <LocationMissingWarning />
-      <styled.div>
-        <EmbeddedMap
-          downPoints={Array []}
-          upPoints={
-            Array [
-              Object {
-                "lat": "52.487448",
-                "lon": " 13.394798",
-              },
-            ]
-          }
-        />
-      </styled.div>
+      <EuiHideFor
+        sizes={
+          Array [
+            "xs",
+          ]
+        }
+      >
+        <LocationMissingWarning />
+        <styled.div>
+          <EmbeddedMap
+            downPoints={Array []}
+            upPoints={
+              Array [
+                Object {
+                  "lat": "52.487448",
+                  "lon": " 13.394798",
+                },
+              ]
+            }
+          />
+        </styled.div>
+      </EuiHideFor>
     </EuiFlexItem>
-  </EuiFlexGroup>
+  </Styled(EuiFlexGroup)>
 </EuiErrorBoundary>
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
index 7862fe03163dc..46cb8c94ed6e3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
@@ -1,13 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`LocationMissingWarning component renders correctly against snapshot 1`] = `
+.c0 {
+  margin-left: auto;
+  margin-bottom: 3px;
+}
+
 <div
-  class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup euiFlexGroup--directionRow"
   data-test-subj="xpack.uptime.locationMap.locationMissing"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
-    style="margin-left:auto;margin-right:20px"
+    class="euiFlexItem euiFlexItem--flexGrowZero c0"
   >
     <div
       class="euiPopover euiPopover--anchorDownCenter"
@@ -50,15 +54,10 @@ exports[`LocationMissingWarning component shallow render correctly against snaps
 <EuiFlexGroup
   data-test-subj="xpack.uptime.locationMap.locationMissing"
   gutterSize="none"
+  responsive={false}
 >
-  <EuiFlexItem
+  <Styled(EuiFlexItem)
     grow={false}
-    style={
-      Object {
-        "marginLeft": "auto",
-        "marginRight": 20,
-      }
-    }
   >
     <EuiPopover
       anchorPosition="downCenter"
@@ -69,7 +68,11 @@ exports[`LocationMissingWarning component shallow render correctly against snaps
           onClick={[Function]}
           size="s"
         >
-          Geo Information Missing
+          <FormattedMessage
+            defaultMessage="Geo Information Missing"
+            id="xpack.uptime.locationMap.locations.missing.title"
+            values={Object {}}
+          />
         </EuiButton>
       }
       closePopover={[Function]}
@@ -120,6 +123,6 @@ exports[`LocationMissingWarning component shallow render correctly against snaps
         <LocationLink />
       </EuiText>
     </EuiPopover>
-  </EuiFlexItem>
+  </Styled(EuiFlexItem)>
 </EuiFlexGroup>
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap
index 437150083f76f..e4fe0a2725db3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap
@@ -89,12 +89,20 @@ exports[`LocationStatusTags component renders when all locations are down 1`] =
 
 .c1 {
   margin-bottom: 5px;
+  white-space: nowrap;
 }
 
 .c0 {
-  padding: 10px;
   max-height: 229px;
   overflow: hidden;
+  margin-top: auto;
+}
+
+@media (max-width:830px) {
+  .c1 {
+    display: inline-block;
+    margin-right: 16px;
+  }
 }
 
 <div
@@ -196,12 +204,20 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
 
 .c1 {
   margin-bottom: 5px;
+  white-space: nowrap;
 }
 
 .c0 {
-  padding: 10px;
   max-height: 229px;
   overflow: hidden;
+  margin-top: auto;
+}
+
+@media (max-width:830px) {
+  .c1 {
+    display: inline-block;
+    margin-right: 16px;
+  }
 }
 
 <div
@@ -304,12 +320,20 @@ Array [
 
 .c1 {
   margin-bottom: 5px;
+  white-space: nowrap;
 }
 
 .c0 {
-  padding: 10px;
   max-height: 229px;
   overflow: hidden;
+  margin-top: auto;
+}
+
+@media (max-width:830px) {
+  .c1 {
+    display: inline-block;
+    margin-right: 16px;
+  }
 }
 
 <div
@@ -635,6 +659,10 @@ Array [
   padding-left: 18px;
 }
 
+@media (max-width:830px) {
+
+}
+
 <div
     class="c0"
   >
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 c93e16d0a080b..8b9e410b0de79 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { EuiFlexGroup, EuiFlexItem, EuiErrorBoundary } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiErrorBoundary, EuiHideFor } from '@elastic/eui';
 import { LocationStatusTags } from './location_status_tags';
 import { EmbeddedMap, LocationPoint } from './embeddables/embedded_map';
 import { MonitorLocations, MonitorLocation } from '../../../../common/runtime_types';
@@ -18,7 +18,28 @@ import { LocationMissingWarning } from './location_missing';
 const MapPanel = styled.div`
   height: 240px;
   width: 520px;
-  margin-right: 20px;
+  @media (min-width: 1300px) {
+    margin-right: 20px;
+  }
+  @media (max-width: 574px) {
+    height: 250px;
+    width: 100%;
+    margin-right: 0;
+  }
+`;
+
+const EuiFlexItemTags = styled(EuiFlexItem)`
+  padding-top: 5px;
+  @media (max-width: 850px) {
+    order: 1;
+    text-align: center;
+  }
+`;
+
+const FlexGroup = styled(EuiFlexGroup)`
+  @media (max-width: 850px) {
+    justify-content: center;
+  }
 `;
 
 interface LocationMapProps {
@@ -52,19 +73,22 @@ export const LocationMap = ({ monitorLocations }: LocationMapProps) => {
       }
     });
   }
+
   return (
     <EuiErrorBoundary>
-      <EuiFlexGroup>
-        <EuiFlexItem grow={false}>
+      <FlexGroup wrap={true} gutterSize="none">
+        <EuiFlexItemTags>
           <LocationStatusTags locations={monitorLocations?.locations || []} />
+        </EuiFlexItemTags>
+        <EuiFlexItem grow={false}>
+          <EuiHideFor sizes={['xs']}>
+            {isGeoInfoMissing && <LocationMissingWarning />}
+            <MapPanel>
+              <EmbeddedMap upPoints={upPoints} downPoints={downPoints} />
+            </MapPanel>
+          </EuiHideFor>
         </EuiFlexItem>
-        <EuiFlexItem grow={true}>
-          {isGeoInfoMissing && <LocationMissingWarning />}
-          <MapPanel>
-            <EmbeddedMap upPoints={upPoints} downPoints={downPoints} />
-          </MapPanel>
-        </EuiFlexItem>
-      </EuiFlexGroup>
+      </FlexGroup>
     </EuiErrorBoundary>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_missing.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_missing.tsx
index f8efe42d0ce71..a20889f6cc653 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_missing.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_missing.tsx
@@ -14,9 +14,15 @@ import {
   EuiText,
   EuiCode,
 } from '@elastic/eui';
+import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { LocationLink } from '../monitor_list/monitor_list_drawer';
 
+const EuiPopoverRight = styled(EuiFlexItem)`
+  margin-left: auto;
+  margin-bottom: 3px;
+`;
+
 export const LocationMissingWarning = () => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 
@@ -26,13 +32,20 @@ export const LocationMissingWarning = () => {
 
   const button = (
     <EuiButton iconType="alert" size="s" color="warning" onClick={togglePopover}>
-      Geo Information Missing
+      <FormattedMessage
+        id="xpack.uptime.locationMap.locations.missing.title"
+        defaultMessage="Geo Information Missing"
+      />
     </EuiButton>
   );
 
   return (
-    <EuiFlexGroup data-test-subj="xpack.uptime.locationMap.locationMissing" gutterSize="none">
-      <EuiFlexItem grow={false} style={{ marginLeft: 'auto', marginRight: 20 }}>
+    <EuiFlexGroup
+      data-test-subj="xpack.uptime.locationMap.locationMissing"
+      gutterSize="none"
+      responsive={false}
+    >
+      <EuiPopoverRight grow={false}>
         <EuiPopover
           id="popover"
           button={button}
@@ -58,7 +71,7 @@ export const LocationMissingWarning = () => {
             <LocationLink />
           </EuiText>
         </EuiPopover>
-      </EuiFlexItem>
+      </EuiPopoverRight>
     </EuiFlexGroup>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
index e2855f78262e7..6955bf198eae0 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
@@ -23,13 +23,18 @@ const TextStyle = styled.div`
 
 const BadgeItem = styled.div`
   margin-bottom: 5px;
+  white-space: nowrap;
+  @media (max-width: 830px) {
+    display: inline-block;
+    margin-right: 16px;
+  }
 `;
 
 // Set height so that it remains within panel, enough height to display 7 locations tags
 const TagContainer = styled.div`
-  padding: 10px;
   max-height: 229px;
   overflow: hidden;
+  margin-top: auto;
 `;
 
 const OtherLocationsDiv = styled.div`
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
index 57ca909ffde55..2524039829add 100644
--- 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
@@ -52,7 +52,7 @@ export const MonitorStatusBarComponent: React.FC<Props> = ({
   const full = monitorStatus?.url?.full ?? '';
 
   return (
-    <EuiFlexGroup direction="column" gutterSize="none">
+    <EuiFlexGroup direction="column" gutterSize="none" responsive={false}>
       <EuiFlexItem grow={false}>
         <StatusByLocations locations={monitorLocations?.locations ?? []} />
       </EuiFlexItem>
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 63abb6fc4823c..29bd8eb3a7183 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
@@ -6,6 +6,7 @@
 
 import React, { useContext, useEffect, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
+import styled from 'styled-components';
 import { LocationMap } from '../location_map';
 import { MonitorStatusBar } from './monitor_status_bar';
 import { UptimeRefreshContext } from '../../../contexts';
@@ -19,6 +20,12 @@ interface MonitorStatusBarProps {
   dateEnd: any;
 }
 
+const WrapFlexItem = styled(EuiFlexItem)`
+  @media (max-width: 1150px) {
+    width: 100%;
+  }
+`;
+
 export const MonitorStatusDetailsComponent = ({
   monitorId,
   variables,
@@ -54,7 +61,7 @@ export const MonitorStatusDetailsComponent = ({
 
   return (
     <EuiPanel>
-      <EuiFlexGroup gutterSize="l" wrap>
+      <EuiFlexGroup gutterSize="l" wrap responsive={true}>
         <EuiFlexItem grow={true}>
           <MonitorStatusBar
             monitorId={monitorId}
@@ -63,9 +70,9 @@ export const MonitorStatusDetailsComponent = ({
             dateEnd={dateEnd}
           />
         </EuiFlexItem>
-        <EuiFlexItem grow={false}>
+        <WrapFlexItem grow={false}>
           <LocationMap monitorLocations={monitorLocations} />
-        </EuiFlexItem>
+        </WrapFlexItem>
       </EuiFlexGroup>
     </EuiPanel>
   );
diff --git a/x-pack/legacy/plugins/uptime/public/pages/page_header.tsx b/x-pack/legacy/plugins/uptime/public/pages/page_header.tsx
index e8705a2eb8eb3..7c3f80d4beb98 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/page_header.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/page_header.tsx
@@ -67,7 +67,7 @@ export const PageHeaderComponent = ({ monitorStatus, setBreadcrumbs }: PageHeade
 
   return (
     <>
-      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="s">
+      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="s" wrap={true}>
         <EuiFlexItem>
           <EuiTitle>
             <h1>{headerText}</h1>

From 39bd173e4146b9221c7a84665cca77cc6c3bceba Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Fri, 31 Jan 2020 10:45:27 -0500
Subject: [PATCH 08/26] Upgrade node-sass to 4.13.1 (#56484)

---
 package.json                             |  2 +-
 packages/kbn-plugin-helpers/package.json |  2 +-
 packages/kbn-ui-framework/package.json   |  2 +-
 yarn.lock                                | 28 +++++++++++-------------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 425527a058e86..e249546e71581 100644
--- a/package.json
+++ b/package.json
@@ -454,7 +454,7 @@
     "murmurhash3js": "3.0.1",
     "mutation-observer": "^1.0.3",
     "nock": "10.0.6",
-    "node-sass": "^4.9.4",
+    "node-sass": "^4.13.1",
     "normalize-path": "^3.0.0",
     "nyc": "^14.1.1",
     "pixelmatch": "^5.1.0",
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index 68af0aa791c8e..3b358c03b8053 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -24,7 +24,7 @@
     "gulp-zip": "5.0.1",
     "inquirer": "^1.2.2",
     "minimatch": "^3.0.4",
-    "node-sass": "^4.9.4",
+    "node-sass": "^4.13.1",
     "through2": "^2.0.3",
     "through2-map": "^3.0.0",
     "vinyl-fs": "^3.0.3"
diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
index b4d9d3dfee03f..4bb4c660a01ab 100644
--- a/packages/kbn-ui-framework/package.json
+++ b/packages/kbn-ui-framework/package.json
@@ -53,7 +53,7 @@
     "jquery": "^3.4.1",
     "keymirror": "0.1.1",
     "moment": "^2.24.0",
-    "node-sass": "^4.9.4",
+    "node-sass": "^4.13.1",
     "postcss": "^7.0.5",
     "postcss-loader": "^3.0.0",
     "raw-loader": "^3.1.0",
diff --git a/yarn.lock b/yarn.lock
index 3563ee3fc2733..a3acc2ae216c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19371,7 +19371,7 @@ lodash.clone@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
   integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
 
-lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -19516,11 +19516,6 @@ lodash.merge@^4.4.0, lodash.merge@^4.6.1:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.mergewith@^4.6.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
 lodash.omit@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
@@ -20947,7 +20942,12 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.10.0, nan@^2.9.2:
+nan@^2.13.2:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
+nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
   integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
@@ -21350,10 +21350,10 @@ node-releases@^1.1.25:
   dependencies:
     semver "^5.3.0"
 
-node-sass@^4.9.4:
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
-  integrity sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==
+node-sass@^4.13.1:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
+  integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -21362,12 +21362,10 @@ node-sass@^4.9.4:
     get-stdin "^4.0.1"
     glob "^7.0.3"
     in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
+    lodash "^4.17.15"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.10.0"
+    nan "^2.13.2"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
     request "^2.88.0"

From 5ed7be9498dda3b6723347e88e34ba6a63341bf3 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Fri, 31 Jan 2020 17:03:15 +0100
Subject: [PATCH 09/26] Remove unused dependencies in dashboard (#56318)

---
 .../kibana/public/dashboard/legacy_imports.ts |  7 ---
 .../public/dashboard/np_ready/application.ts  | 49 ++++---------------
 .../public/dashboard/np_ready/legacy_app.js   | 13 ++---
 3 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index 97d165b6b5c23..14bdef99ca894 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -38,15 +38,8 @@ export { showSaveModal, SaveResult } from 'ui/saved_objects/show_saved_object_sa
 export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
 export { KbnUrl } from 'ui/url/kbn_url';
 // @ts-ignore
-export { GlobalStateProvider } from 'ui/state_management/global_state';
-// @ts-ignore
-export { StateManagementConfigProvider } from 'ui/state_management/config_provider';
-// @ts-ignore
 export { PrivateProvider } from 'ui/private/private';
 // @ts-ignore
-export { EventsProvider } from 'ui/events';
-export { PersistedState } from 'ui/persisted_state';
-// @ts-ignore
 export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';
 // @ts-ignore
 export { PromiseServiceCreator } from 'ui/promises/promises';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index 1a0a99311d06b..0d461028d994a 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -33,15 +33,12 @@ import {
   confirmModalFactory,
   createTopNavDirective,
   createTopNavHelper,
-  EventsProvider,
   IPrivate,
   KbnUrlProvider,
-  PersistedState,
   PrivateProvider,
   PromiseServiceCreator,
   RedirectWhenMissingProvider,
   SavedObjectLoader,
-  StateManagementConfigProvider,
 } from '../legacy_imports';
 // @ts-ignore
 import { initDashboardApp } from './legacy_app';
@@ -112,8 +109,6 @@ function createLocalAngularModule(core: AppMountContext['core'], navigation: Nav
   createLocalPromiseModule();
   createLocalConfigModule(core);
   createLocalKbnUrlModule();
-  createLocalStateModule();
-  createLocalPersistedStateModule();
   createLocalTopNavModule(navigation);
   createLocalConfirmModalModule();
   createLocalIconModule();
@@ -123,9 +118,9 @@ function createLocalAngularModule(core: AppMountContext['core'], navigation: Nav
     'app/dashboard/Config',
     'app/dashboard/I18n',
     'app/dashboard/Private',
-    'app/dashboard/PersistedState',
     'app/dashboard/TopNav',
-    'app/dashboard/State',
+    'app/dashboard/KbnUrl',
+    'app/dashboard/Promise',
     'app/dashboard/ConfirmModal',
     'app/dashboard/icon',
   ]);
@@ -145,29 +140,6 @@ function createLocalConfirmModalModule() {
     .directive('confirmModal', reactDirective => reactDirective(EuiConfirmModal));
 }
 
-function createLocalStateModule() {
-  angular.module('app/dashboard/State', [
-    'app/dashboard/Private',
-    'app/dashboard/Config',
-    'app/dashboard/KbnUrl',
-    'app/dashboard/Promise',
-    'app/dashboard/PersistedState',
-  ]);
-}
-
-function createLocalPersistedStateModule() {
-  angular
-    .module('app/dashboard/PersistedState', ['app/dashboard/Private', 'app/dashboard/Promise'])
-    .factory('PersistedState', (Private: IPrivate) => {
-      const Events = Private(EventsProvider);
-      return class AngularPersistedState extends PersistedState {
-        constructor(value: any, path: any) {
-          super(value, path, Events);
-        }
-      };
-    });
-}
-
 function createLocalKbnUrlModule() {
   angular
     .module('app/dashboard/KbnUrl', ['app/dashboard/Private', 'ngRoute'])
@@ -176,16 +148,13 @@ function createLocalKbnUrlModule() {
 }
 
 function createLocalConfigModule(core: AppMountContext['core']) {
-  angular
-    .module('app/dashboard/Config', ['app/dashboard/Private'])
-    .provider('stateManagementConfig', StateManagementConfigProvider)
-    .provider('config', () => {
-      return {
-        $get: () => ({
-          get: core.uiSettings.get.bind(core.uiSettings),
-        }),
-      };
-    });
+  angular.module('app/dashboard/Config', ['app/dashboard/Private']).provider('config', () => {
+    return {
+      $get: () => ({
+        get: core.uiSettings.get.bind(core.uiSettings),
+      }),
+    };
+  });
 }
 
 function createLocalPromiseModule() {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
index 2121b51ea78d8..abc0c789326f8 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
@@ -59,11 +59,6 @@ export function initDashboardApp(app, deps) {
     addHelpMenuToAppChrome(deps.chrome, deps.core.docLinks);
   }
 
-  app.config(stateManagementConfigProvider => {
-    // Dashboard state management is handled by state containers and state_sync utilities
-    stateManagementConfigProvider.disable();
-  });
-
   app.factory('history', () => createHashHistory());
   app.factory('kbnUrlStateStorage', history =>
     createKbnUrlStateStorage({
@@ -141,7 +136,7 @@ export function initDashboardApp(app, deps) {
           });
         },
         resolve: {
-          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl) {
+          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl, history) {
             return ensureDefaultIndexPattern(deps.core, deps.npDataStart, $rootScope, kbnUrl).then(
               () => {
                 const savedObjectsClient = deps.savedObjectsClient;
@@ -160,13 +155,13 @@ export function initDashboardApp(app, deps) {
                           dashboard.attributes.title.toLowerCase() === title.toLowerCase()
                       );
                       if (matchingDashboards.length === 1) {
-                        kbnUrl.redirect(createDashboardEditUrl(matchingDashboards[0].id));
+                        history.replace(createDashboardEditUrl(matchingDashboards[0].id));
                       } else {
-                        kbnUrl.redirect(
+                        history.replace(
                           `${DashboardConstants.LANDING_PAGE_PATH}?filter="${title}"`
                         );
+                        $route.reload();
                       }
-                      $rootScope.$digest();
                       return new Promise(() => {});
                     });
                 }

From 38c7d3a668feda661be15feabcb78349c5e662d6 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Fri, 31 Jan 2020 11:13:28 -0500
Subject: [PATCH 10/26] [Maps] disable style forms when they are not applied
 due to other style settings (#55858)

* [Maps] disable style forms when they are not applied due to other style settings

* disable label border color when label border is none

* disable symbol style inputs when symbol size is zero

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../maps/public/layers/styles/_index.scss     |  2 +-
 .../components/_static_dynamic_style_row.scss |  3 -
 .../vector/components/_style_prop_editor.scss |  3 +
 .../components/get_vector_style_label.js      |  7 ++
 .../vector_style_label_border_size_editor.js  | 27 +++++-
 .../vector/components/style_prop_editor.js    | 43 +++++++--
 .../vector_style_symbolize_as_editor.js       | 26 +++++-
 .../vector/components/vector_style_editor.js  | 89 ++++++++++++++-----
 8 files changed, 156 insertions(+), 44 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_static_dynamic_style_row.scss
 create mode 100644 x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss

diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss b/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss
index 6d332ee878d95..b5d9113619c76 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss
@@ -1,4 +1,4 @@
 @import './components/color_gradient';
-@import './vector/components/static_dynamic_style_row';
+@import './vector/components/style_prop_editor';
 @import './vector/components/color/color_stops';
 @import './vector/components/symbol/icon_select';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_static_dynamic_style_row.scss b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_static_dynamic_style_row.scss
deleted file mode 100644
index 8ec006d32a8b9..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_static_dynamic_style_row.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.mapStaticDynamicSylingOption__dynamicSizeHack {
-  width: calc(100% - #{$euiSizeXXL + $euiSizeS});
-}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss
new file mode 100644
index 0000000000000..138605b1a7dcc
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss
@@ -0,0 +1,3 @@
+.mapStyleFormDisabledTooltip {
+  width: 100%;
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
index c5fdda70c4eb4..35e6fa60b28e7 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
@@ -8,6 +8,13 @@ import { i18n } from '@kbn/i18n';
 
 import { VECTOR_STYLES } from '../vector_style_defaults';
 
+export function getDisabledByMessage(styleName) {
+  return i18n.translate('xpack.maps.styles.vector.disabledByMessage', {
+    defaultMessage: `Set '{styleLabel}' to enable`,
+    values: { styleLabel: getVectorStyleLabel(styleName) },
+  });
+}
+
 export function getVectorStyleLabel(styleName) {
   switch (styleName) {
     case VECTOR_STYLES.FILL_COLOR:
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js
index 7d06e8b530011..04bb800eb1ecf 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js
@@ -6,9 +6,9 @@
 
 import React from 'react';
 
-import { EuiFormRow, EuiSelect } from '@elastic/eui';
+import { EuiFormRow, EuiSelect, EuiToolTip } from '@elastic/eui';
 import { LABEL_BORDER_SIZES, VECTOR_STYLES } from '../../vector_style_defaults';
-import { getVectorStyleLabel } from '../get_vector_style_label';
+import { getVectorStyleLabel, getDisabledByMessage } from '../get_vector_style_label';
 import { i18n } from '@kbn/i18n';
 
 const options = [
@@ -38,7 +38,12 @@ const options = [
   },
 ];
 
-export function VectorStyleLabelBorderSizeEditor({ handlePropertyChange, styleProperty }) {
+export function VectorStyleLabelBorderSizeEditor({
+  disabled,
+  disabledBy,
+  handlePropertyChange,
+  styleProperty,
+}) {
   function onChange(e) {
     const styleDescriptor = {
       options: { size: e.target.value },
@@ -46,12 +51,13 @@ export function VectorStyleLabelBorderSizeEditor({ handlePropertyChange, stylePr
     handlePropertyChange(styleProperty.getStyleName(), styleDescriptor);
   }
 
-  return (
+  const labelBorderSizeForm = (
     <EuiFormRow
       label={getVectorStyleLabel(VECTOR_STYLES.LABEL_BORDER_SIZE)}
       display="columnCompressed"
     >
       <EuiSelect
+        disabled={disabled}
         options={options}
         value={styleProperty.getOptions().size}
         onChange={onChange}
@@ -62,4 +68,17 @@ export function VectorStyleLabelBorderSizeEditor({ handlePropertyChange, stylePr
       />
     </EuiFormRow>
   );
+
+  if (!disabled) {
+    return labelBorderSizeForm;
+  }
+
+  return (
+    <EuiToolTip
+      anchorClassName="mapStyleFormDisabledTooltip"
+      content={getDisabledByMessage(disabledBy)}
+    >
+      {labelBorderSizeForm}
+    </EuiToolTip>
+  );
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
index e8b544d8ede16..f1180a3a56494 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
@@ -5,8 +5,15 @@
  */
 
 import React, { Component, Fragment } from 'react';
-import { getVectorStyleLabel } from './get_vector_style_label';
-import { EuiFormRow, EuiSelect } from '@elastic/eui';
+import { getVectorStyleLabel, getDisabledByMessage } from './get_vector_style_label';
+import {
+  EuiFormRow,
+  EuiSelect,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFieldText,
+  EuiToolTip,
+} from '@elastic/eui';
 import { VectorStyle } from '../vector_style';
 import { i18n } from '@kbn/i18n';
 
@@ -69,7 +76,7 @@ export class StylePropEditor extends Component {
             : VectorStyle.STYLE_TYPE.STATIC
         }
         onChange={this._onTypeToggle}
-        disabled={this.props.fields.length === 0}
+        disabled={this.props.disabled || this.props.fields.length === 0}
         aria-label={i18n.translate('xpack.maps.styles.staticDynamicSelect.ariaLabel', {
           defaultMessage: 'Select to style by fixed value or by data value',
         })}
@@ -83,17 +90,35 @@ export class StylePropEditor extends Component {
       this._onFieldMetaOptionsChange
     );
 
+    const staticDynamicSelect = this.renderStaticDynamicSelect();
+
+    const stylePropertyForm = this.props.disabled ? (
+      <EuiToolTip
+        anchorClassName="mapStyleFormDisabledTooltip"
+        content={getDisabledByMessage(this.props.disabledBy)}
+      >
+        <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+          <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+          <EuiFlexItem>
+            <EuiFieldText compressed disabled />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiToolTip>
+    ) : (
+      <Fragment>
+        {React.cloneElement(this.props.children, {
+          staticDynamicSelect,
+        })}
+        {fieldMetaOptionsPopover}
+      </Fragment>
+    );
+
     return (
       <EuiFormRow
         label={getVectorStyleLabel(this.props.styleProperty.getStyleName())}
         display="rowCompressed"
       >
-        <Fragment>
-          {React.cloneElement(this.props.children, {
-            staticDynamicSelect: this.renderStaticDynamicSelect(),
-          })}
-          {fieldMetaOptionsPopover}
-        </Fragment>
+        {stylePropertyForm}
       </EuiFormRow>
     );
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js
index 9394e5c068569..219fee311ba1b 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js
@@ -6,11 +6,12 @@
 
 import React from 'react';
 
-import { EuiFormRow, EuiButtonGroup } from '@elastic/eui';
+import { EuiFormRow, EuiButtonGroup, EuiToolTip } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 import { SYMBOLIZE_AS_TYPES } from '../../../../../../common/constants';
 import { VECTOR_STYLES } from '../../vector_style_defaults';
+import { getDisabledByMessage } from '../get_vector_style_label';
 
 const SYMBOLIZE_AS_OPTIONS = [
   {
@@ -27,7 +28,12 @@ const SYMBOLIZE_AS_OPTIONS = [
   },
 ];
 
-export function VectorStyleSymbolizeAsEditor({ styleProperty, handlePropertyChange }) {
+export function VectorStyleSymbolizeAsEditor({
+  disabled,
+  disabledBy,
+  styleProperty,
+  handlePropertyChange,
+}) {
   const styleOptions = styleProperty.getOptions();
   const selectedOption = SYMBOLIZE_AS_OPTIONS.find(({ id }) => {
     return id === styleOptions.value;
@@ -42,7 +48,7 @@ export function VectorStyleSymbolizeAsEditor({ styleProperty, handlePropertyChan
     handlePropertyChange(VECTOR_STYLES.SYMBOLIZE_AS, styleDescriptor);
   };
 
-  return (
+  const symbolizeAsForm = (
     <EuiFormRow
       label={i18n.translate('xpack.maps.vector.symbolLabel', {
         defaultMessage: 'Symbol type',
@@ -50,6 +56,7 @@ export function VectorStyleSymbolizeAsEditor({ styleProperty, handlePropertyChan
       display="columnCompressed"
     >
       <EuiButtonGroup
+        isDisabled={disabled}
         buttonSize="compressed"
         options={SYMBOLIZE_AS_OPTIONS}
         idSelected={selectedOption ? selectedOption.id : undefined}
@@ -58,4 +65,17 @@ export function VectorStyleSymbolizeAsEditor({ styleProperty, handlePropertyChan
       />
     </EuiFormRow>
   );
+
+  if (!disabled) {
+    return symbolizeAsForm;
+  }
+
+  return (
+    <EuiToolTip
+      anchorClassName="mapStyleFormDisabledTooltip"
+      content={getDisabledByMessage(disabledBy)}
+    >
+      {symbolizeAsForm}
+    </EuiToolTip>
+  );
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
index 9299022b7895b..441ebfb2d53bf 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
@@ -18,6 +18,7 @@ import { OrientationEditor } from './orientation/orientation_editor';
 import {
   getDefaultDynamicProperties,
   getDefaultStaticProperties,
+  LABEL_BORDER_SIZES,
   VECTOR_STYLES,
 } from '../vector_style_defaults';
 import { DEFAULT_FILL_COLORS, DEFAULT_LINE_COLORS } from '../../color_utils';
@@ -145,9 +146,33 @@ export class VectorStyleEditor extends Component {
     this.props.handlePropertyChange(propertyName, styleDescriptor);
   };
 
-  _renderFillColor() {
+  _hasBorder() {
+    const width = this.props.styleProperties[VECTOR_STYLES.LINE_WIDTH];
+    return width.isDynamic() ? width.isComplete() : width.getOptions().size !== 0;
+  }
+
+  _hasMarkerOrIcon() {
+    const iconSize = this.props.styleProperties[VECTOR_STYLES.ICON_SIZE];
+    return !iconSize.isDynamic() && iconSize.getOptions().size > 0;
+  }
+
+  _hasLabel() {
+    const label = this.props.styleProperties[VECTOR_STYLES.LABEL_TEXT];
+    return label.isDynamic()
+      ? label.isComplete()
+      : label.getOptions().value != null && label.getOptions().value.length;
+  }
+
+  _hasLabelBorder() {
+    const labelBorderSize = this.props.styleProperties[VECTOR_STYLES.LABEL_BORDER_SIZE];
+    return labelBorderSize.getOptions().size !== LABEL_BORDER_SIZES.NONE;
+  }
+
+  _renderFillColor(isPointFillColor = false) {
     return (
       <VectorStyleColorEditor
+        disabled={isPointFillColor && !this._hasMarkerOrIcon()}
+        disabledBy={VECTOR_STYLES.ICON_SIZE}
         swatches={DEFAULT_FILL_COLORS}
         onStaticStyleChange={this._onStaticStyleChange}
         onDynamicStyleChange={this._onDynamicStyleChange}
@@ -163,9 +188,12 @@ export class VectorStyleEditor extends Component {
     );
   }
 
-  _renderLineColor() {
+  _renderLineColor(isPointBorderColor = false) {
+    const disabledByIconSize = isPointBorderColor && !this._hasMarkerOrIcon();
     return (
       <VectorStyleColorEditor
+        disabled={disabledByIconSize || !this._hasBorder()}
+        disabledBy={disabledByIconSize ? VECTOR_STYLES.ICON_SIZE : VECTOR_STYLES.LINE_WIDTH}
         swatches={DEFAULT_LINE_COLORS}
         onStaticStyleChange={this._onStaticStyleChange}
         onDynamicStyleChange={this._onDynamicStyleChange}
@@ -181,9 +209,11 @@ export class VectorStyleEditor extends Component {
     );
   }
 
-  _renderLineWidth() {
+  _renderLineWidth(isPointBorderWidth = false) {
     return (
       <VectorStyleSizeEditor
+        disabled={isPointBorderWidth && !this._hasMarkerOrIcon()}
+        disabledBy={VECTOR_STYLES.ICON_SIZE}
         onStaticStyleChange={this._onStaticStyleChange}
         onDynamicStyleChange={this._onDynamicStyleChange}
         styleProperty={this.props.styleProperties[VECTOR_STYLES.LINE_WIDTH]}
@@ -198,24 +228,9 @@ export class VectorStyleEditor extends Component {
     );
   }
 
-  _renderSymbolSize() {
-    return (
-      <VectorStyleSizeEditor
-        onStaticStyleChange={this._onStaticStyleChange}
-        onDynamicStyleChange={this._onDynamicStyleChange}
-        styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON_SIZE]}
-        fields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={
-          this.state.defaultStaticProperties[VECTOR_STYLES.ICON_SIZE].options
-        }
-        defaultDynamicStyleOptions={
-          this.state.defaultDynamicProperties[VECTOR_STYLES.ICON_SIZE].options
-        }
-      />
-    );
-  }
-
   _renderLabelProperties() {
+    const hasLabel = this._hasLabel();
+    const hasLabelBorder = this._hasLabelBorder();
     return (
       <Fragment>
         <VectorStyleLabelEditor
@@ -233,6 +248,8 @@ export class VectorStyleEditor extends Component {
         <EuiSpacer size="m" />
 
         <VectorStyleColorEditor
+          disabled={!hasLabel}
+          disabledBy={VECTOR_STYLES.LABEL_TEXT}
           swatches={DEFAULT_LINE_COLORS}
           onStaticStyleChange={this._onStaticStyleChange}
           onDynamicStyleChange={this._onDynamicStyleChange}
@@ -248,6 +265,8 @@ export class VectorStyleEditor extends Component {
         <EuiSpacer size="m" />
 
         <VectorStyleSizeEditor
+          disabled={!hasLabel}
+          disabledBy={VECTOR_STYLES.LABEL_TEXT}
           onStaticStyleChange={this._onStaticStyleChange}
           onDynamicStyleChange={this._onDynamicStyleChange}
           styleProperty={this.props.styleProperties[VECTOR_STYLES.LABEL_SIZE]}
@@ -262,6 +281,8 @@ export class VectorStyleEditor extends Component {
         <EuiSpacer size="m" />
 
         <VectorStyleColorEditor
+          disabled={!hasLabel || !hasLabelBorder}
+          disabledBy={hasLabel ? VECTOR_STYLES.LABEL_BORDER_SIZE : VECTOR_STYLES.LABEL_TEXT}
           swatches={DEFAULT_LINE_COLORS}
           onStaticStyleChange={this._onStaticStyleChange}
           onDynamicStyleChange={this._onDynamicStyleChange}
@@ -277,6 +298,8 @@ export class VectorStyleEditor extends Component {
         <EuiSpacer size="m" />
 
         <VectorStyleLabelBorderSizeEditor
+          disabled={!hasLabel}
+          disabledBy={VECTOR_STYLES.LABEL_TEXT}
           handlePropertyChange={this.props.handlePropertyChange}
           styleProperty={this.props.styleProperties[VECTOR_STYLES.LABEL_BORDER_SIZE]}
         />
@@ -286,12 +309,15 @@ export class VectorStyleEditor extends Component {
   }
 
   _renderPointProperties() {
+    const hasMarkerOrIcon = this._hasMarkerOrIcon();
     let iconOrientationEditor;
     let iconEditor;
     if (this.props.styleProperties[VECTOR_STYLES.SYMBOLIZE_AS].isSymbolizedAsIcon()) {
       iconOrientationEditor = (
         <Fragment>
           <OrientationEditor
+            disabled={!hasMarkerOrIcon}
+            disabledBy={VECTOR_STYLES.ICON_SIZE}
             onStaticStyleChange={this._onStaticStyleChange}
             onDynamicStyleChange={this._onDynamicStyleChange}
             styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON_ORIENTATION]}
@@ -309,6 +335,8 @@ export class VectorStyleEditor extends Component {
       iconEditor = (
         <Fragment>
           <VectorStyleIconEditor
+            disabled={!hasMarkerOrIcon}
+            disabledBy={VECTOR_STYLES.ICON_SIZE}
             onStaticStyleChange={this._onStaticStyleChange}
             onDynamicStyleChange={this._onDynamicStyleChange}
             styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON]}
@@ -328,6 +356,8 @@ export class VectorStyleEditor extends Component {
     return (
       <Fragment>
         <VectorStyleSymbolizeAsEditor
+          disabled={!hasMarkerOrIcon}
+          disabledBy={VECTOR_STYLES.ICON_SIZE}
           styleProperty={this.props.styleProperties[VECTOR_STYLES.SYMBOLIZE_AS]}
           handlePropertyChange={this.props.handlePropertyChange}
         />
@@ -335,18 +365,29 @@ export class VectorStyleEditor extends Component {
 
         {iconEditor}
 
-        {this._renderFillColor()}
+        {this._renderFillColor(true)}
         <EuiSpacer size="m" />
 
-        {this._renderLineColor()}
+        {this._renderLineColor(true)}
         <EuiSpacer size="m" />
 
-        {this._renderLineWidth()}
+        {this._renderLineWidth(true)}
         <EuiSpacer size="m" />
 
         {iconOrientationEditor}
 
-        {this._renderSymbolSize()}
+        <VectorStyleSizeEditor
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON_SIZE]}
+          fields={this._getOrdinalFields()}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.ICON_SIZE].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.ICON_SIZE].options
+          }
+        />
         <EuiSpacer size="m" />
 
         {this._renderLabelProperties()}

From 1bb4d77479dbf5b21515378f7ab9c5d1349d4052 Mon Sep 17 00:00:00 2001
From: Kerg09 <46001886+Kerg09@users.noreply.github.com>
Date: Fri, 31 Jan 2020 10:45:37 -0600
Subject: [PATCH 11/26] Adds Query.AI to known-plugins.asciidoc (#50516)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 docs/plugins/known-plugins.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/plugins/known-plugins.asciidoc b/docs/plugins/known-plugins.asciidoc
index cc27eca4c267e..cb70a1d1c387a 100644
--- a/docs/plugins/known-plugins.asciidoc
+++ b/docs/plugins/known-plugins.asciidoc
@@ -20,6 +20,7 @@ This list of plugins is not guaranteed to work on your version of Kibana. Instea
 * https://github.com/johtani/analyze-api-ui-plugin[Analyze UI] (johtani) - UI for elasticsearch _analyze API
 * https://github.com/TrumanDu/cleaner[Cleaner] (TrumanDu)- Setting index ttl.
 * https://github.com/bitsensor/elastalert-kibana-plugin[ElastAlert Kibana Plugin] (BitSensor) - UI to create, test and edit ElastAlert rules
+* https://github.com/query-ai/queryai-kibana-plugin[AI Analyst] (Query.AI) - App providing: NLP queries, automation, ML visualizations and insights
 
 [float]
 === Timelion Extensions

From f1068cdbff1c246c6a0154a803435a5585ef7cea Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <skaapgif@gmail.com>
Date: Fri, 31 Jan 2020 17:49:33 +0100
Subject: [PATCH 12/26] Perform successful Elasticsearch version check before
 migrations (#51311)

* Convert parts of Elasticsearch version check to ts
* Move ES version check to NP
* Improve types
* Wait till for compatible ES nodes before SO migrations
* Don't wait for ES compatibility if skipMigrations=true
* Legacy Elasticsearch plugin integration test
* Make ES compatibility check and migrations logging more visible
* Test for isCompatible=false when ES version check throws
* Start pollEsNodesVersion immediately
* Refactor pollEsNodesVersion
---
 .../elasticsearch/elasticsearch_config.ts     |  14 +-
 .../elasticsearch_service.mock.ts             |   7 +
 .../elasticsearch_service.test.ts             |  11 +-
 .../elasticsearch/elasticsearch_service.ts    |  46 ++-
 src/core/server/elasticsearch/types.ts        |   2 +
 .../version_check/ensure_es_version.test.ts   | 261 ++++++++++++++++++
 .../version_check/ensure_es_version.ts        | 164 +++++++++++
 .../es_kibana_version_compatability.test.ts}  |  18 +-
 .../es_kibana_version_compatability.ts}       |  15 +-
 .../integration_tests/core_services.test.ts   |   8 +-
 .../integration_tests/legacy_service.test.ts  |   2 +-
 .../migrations/kibana/kibana_migrator.test.ts |   6 -
 .../migrations/kibana/kibana_migrator.ts      |  15 +-
 .../saved_objects_service.test.ts             |  41 ++-
 .../saved_objects/saved_objects_service.ts    |  25 +-
 .../core_plugins/elasticsearch/index.d.ts     |   1 +
 .../core_plugins/elasticsearch/index.js       |  14 +-
 .../integration_tests/elasticsearch.test.ts   |  89 ++++++
 .../version_health_check.js}                  |  24 +-
 .../lib/version_health_check.test.js          |  71 +++++
 .../server/lib/__tests__/ensure_es_version.js | 223 ---------------
 .../server/lib/__tests__/health_check.js      | 151 ----------
 .../server/lib/ensure_es_version.js           | 126 ---------
 .../elasticsearch/server/lib/health_check.js  |  75 -----
 .../default_route_provider.test.ts            |   2 +-
 .../default_route_provider_config.test.ts     |   1 +
 .../max_payload_size.test.js                  |   2 +-
 .../on_post_auth_interceptor.test.ts          |   5 +-
 .../on_request_interceptor.test.ts            |   5 +-
 29 files changed, 769 insertions(+), 655 deletions(-)
 create mode 100644 src/core/server/elasticsearch/version_check/ensure_es_version.test.ts
 create mode 100644 src/core/server/elasticsearch/version_check/ensure_es_version.ts
 rename src/{legacy/core_plugins/elasticsearch/server/lib/__tests__/is_es_compatible_with_kibana.js => core/server/elasticsearch/version_check/es_kibana_version_compatability.test.ts} (72%)
 rename src/{legacy/core_plugins/elasticsearch/server/lib/is_es_compatible_with_kibana.js => core/server/elasticsearch/version_check/es_kibana_version_compatability.ts} (76%)
 create mode 100644 src/legacy/core_plugins/elasticsearch/integration_tests/elasticsearch.test.ts
 rename src/legacy/core_plugins/elasticsearch/{server/lib/kibana_version.js => lib/version_health_check.js} (57%)
 create mode 100644 src/legacy/core_plugins/elasticsearch/lib/version_health_check.test.js
 delete mode 100644 src/legacy/core_plugins/elasticsearch/server/lib/__tests__/ensure_es_version.js
 delete mode 100644 src/legacy/core_plugins/elasticsearch/server/lib/__tests__/health_check.js
 delete mode 100644 src/legacy/core_plugins/elasticsearch/server/lib/ensure_es_version.js
 delete mode 100644 src/legacy/core_plugins/elasticsearch/server/lib/health_check.js

diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index 5f06c51a53d53..50866e5550d8e 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -103,7 +103,19 @@ const configSchema = schema.object({
   ),
   apiVersion: schema.string({ defaultValue: DEFAULT_API_VERSION }),
   healthCheck: schema.object({ delay: schema.duration({ defaultValue: 2500 }) }),
-  ignoreVersionMismatch: schema.boolean({ defaultValue: false }),
+  ignoreVersionMismatch: schema.conditional(
+    schema.contextRef('dev'),
+    false,
+    schema.boolean({
+      validate: rawValue => {
+        if (rawValue === true) {
+          return '"ignoreVersionMismatch" can only be set to true in development mode';
+        }
+      },
+      defaultValue: false,
+    }),
+    schema.boolean({ defaultValue: false })
+  ),
 });
 
 const deprecations: ConfigDeprecationProvider = () => [
diff --git a/src/core/server/elasticsearch/elasticsearch_service.mock.ts b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
index a4e51ca55b3e7..b8ad375496544 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.mock.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
@@ -23,6 +23,7 @@ import { IScopedClusterClient } from './scoped_cluster_client';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchService } from './elasticsearch_service';
 import { InternalElasticsearchServiceSetup, ElasticsearchServiceSetup } from './types';
+import { NodesVersionCompatibility } from './version_check/ensure_es_version';
 
 const createScopedClusterClientMock = (): jest.Mocked<IScopedClusterClient> => ({
   callAsInternalUser: jest.fn(),
@@ -71,6 +72,12 @@ type MockedInternalElasticSearchServiceSetup = jest.Mocked<
 const createInternalSetupContractMock = () => {
   const setupContract: MockedInternalElasticSearchServiceSetup = {
     ...createSetupContractMock(),
+    esNodesCompatibility$: new BehaviorSubject<NodesVersionCompatibility>({
+      isCompatible: true,
+      incompatibleNodes: [],
+      warningNodes: [],
+      kibanaVersion: '8.0.0',
+    }),
     legacy: {
       config$: new BehaviorSubject({} as ElasticsearchConfig),
     },
diff --git a/src/core/server/elasticsearch/elasticsearch_service.test.ts b/src/core/server/elasticsearch/elasticsearch_service.test.ts
index 5a7d223fec7ad..022a03e01d37d 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.test.ts
@@ -31,6 +31,7 @@ import { httpServiceMock } from '../http/http_service.mock';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchService } from './elasticsearch_service';
 import { elasticsearchServiceMock } from './elasticsearch_service.mock';
+import { duration } from 'moment';
 
 let elasticsearchService: ElasticsearchService;
 const configService = configServiceMock.create();
@@ -41,7 +42,7 @@ configService.atPath.mockReturnValue(
   new BehaviorSubject({
     hosts: ['http://1.2.3.4'],
     healthCheck: {
-      delay: 2000,
+      delay: duration(2000),
     },
     ssl: {
       verificationMode: 'none',
@@ -125,7 +126,7 @@ describe('#setup', () => {
       const config = MockClusterClient.mock.calls[0][0];
       expect(config).toMatchInlineSnapshot(`
 Object {
-  "healthCheckDelay": 2000,
+  "healthCheckDelay": "PT2S",
   "hosts": Array [
     "http://8.8.8.8",
   ],
@@ -150,7 +151,7 @@ Object {
       const config = MockClusterClient.mock.calls[0][0];
       expect(config).toMatchInlineSnapshot(`
 Object {
-  "healthCheckDelay": 2000,
+  "healthCheckDelay": "PT2S",
   "hosts": Array [
     "http://1.2.3.4",
   ],
@@ -174,7 +175,7 @@ Object {
         new BehaviorSubject({
           hosts: ['http://1.2.3.4', 'http://9.8.7.6'],
           healthCheck: {
-            delay: 2000,
+            delay: duration(2000),
           },
           ssl: {
             verificationMode: 'none',
@@ -196,7 +197,7 @@ Object {
       const config = MockClusterClient.mock.calls[0][0];
       expect(config).toMatchInlineSnapshot(`
         Object {
-          "healthCheckDelay": 2000,
+          "healthCheckDelay": "PT2S",
           "hosts": Array [
             "http://8.8.8.8",
           ],
diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts
index de111e1cb8b9b..9eaf125cc006f 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.ts
@@ -30,6 +30,7 @@ import { ElasticsearchConfig, ElasticsearchConfigType } from './elasticsearch_co
 import { InternalHttpServiceSetup, GetAuthHeaders } from '../http/';
 import { InternalElasticsearchServiceSetup } from './types';
 import { CallAPIOptions } from './api_types';
+import { pollEsNodesVersion } from './version_check/ensure_es_version';
 
 /** @internal */
 interface CoreClusterClients {
@@ -46,9 +47,17 @@ interface SetupDeps {
 export class ElasticsearchService implements CoreService<InternalElasticsearchServiceSetup> {
   private readonly log: Logger;
   private readonly config$: Observable<ElasticsearchConfig>;
-  private subscription?: Subscription;
+  private subscriptions: {
+    client?: Subscription;
+    esNodesCompatibility?: Subscription;
+  } = {
+    client: undefined,
+    esNodesCompatibility: undefined,
+  };
+  private kibanaVersion: string;
 
   constructor(private readonly coreContext: CoreContext) {
+    this.kibanaVersion = coreContext.env.packageInfo.version;
     this.log = coreContext.logger.get('elasticsearch-service');
     this.config$ = coreContext.configService
       .atPath<ElasticsearchConfigType>('elasticsearch')
@@ -60,7 +69,7 @@ export class ElasticsearchService implements CoreService<InternalElasticsearchSe
 
     const clients$ = this.config$.pipe(
       filter(() => {
-        if (this.subscription !== undefined) {
+        if (this.subscriptions.client !== undefined) {
           this.log.error('Clients cannot be changed after they are created');
           return false;
         }
@@ -91,7 +100,7 @@ export class ElasticsearchService implements CoreService<InternalElasticsearchSe
       publishReplay(1)
     ) as ConnectableObservable<CoreClusterClients>;
 
-    this.subscription = clients$.connect();
+    this.subscriptions.client = clients$.connect();
 
     const config = await this.config$.pipe(first()).toPromise();
 
@@ -149,11 +158,31 @@ export class ElasticsearchService implements CoreService<InternalElasticsearchSe
       },
     };
 
+    const esNodesCompatibility$ = pollEsNodesVersion({
+      callWithInternalUser: adminClient.callAsInternalUser,
+      log: this.log,
+      ignoreVersionMismatch: config.ignoreVersionMismatch,
+      esVersionCheckInterval: config.healthCheckDelay.asMilliseconds(),
+      kibanaVersion: this.kibanaVersion,
+    }).pipe(publishReplay(1));
+
+    this.subscriptions.esNodesCompatibility = (esNodesCompatibility$ as ConnectableObservable<
+      unknown
+    >).connect();
+
+    // TODO: Move to Status Service https://github.com/elastic/kibana/issues/41983
+    esNodesCompatibility$.subscribe(({ isCompatible, message }) => {
+      if (!isCompatible && message) {
+        this.log.error(message);
+      }
+    });
+
     return {
       legacy: { config$: clients$.pipe(map(clients => clients.config)) },
 
       adminClient,
       dataClient,
+      esNodesCompatibility$,
 
       createClient: (type: string, clientConfig: Partial<ElasticsearchClientConfig> = {}) => {
         const finalConfig = merge({}, config, clientConfig);
@@ -166,11 +195,12 @@ export class ElasticsearchService implements CoreService<InternalElasticsearchSe
 
   public async stop() {
     this.log.debug('Stopping elasticsearch service');
-
-    if (this.subscription !== undefined) {
-      this.subscription.unsubscribe();
-      this.subscription = undefined;
-    }
+    // TODO(TS-3.7-ESLINT)
+    // eslint-disable-next-line no-unused-expressions
+    this.subscriptions.client?.unsubscribe();
+    // eslint-disable-next-line no-unused-expressions
+    this.subscriptions.esNodesCompatibility?.unsubscribe();
+    this.subscriptions = { client: undefined, esNodesCompatibility: undefined };
   }
 
   private createClusterClient(
diff --git a/src/core/server/elasticsearch/types.ts b/src/core/server/elasticsearch/types.ts
index 899b273c5c60a..90cfdcc035d8e 100644
--- a/src/core/server/elasticsearch/types.ts
+++ b/src/core/server/elasticsearch/types.ts
@@ -21,6 +21,7 @@ import { Observable } from 'rxjs';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchClientConfig } from './elasticsearch_client_config';
 import { IClusterClient, ICustomClusterClient } from './cluster_client';
+import { NodesVersionCompatibility } from './version_check/ensure_es_version';
 
 /**
  * @public
@@ -77,4 +78,5 @@ export interface InternalElasticsearchServiceSetup extends ElasticsearchServiceS
   readonly legacy: {
     readonly config$: Observable<ElasticsearchConfig>;
   };
+  esNodesCompatibility$: Observable<NodesVersionCompatibility>;
 }
diff --git a/src/core/server/elasticsearch/version_check/ensure_es_version.test.ts b/src/core/server/elasticsearch/version_check/ensure_es_version.test.ts
new file mode 100644
index 0000000000000..4989c4a31295c
--- /dev/null
+++ b/src/core/server/elasticsearch/version_check/ensure_es_version.test.ts
@@ -0,0 +1,261 @@
+/*
+ * 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 { mapNodesVersionCompatibility, pollEsNodesVersion, NodesInfo } from './ensure_es_version';
+import { loggingServiceMock } from '../../logging/logging_service.mock';
+import { take, delay } from 'rxjs/operators';
+import { TestScheduler } from 'rxjs/testing';
+import { of } from 'rxjs';
+
+const mockLoggerFactory = loggingServiceMock.create();
+const mockLogger = mockLoggerFactory.get('mock logger');
+
+const KIBANA_VERSION = '5.1.0';
+
+function createNodes(...versions: string[]): NodesInfo {
+  const nodes = {} as any;
+  versions
+    .map(version => {
+      return {
+        version,
+        http: {
+          publish_address: 'http_address',
+        },
+        ip: 'ip',
+      };
+    })
+    .forEach((node, i) => {
+      nodes[`node-${i}`] = node;
+    });
+
+  return { nodes };
+}
+
+describe('mapNodesVersionCompatibility', () => {
+  function createNodesInfoWithoutHTTP(version: string): NodesInfo {
+    return { nodes: { 'node-without-http': { version, ip: 'ip' } } } as any;
+  }
+
+  it('returns isCompatible=true with a single node that matches', async () => {
+    const nodesInfo = createNodes('5.1.0');
+    const result = await mapNodesVersionCompatibility(nodesInfo, KIBANA_VERSION, false);
+    expect(result.isCompatible).toBe(true);
+  });
+
+  it('returns isCompatible=true with multiple nodes that satisfy', async () => {
+    const nodesInfo = createNodes('5.1.0', '5.2.0', '5.1.1-Beta1');
+    const result = await mapNodesVersionCompatibility(nodesInfo, KIBANA_VERSION, false);
+    expect(result.isCompatible).toBe(true);
+  });
+
+  it('returns isCompatible=false for a single node that is out of date', () => {
+    // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana.
+    const nodesInfo = createNodes('5.1.0', '5.2.0', '5.0.0');
+    const result = mapNodesVersionCompatibility(nodesInfo, KIBANA_VERSION, false);
+    expect(result.isCompatible).toBe(false);
+    expect(result.message).toMatchInlineSnapshot(
+      `"This version of Kibana (v5.1.0) is incompatible with the following Elasticsearch nodes in your cluster: v5.0.0 @ http_address (ip)"`
+    );
+  });
+
+  it('returns isCompatible=false for an incompatible node without http publish address', async () => {
+    const nodesInfo = createNodesInfoWithoutHTTP('6.1.1');
+    const result = mapNodesVersionCompatibility(nodesInfo, KIBANA_VERSION, false);
+    expect(result.isCompatible).toBe(false);
+    expect(result.message).toMatchInlineSnapshot(
+      `"This version of Kibana (v5.1.0) is incompatible with the following Elasticsearch nodes in your cluster: v6.1.1 @ undefined (ip)"`
+    );
+  });
+
+  it('returns isCompatible=true for outdated nodes when ignoreVersionMismatch=true', async () => {
+    // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana.
+    const nodesInfo = createNodes('5.1.0', '5.2.0', '5.0.0');
+    const ignoreVersionMismatch = true;
+    const result = mapNodesVersionCompatibility(nodesInfo, KIBANA_VERSION, ignoreVersionMismatch);
+    expect(result.isCompatible).toBe(true);
+    expect(result.message).toMatchInlineSnapshot(
+      `"Ignoring version incompatibility between Kibana v5.1.0 and the following Elasticsearch nodes: v5.0.0 @ http_address (ip)"`
+    );
+  });
+
+  it('returns isCompatible=true with a message if a node is only off by a patch version', () => {
+    const result = mapNodesVersionCompatibility(createNodes('5.1.1'), KIBANA_VERSION, false);
+    expect(result.isCompatible).toBe(true);
+    expect(result.message).toMatchInlineSnapshot(
+      `"You're running Kibana 5.1.0 with some different versions of Elasticsearch. Update Kibana or Elasticsearch to the same version to prevent compatibility issues: v5.1.1 @ http_address (ip)"`
+    );
+  });
+
+  it('returns isCompatible=true with a message if a node is only off by a patch version and without http publish address', async () => {
+    const result = mapNodesVersionCompatibility(createNodes('5.1.1'), KIBANA_VERSION, false);
+    expect(result.isCompatible).toBe(true);
+    expect(result.message).toMatchInlineSnapshot(
+      `"You're running Kibana 5.1.0 with some different versions of Elasticsearch. Update Kibana or Elasticsearch to the same version to prevent compatibility issues: v5.1.1 @ http_address (ip)"`
+    );
+  });
+});
+
+describe('pollEsNodesVersion', () => {
+  const callWithInternalUser = jest.fn();
+  const getTestScheduler = () =>
+    new TestScheduler((actual, expected) => {
+      expect(actual).toEqual(expected);
+    });
+
+  beforeEach(() => {
+    callWithInternalUser.mockClear();
+  });
+
+  it('returns iscCompatible=false and keeps polling when a poll request throws', done => {
+    expect.assertions(3);
+    const expectedCompatibilityResults = [false, false, true];
+    jest.clearAllMocks();
+    callWithInternalUser.mockResolvedValueOnce(createNodes('5.1.0', '5.2.0', '5.0.0'));
+    callWithInternalUser.mockRejectedValueOnce(new Error('mock request error'));
+    callWithInternalUser.mockResolvedValueOnce(createNodes('5.1.0', '5.2.0', '5.1.1-Beta1'));
+    pollEsNodesVersion({
+      callWithInternalUser,
+      esVersionCheckInterval: 1,
+      ignoreVersionMismatch: false,
+      kibanaVersion: KIBANA_VERSION,
+      log: mockLogger,
+    })
+      .pipe(take(3))
+      .subscribe({
+        next: result => {
+          expect(result.isCompatible).toBe(expectedCompatibilityResults.shift());
+        },
+        complete: done,
+        error: done,
+      });
+  });
+
+  it('returns compatibility results', done => {
+    expect.assertions(1);
+    const nodes = createNodes('5.1.0', '5.2.0', '5.0.0');
+    callWithInternalUser.mockResolvedValueOnce(nodes);
+    pollEsNodesVersion({
+      callWithInternalUser,
+      esVersionCheckInterval: 1,
+      ignoreVersionMismatch: false,
+      kibanaVersion: KIBANA_VERSION,
+      log: mockLogger,
+    })
+      .pipe(take(1))
+      .subscribe({
+        next: result => {
+          expect(result).toEqual(mapNodesVersionCompatibility(nodes, KIBANA_VERSION, false));
+        },
+        complete: done,
+        error: done,
+      });
+  });
+
+  it('only emits if the node versions changed since the previous poll', done => {
+    expect.assertions(4);
+    callWithInternalUser.mockResolvedValueOnce(createNodes('5.1.0', '5.2.0', '5.0.0')); // emit
+    callWithInternalUser.mockResolvedValueOnce(createNodes('5.0.0', '5.1.0', '5.2.0')); // ignore, same versions, different ordering
+    callWithInternalUser.mockResolvedValueOnce(createNodes('5.1.1', '5.2.0', '5.0.0')); // emit
+    callWithInternalUser.mockResolvedValueOnce(createNodes('5.1.1', '5.1.2', '5.1.3')); // emit
+    callWithInternalUser.mockResolvedValueOnce(createNodes('5.1.1', '5.1.2', '5.1.3')); // ignore
+    callWithInternalUser.mockResolvedValueOnce(createNodes('5.0.0', '5.1.0', '5.2.0')); // emit, different from previous version
+
+    pollEsNodesVersion({
+      callWithInternalUser,
+      esVersionCheckInterval: 1,
+      ignoreVersionMismatch: false,
+      kibanaVersion: KIBANA_VERSION,
+      log: mockLogger,
+    })
+      .pipe(take(4))
+      .subscribe({
+        next: result => expect(result).toBeDefined(),
+        complete: done,
+        error: done,
+      });
+  });
+
+  it('starts polling immediately and then every esVersionCheckInterval', () => {
+    expect.assertions(1);
+    callWithInternalUser.mockReturnValueOnce([createNodes('5.1.0', '5.2.0', '5.0.0')]);
+    callWithInternalUser.mockReturnValueOnce([createNodes('5.1.1', '5.2.0', '5.0.0')]);
+
+    getTestScheduler().run(({ expectObservable }) => {
+      const expected = 'a 99ms (b|)';
+
+      const esNodesCompatibility$ = pollEsNodesVersion({
+        callWithInternalUser,
+        esVersionCheckInterval: 100,
+        ignoreVersionMismatch: false,
+        kibanaVersion: KIBANA_VERSION,
+        log: mockLogger,
+      }).pipe(take(2));
+
+      expectObservable(esNodesCompatibility$).toBe(expected, {
+        a: mapNodesVersionCompatibility(
+          createNodes('5.1.0', '5.2.0', '5.0.0'),
+          KIBANA_VERSION,
+          false
+        ),
+        b: mapNodesVersionCompatibility(
+          createNodes('5.1.1', '5.2.0', '5.0.0'),
+          KIBANA_VERSION,
+          false
+        ),
+      });
+    });
+  });
+
+  it('waits for es version check requests to complete before scheduling the next one', () => {
+    expect.assertions(2);
+
+    getTestScheduler().run(({ expectObservable }) => {
+      const expected = '100ms a 99ms (b|)';
+
+      callWithInternalUser.mockReturnValueOnce(
+        of(createNodes('5.1.0', '5.2.0', '5.0.0')).pipe(delay(100))
+      );
+      callWithInternalUser.mockReturnValueOnce(
+        of(createNodes('5.1.1', '5.2.0', '5.0.0')).pipe(delay(100))
+      );
+
+      const esNodesCompatibility$ = pollEsNodesVersion({
+        callWithInternalUser,
+        esVersionCheckInterval: 10,
+        ignoreVersionMismatch: false,
+        kibanaVersion: KIBANA_VERSION,
+        log: mockLogger,
+      }).pipe(take(2));
+
+      expectObservable(esNodesCompatibility$).toBe(expected, {
+        a: mapNodesVersionCompatibility(
+          createNodes('5.1.0', '5.2.0', '5.0.0'),
+          KIBANA_VERSION,
+          false
+        ),
+        b: mapNodesVersionCompatibility(
+          createNodes('5.1.1', '5.2.0', '5.0.0'),
+          KIBANA_VERSION,
+          false
+        ),
+      });
+    });
+
+    expect(callWithInternalUser).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/src/core/server/elasticsearch/version_check/ensure_es_version.ts b/src/core/server/elasticsearch/version_check/ensure_es_version.ts
new file mode 100644
index 0000000000000..3e760ec0efabd
--- /dev/null
+++ b/src/core/server/elasticsearch/version_check/ensure_es_version.ts
@@ -0,0 +1,164 @@
+/*
+ * 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.
+ */
+
+/**
+ * ES and Kibana versions are locked, so Kibana should require that ES has the same version as
+ * that defined in Kibana's package.json.
+ */
+
+import { timer, of, from, Observable } from 'rxjs';
+import { map, distinctUntilChanged, catchError, exhaustMap } from 'rxjs/operators';
+import {
+  esVersionCompatibleWithKibana,
+  esVersionEqualsKibana,
+} from './es_kibana_version_compatability';
+import { Logger } from '../../logging';
+import { APICaller } from '..';
+
+export interface PollEsNodesVersionOptions {
+  callWithInternalUser: APICaller;
+  log: Logger;
+  kibanaVersion: string;
+  ignoreVersionMismatch: boolean;
+  esVersionCheckInterval: number;
+}
+
+interface NodeInfo {
+  version: string;
+  ip: string;
+  http: {
+    publish_address: string;
+  };
+  name: string;
+}
+
+export interface NodesInfo {
+  nodes: {
+    [key: string]: NodeInfo;
+  };
+}
+
+export interface NodesVersionCompatibility {
+  isCompatible: boolean;
+  message?: string;
+  incompatibleNodes: NodeInfo[];
+  warningNodes: NodeInfo[];
+  kibanaVersion: string;
+}
+
+function getHumanizedNodeName(node: NodeInfo) {
+  const publishAddress = node?.http?.publish_address + ' ' || '';
+  return 'v' + node.version + ' @ ' + publishAddress + '(' + node.ip + ')';
+}
+
+export function mapNodesVersionCompatibility(
+  nodesInfo: NodesInfo,
+  kibanaVersion: string,
+  ignoreVersionMismatch: boolean
+): NodesVersionCompatibility {
+  if (Object.keys(nodesInfo.nodes).length === 0) {
+    return {
+      isCompatible: false,
+      message: 'Unable to retrieve version information from Elasticsearch nodes.',
+      incompatibleNodes: [],
+      warningNodes: [],
+      kibanaVersion,
+    };
+  }
+  const nodes = Object.keys(nodesInfo.nodes)
+    .sort() // Sorting ensures a stable node ordering for comparison
+    .map(key => nodesInfo.nodes[key])
+    .map(node => Object.assign({}, node, { name: getHumanizedNodeName(node) }));
+
+  // Aggregate incompatible ES nodes.
+  const incompatibleNodes = nodes.filter(
+    node => !esVersionCompatibleWithKibana(node.version, kibanaVersion)
+  );
+
+  // Aggregate ES nodes which should prompt a Kibana upgrade. It's acceptable
+  // if ES and Kibana versions are not the same as long as they are not
+  // incompatible, but we should warn about it.
+  // Ignore version qualifiers https://github.com/elastic/elasticsearch/issues/36859
+  const warningNodes = nodes.filter(node => !esVersionEqualsKibana(node.version, kibanaVersion));
+
+  // Note: If incompatible and warning nodes are present `message` only contains
+  // an incompatibility notice.
+  let message;
+  if (incompatibleNodes.length > 0) {
+    const incompatibleNodeNames = incompatibleNodes.map(node => node.name).join(', ');
+    if (ignoreVersionMismatch) {
+      message = `Ignoring version incompatibility between Kibana v${kibanaVersion} and the following Elasticsearch nodes: ${incompatibleNodeNames}`;
+    } else {
+      message = `This version of Kibana (v${kibanaVersion}) is incompatible with the following Elasticsearch nodes in your cluster: ${incompatibleNodeNames}`;
+    }
+  } else if (warningNodes.length > 0) {
+    const warningNodeNames = warningNodes.map(node => node.name).join(', ');
+    message =
+      `You're running Kibana ${kibanaVersion} with some different versions of ` +
+      'Elasticsearch. Update Kibana or Elasticsearch to the same ' +
+      `version to prevent compatibility issues: ${warningNodeNames}`;
+  }
+
+  return {
+    isCompatible: ignoreVersionMismatch || incompatibleNodes.length === 0,
+    message,
+    incompatibleNodes,
+    warningNodes,
+    kibanaVersion,
+  };
+}
+
+// Returns true if two NodesVersionCompatibility entries match
+function compareNodes(prev: NodesVersionCompatibility, curr: NodesVersionCompatibility) {
+  const nodesEqual = (n: NodeInfo, m: NodeInfo) => n.ip === m.ip && n.version === m.version;
+  return (
+    curr.isCompatible === prev.isCompatible &&
+    curr.incompatibleNodes.length === prev.incompatibleNodes.length &&
+    curr.warningNodes.length === prev.warningNodes.length &&
+    curr.incompatibleNodes.every((node, i) => nodesEqual(node, prev.incompatibleNodes[i])) &&
+    curr.warningNodes.every((node, i) => nodesEqual(node, prev.warningNodes[i]))
+  );
+}
+
+export const pollEsNodesVersion = ({
+  callWithInternalUser,
+  log,
+  kibanaVersion,
+  ignoreVersionMismatch,
+  esVersionCheckInterval: healthCheckInterval,
+}: PollEsNodesVersionOptions): Observable<any> => {
+  log.debug('Checking Elasticsearch version');
+  return timer(0, healthCheckInterval).pipe(
+    exhaustMap(() => {
+      return from(
+        callWithInternalUser('nodes.info', {
+          filterPath: ['nodes.*.version', 'nodes.*.http.publish_address', 'nodes.*.ip'],
+        })
+      ).pipe(
+        catchError(_err => {
+          return of({ nodes: {} });
+        })
+      );
+    }),
+    map((nodesInfo: NodesInfo) =>
+      mapNodesVersionCompatibility(nodesInfo, kibanaVersion, ignoreVersionMismatch)
+    ),
+    distinctUntilChanged(compareNodes) // Only emit if there are new nodes or versions
+  );
+};
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/is_es_compatible_with_kibana.js b/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.test.ts
similarity index 72%
rename from src/legacy/core_plugins/elasticsearch/server/lib/__tests__/is_es_compatible_with_kibana.js
rename to src/core/server/elasticsearch/version_check/es_kibana_version_compatability.test.ts
index 092c0ecf1071c..152f25c813881 100644
--- a/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/is_es_compatible_with_kibana.js
+++ b/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.test.ts
@@ -17,41 +17,39 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
-
-import isEsCompatibleWithKibana from '../is_es_compatible_with_kibana';
+import { esVersionCompatibleWithKibana } from './es_kibana_version_compatability';
 
 describe('plugins/elasticsearch', () => {
   describe('lib/is_es_compatible_with_kibana', () => {
     describe('returns false', () => {
       it('when ES major is greater than Kibana major', () => {
-        expect(isEsCompatibleWithKibana('1.0.0', '0.0.0')).to.be(false);
+        expect(esVersionCompatibleWithKibana('1.0.0', '0.0.0')).toBe(false);
       });
 
       it('when ES major is less than Kibana major', () => {
-        expect(isEsCompatibleWithKibana('0.0.0', '1.0.0')).to.be(false);
+        expect(esVersionCompatibleWithKibana('0.0.0', '1.0.0')).toBe(false);
       });
 
       it('when majors are equal, but ES minor is less than Kibana minor', () => {
-        expect(isEsCompatibleWithKibana('1.0.0', '1.1.0')).to.be(false);
+        expect(esVersionCompatibleWithKibana('1.0.0', '1.1.0')).toBe(false);
       });
     });
 
     describe('returns true', () => {
       it('when version numbers are the same', () => {
-        expect(isEsCompatibleWithKibana('1.1.1', '1.1.1')).to.be(true);
+        expect(esVersionCompatibleWithKibana('1.1.1', '1.1.1')).toBe(true);
       });
 
       it('when majors are equal, and ES minor is greater than Kibana minor', () => {
-        expect(isEsCompatibleWithKibana('1.1.0', '1.0.0')).to.be(true);
+        expect(esVersionCompatibleWithKibana('1.1.0', '1.0.0')).toBe(true);
       });
 
       it('when majors and minors are equal, and ES patch is greater than Kibana patch', () => {
-        expect(isEsCompatibleWithKibana('1.1.1', '1.1.0')).to.be(true);
+        expect(esVersionCompatibleWithKibana('1.1.1', '1.1.0')).toBe(true);
       });
 
       it('when majors and minors are equal, but ES patch is less than Kibana patch', () => {
-        expect(isEsCompatibleWithKibana('1.1.0', '1.1.1')).to.be(true);
+        expect(esVersionCompatibleWithKibana('1.1.0', '1.1.1')).toBe(true);
       });
     });
   });
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/is_es_compatible_with_kibana.js b/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.ts
similarity index 76%
rename from src/legacy/core_plugins/elasticsearch/server/lib/is_es_compatible_with_kibana.js
rename to src/core/server/elasticsearch/version_check/es_kibana_version_compatability.ts
index 4afbd488d2946..28b9c0a23e672 100644
--- a/src/legacy/core_plugins/elasticsearch/server/lib/is_es_compatible_with_kibana.js
+++ b/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.ts
@@ -17,15 +17,14 @@
  * under the License.
  */
 
+import semver, { coerce } from 'semver';
+
 /**
- * Let's weed out the ES versions that won't work with a given Kibana version.
+ * Checks for the compatibilitiy between Elasticsearch and Kibana versions
  * 1. Major version differences will never work together.
  * 2. Older versions of ES won't work with newer versions of Kibana.
  */
-
-import semver from 'semver';
-
-export default function isEsCompatibleWithKibana(esVersion, kibanaVersion) {
+export function esVersionCompatibleWithKibana(esVersion: string, kibanaVersion: string) {
   const esVersionNumbers = {
     major: semver.major(esVersion),
     minor: semver.minor(esVersion),
@@ -50,3 +49,9 @@ export default function isEsCompatibleWithKibana(esVersion, kibanaVersion) {
 
   return true;
 }
+
+export function esVersionEqualsKibana(nodeVersion: string, kibanaVersion: string) {
+  const nodeSemVer = coerce(nodeVersion);
+  const kibanaSemver = coerce(kibanaVersion);
+  return nodeSemVer && kibanaSemver && nodeSemVer.version === kibanaSemver.version;
+}
diff --git a/src/core/server/http/integration_tests/core_services.test.ts b/src/core/server/http/integration_tests/core_services.test.ts
index 65b8ba551cf91..425d8cac1893e 100644
--- a/src/core/server/http/integration_tests/core_services.test.ts
+++ b/src/core/server/http/integration_tests/core_services.test.ts
@@ -43,7 +43,7 @@ describe('http service', () => {
   describe('auth', () => {
     let root: ReturnType<typeof kbnTestServer.createRoot>;
     beforeEach(async () => {
-      root = kbnTestServer.createRoot();
+      root = kbnTestServer.createRoot({ migrations: { skip: true } });
     }, 30000);
 
     afterEach(async () => {
@@ -161,7 +161,7 @@ describe('http service', () => {
 
       let root: ReturnType<typeof kbnTestServer.createRoot>;
       beforeEach(async () => {
-        root = kbnTestServer.createRoot();
+        root = kbnTestServer.createRoot({ migrations: { skip: true } });
       }, 30000);
 
       afterEach(async () => {
@@ -295,7 +295,7 @@ describe('http service', () => {
     describe('#basePath()', () => {
       let root: ReturnType<typeof kbnTestServer.createRoot>;
       beforeEach(async () => {
-        root = kbnTestServer.createRoot();
+        root = kbnTestServer.createRoot({ migrations: { skip: true } });
       }, 30000);
 
       afterEach(async () => await root.shutdown());
@@ -324,7 +324,7 @@ describe('http service', () => {
   describe('elasticsearch', () => {
     let root: ReturnType<typeof kbnTestServer.createRoot>;
     beforeEach(async () => {
-      root = kbnTestServer.createRoot();
+      root = kbnTestServer.createRoot({ migrations: { skip: true } });
     }, 30000);
 
     afterEach(async () => {
diff --git a/src/core/server/legacy/integration_tests/legacy_service.test.ts b/src/core/server/legacy/integration_tests/legacy_service.test.ts
index da2550f2ae799..e8bcf7a42d192 100644
--- a/src/core/server/legacy/integration_tests/legacy_service.test.ts
+++ b/src/core/server/legacy/integration_tests/legacy_service.test.ts
@@ -22,7 +22,7 @@ describe('legacy service', () => {
   describe('http server', () => {
     let root: ReturnType<typeof kbnTestServer.createRoot>;
     beforeEach(() => {
-      root = kbnTestServer.createRoot();
+      root = kbnTestServer.createRoot({ migrations: { skip: true } });
     }, 30000);
 
     afterEach(async () => await root.shutdown());
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
index b89abc596ad18..c6a72eb53d6c4 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
@@ -59,12 +59,6 @@ describe('KibanaMigrator', () => {
   });
 
   describe('runMigrations', () => {
-    it('resolves isMigrated if migrations were skipped', async () => {
-      const skipMigrations = true;
-      const result = await new KibanaMigrator(mockOptions()).runMigrations(skipMigrations);
-      expect(result).toEqual([{ status: 'skipped' }, { status: 'skipped' }]);
-    });
-
     it('only runs migrations once if called multiple times', async () => {
       const options = mockOptions();
       const clusterStub = jest.fn<any, any>(() => ({ status: 404 }));
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
index c35e8dd90b5b1..747b48a540109 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
@@ -107,24 +107,15 @@ export class KibanaMigrator {
    *    The promise resolves with an array of migration statuses, one for each
    *    elasticsearch index which was migrated.
    */
-  public runMigrations(skipMigrations: boolean = false): Promise<Array<{ status: string }>> {
+  public runMigrations(): Promise<Array<{ status: string }>> {
     if (this.migrationResult === undefined) {
-      this.migrationResult = this.runMigrationsInternal(skipMigrations);
+      this.migrationResult = this.runMigrationsInternal();
     }
 
     return this.migrationResult;
   }
 
-  private runMigrationsInternal(skipMigrations: boolean) {
-    if (skipMigrations) {
-      this.log.warn(
-        'Skipping Saved Object migrations on startup. Note: Individual documents will still be migrated when read or written.'
-      );
-      return Promise.resolve(
-        Object.keys(this.mappingProperties).map(() => ({ status: 'skipped' }))
-      );
-    }
-
+  private runMigrationsInternal() {
     const kibanaIndexName = this.kibanaConfig.index;
     const indexMap = createIndexMap({
       config: this.config,
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 6668d57045a95..19798aa68928d 100644
--- a/src/core/server/saved_objects/saved_objects_service.test.ts
+++ b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -31,11 +31,14 @@ import { configServiceMock } from '../mocks';
 import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
 import { legacyServiceMock } from '../legacy/legacy_service.mock';
 import { SavedObjectsClientFactoryProvider } from './service/lib';
+import { BehaviorSubject } from 'rxjs';
+import { NodesVersionCompatibility } from '../elasticsearch/version_check/ensure_es_version';
 
 describe('SavedObjectsService', () => {
   const createSetupDeps = () => {
+    const elasticsearchMock = elasticsearchServiceMock.createInternalSetup();
     return {
-      elasticsearch: elasticsearchServiceMock.createInternalSetup(),
+      elasticsearch: elasticsearchMock,
       legacyPlugins: legacyServiceMock.createDiscoverPlugins(),
     };
   };
@@ -137,7 +140,7 @@ describe('SavedObjectsService', () => {
 
       await soService.setup(createSetupDeps());
       await soService.start({});
-      expect(migratorInstanceMock.runMigrations).toHaveBeenCalledWith(true);
+      expect(migratorInstanceMock.runMigrations).not.toHaveBeenCalled();
     });
 
     it('skips KibanaMigrator migrations when migrations.skip=true', async () => {
@@ -146,7 +149,38 @@ describe('SavedObjectsService', () => {
       const soService = new SavedObjectsService(coreContext);
       await soService.setup(createSetupDeps());
       await soService.start({});
-      expect(migratorInstanceMock.runMigrations).toHaveBeenCalledWith(true);
+      expect(migratorInstanceMock.runMigrations).not.toHaveBeenCalled();
+    });
+
+    it('waits for all es nodes to be compatible before running migrations', async done => {
+      expect.assertions(2);
+      const configService = configServiceMock.create({ atPath: { skip: false } });
+      const coreContext = mockCoreContext.create({ configService });
+      const soService = new SavedObjectsService(coreContext);
+      const setupDeps = createSetupDeps();
+      // Create an new subject so that we can control when isCompatible=true
+      // is emitted.
+      setupDeps.elasticsearch.esNodesCompatibility$ = new BehaviorSubject({
+        isCompatible: false,
+        incompatibleNodes: [],
+        warningNodes: [],
+        kibanaVersion: '8.0.0',
+      });
+      await soService.setup(setupDeps);
+      soService.start({});
+      expect(migratorInstanceMock.runMigrations).toHaveBeenCalledTimes(0);
+      ((setupDeps.elasticsearch.esNodesCompatibility$ as any) as BehaviorSubject<
+        NodesVersionCompatibility
+      >).next({
+        isCompatible: true,
+        incompatibleNodes: [],
+        warningNodes: [],
+        kibanaVersion: '8.0.0',
+      });
+      setImmediate(() => {
+        expect(migratorInstanceMock.runMigrations).toHaveBeenCalledTimes(1);
+        done();
+      });
     });
 
     it('resolves with KibanaMigrator after waiting for migrations to complete', async () => {
@@ -158,7 +192,6 @@ describe('SavedObjectsService', () => {
 
       const startContract = await soService.start({});
       expect(startContract.migrator).toBe(migratorInstanceMock);
-      expect(migratorInstanceMock.runMigrations).toHaveBeenCalledWith(false);
       expect(migratorInstanceMock.runMigrations).toHaveBeenCalledTimes(1);
     });
   });
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index b08033a19242b..0c985c71c7e2f 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -18,7 +18,7 @@
  */
 
 import { CoreService } from 'src/core/types';
-import { first } from 'rxjs/operators';
+import { first, filter, take } from 'rxjs/operators';
 import {
   SavedObjectsClient,
   SavedObjectsSchema,
@@ -283,9 +283,22 @@ export class SavedObjectsService
     const cliArgs = this.coreContext.env.cliArgs;
     const skipMigrations = cliArgs.optimize || savedObjectsConfig.skip;
 
-    this.logger.debug('Starting saved objects migration');
-    await migrator.runMigrations(skipMigrations);
-    this.logger.debug('Saved objects migration completed');
+    if (skipMigrations) {
+      this.logger.warn(
+        'Skipping Saved Object migrations on startup. Note: Individual documents will still be migrated when read or written.'
+      );
+    } else {
+      this.logger.info(
+        'Waiting until all Elasticsearch nodes are compatible with Kibana before starting saved objects migrations...'
+      );
+      await this.setupDeps!.elasticsearch.esNodesCompatibility$.pipe(
+        filter(nodes => nodes.isCompatible),
+        take(1)
+      ).toPromise();
+
+      this.logger.info('Starting saved objects migrations');
+      await migrator.runMigrations();
+    }
 
     const createRepository = (callCluster: APICaller, extraTypes: string[] = []) => {
       return SavedObjectsRepository.createRepository(
@@ -343,14 +356,14 @@ export class SavedObjectsService
       savedObjectMappings: this.mappings,
       savedObjectMigrations: this.migrations,
       savedObjectValidations: this.validations,
-      logger: this.coreContext.logger.get('migrations'),
+      logger: this.logger,
       kibanaVersion: this.coreContext.env.packageInfo.version,
       config: this.setupDeps!.legacyPlugins.pluginExtendedConfig,
       savedObjectsConfig,
       kibanaConfig,
       callCluster: migrationsRetryCallCluster(
         adminClient.callAsInternalUser,
-        this.coreContext.logger.get('migrations'),
+        this.logger,
         migrationsRetryDelay
       ),
     });
diff --git a/src/legacy/core_plugins/elasticsearch/index.d.ts b/src/legacy/core_plugins/elasticsearch/index.d.ts
index 4cbb1c82cc1e4..df713160137a6 100644
--- a/src/legacy/core_plugins/elasticsearch/index.d.ts
+++ b/src/legacy/core_plugins/elasticsearch/index.d.ts
@@ -523,6 +523,7 @@ export interface CallCluster {
 }
 
 export interface ElasticsearchPlugin {
+  status: { on: (status: string, cb: () => void) => void };
   getCluster(name: string): Cluster;
   createCluster(name: string, config: ClusterConfig): Cluster;
   waitUntilReady(): Promise<void>;
diff --git a/src/legacy/core_plugins/elasticsearch/index.js b/src/legacy/core_plugins/elasticsearch/index.js
index 5872a33d8aa08..35dd6562aed98 100644
--- a/src/legacy/core_plugins/elasticsearch/index.js
+++ b/src/legacy/core_plugins/elasticsearch/index.js
@@ -17,10 +17,10 @@
  * under the License.
  */
 import { first } from 'rxjs/operators';
-import healthCheck from './server/lib/health_check';
 import { Cluster } from './server/lib/cluster';
 import { createProxy } from './server/lib/create_proxy';
 import { handleESError } from './server/lib/handle_es_error';
+import { versionHealthCheck } from './lib/version_health_check';
 
 export default function(kibana) {
   let defaultVars;
@@ -92,15 +92,13 @@ export default function(kibana) {
 
       createProxy(server);
 
-      // Set up the health check service and start it.
-      const { start, waitUntilReady } = healthCheck(
+      const waitUntilHealthy = versionHealthCheck(
         this,
-        server,
-        esConfig.healthCheckDelay.asMilliseconds(),
-        esConfig.ignoreVersionMismatch
+        server.logWithMetadata,
+        server.newPlatform.__internals.elasticsearch.esNodesCompatibility$
       );
-      server.expose('waitUntilReady', waitUntilReady);
-      start();
+
+      server.expose('waitUntilReady', () => waitUntilHealthy);
     },
   });
 }
diff --git a/src/legacy/core_plugins/elasticsearch/integration_tests/elasticsearch.test.ts b/src/legacy/core_plugins/elasticsearch/integration_tests/elasticsearch.test.ts
new file mode 100644
index 0000000000000..5806c31b78414
--- /dev/null
+++ b/src/legacy/core_plugins/elasticsearch/integration_tests/elasticsearch.test.ts
@@ -0,0 +1,89 @@
+/*
+ * 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 {
+  createTestServers,
+  TestElasticsearchUtils,
+  TestKibanaUtils,
+  TestUtils,
+  createRootWithCorePlugins,
+  getKbnServer,
+} from '../../../../test_utils/kbn_server';
+
+import { BehaviorSubject } from 'rxjs';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { NodesVersionCompatibility } from 'src/core/server/elasticsearch/version_check/ensure_es_version';
+
+describe('Elasticsearch plugin', () => {
+  let servers: TestUtils;
+  let esServer: TestElasticsearchUtils;
+  let root: TestKibanaUtils['root'];
+  let elasticsearch: TestKibanaUtils['kbnServer']['server']['plugins']['elasticsearch'];
+
+  const esNodesCompatibility$ = new BehaviorSubject<NodesVersionCompatibility>({
+    isCompatible: true,
+    incompatibleNodes: [],
+    warningNodes: [],
+    kibanaVersion: '8.0.0',
+  });
+
+  beforeAll(async function() {
+    const settings = {
+      elasticsearch: {},
+      adjustTimeout: (t: any) => {
+        jest.setTimeout(t);
+      },
+    };
+    servers = createTestServers(settings);
+    esServer = await servers.startES();
+
+    const elasticsearchSettings = {
+      hosts: esServer.hosts,
+      username: esServer.username,
+      password: esServer.password,
+    };
+    root = createRootWithCorePlugins({ elasticsearch: elasticsearchSettings });
+
+    const setup = await root.setup();
+    setup.elasticsearch.esNodesCompatibility$ = esNodesCompatibility$;
+    await root.start();
+
+    elasticsearch = getKbnServer(root).server.plugins.elasticsearch;
+  });
+
+  afterAll(async () => {
+    await esServer.stop();
+    await root.shutdown();
+  }, 30000);
+
+  it("should set it's status to green when all nodes are compatible", done => {
+    jest.setTimeout(30000);
+    elasticsearch.status.on('green', () => done());
+  });
+
+  it("should set it's status to red when some nodes aren't compatible", done => {
+    esNodesCompatibility$.next({
+      isCompatible: false,
+      incompatibleNodes: [],
+      warningNodes: [],
+      kibanaVersion: '8.0.0',
+    });
+    elasticsearch.status.on('red', () => done());
+  });
+});
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/kibana_version.js b/src/legacy/core_plugins/elasticsearch/lib/version_health_check.js
similarity index 57%
rename from src/legacy/core_plugins/elasticsearch/server/lib/kibana_version.js
rename to src/legacy/core_plugins/elasticsearch/lib/version_health_check.js
index 344dbbb5bdf69..4ee8307f490eb 100644
--- a/src/legacy/core_plugins/elasticsearch/server/lib/kibana_version.js
+++ b/src/legacy/core_plugins/elasticsearch/lib/version_health_check.js
@@ -17,11 +17,23 @@
  * under the License.
  */
 
-import { version as kibanaVersion } from '../../../../../../package.json';
+export const versionHealthCheck = (esPlugin, logWithMetadata, esNodesCompatibility$) => {
+  esPlugin.status.yellow('Waiting for Elasticsearch');
 
-export default {
-  // Make the version stubbable to improve testability.
-  get() {
-    return kibanaVersion;
-  },
+  return new Promise(resolve => {
+    esNodesCompatibility$.subscribe(({ isCompatible, message, kibanaVersion, warningNodes }) => {
+      if (!isCompatible) {
+        esPlugin.status.red(message);
+      } else {
+        if (message) {
+          logWithMetadata(['warning'], message, {
+            kibanaVersion,
+            nodes: warningNodes,
+          });
+        }
+        esPlugin.status.green('Ready');
+        resolve();
+      }
+    });
+  });
 };
diff --git a/src/legacy/core_plugins/elasticsearch/lib/version_health_check.test.js b/src/legacy/core_plugins/elasticsearch/lib/version_health_check.test.js
new file mode 100644
index 0000000000000..ba7c95bcdfec5
--- /dev/null
+++ b/src/legacy/core_plugins/elasticsearch/lib/version_health_check.test.js
@@ -0,0 +1,71 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { versionHealthCheck } from './version_health_check';
+import { Subject } from 'rxjs';
+
+describe('plugins/elasticsearch', () => {
+  describe('lib/health_version_check', function() {
+    let plugin;
+    let logWithMetadata;
+
+    beforeEach(() => {
+      plugin = {
+        status: {
+          red: jest.fn(),
+          green: jest.fn(),
+          yellow: jest.fn(),
+        },
+      };
+
+      logWithMetadata = jest.fn();
+      jest.clearAllMocks();
+    });
+
+    it('returned promise resolves when all nodes are compatible ', function() {
+      const esNodesCompatibility$ = new Subject();
+      const versionHealthyPromise = versionHealthCheck(
+        plugin,
+        logWithMetadata,
+        esNodesCompatibility$
+      );
+      esNodesCompatibility$.next({ isCompatible: true, message: undefined });
+      return expect(versionHealthyPromise).resolves.toBe(undefined);
+    });
+
+    it('should set elasticsearch plugin status to green when all nodes are compatible', function() {
+      const esNodesCompatibility$ = new Subject();
+      versionHealthCheck(plugin, logWithMetadata, esNodesCompatibility$);
+      expect(plugin.status.yellow).toHaveBeenCalledWith('Waiting for Elasticsearch');
+      expect(plugin.status.green).not.toHaveBeenCalled();
+      esNodesCompatibility$.next({ isCompatible: true, message: undefined });
+      expect(plugin.status.green).toHaveBeenCalledWith('Ready');
+      expect(plugin.status.red).not.toHaveBeenCalled();
+    });
+
+    it('should set elasticsearch plugin status to red when some nodes are incompatible', function() {
+      const esNodesCompatibility$ = new Subject();
+      versionHealthCheck(plugin, logWithMetadata, esNodesCompatibility$);
+      expect(plugin.status.yellow).toHaveBeenCalledWith('Waiting for Elasticsearch');
+      expect(plugin.status.red).not.toHaveBeenCalled();
+      esNodesCompatibility$.next({ isCompatible: false, message: 'your nodes are incompatible' });
+      expect(plugin.status.red).toHaveBeenCalledWith('your nodes are incompatible');
+      expect(plugin.status.green).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/ensure_es_version.js b/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/ensure_es_version.js
deleted file mode 100644
index 781d198c66236..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/ensure_es_version.js
+++ /dev/null
@@ -1,223 +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 Bluebird from 'bluebird';
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-
-import { esTestConfig } from '@kbn/test';
-import { ensureEsVersion } from '../ensure_es_version';
-
-describe('plugins/elasticsearch', () => {
-  describe('lib/ensure_es_version', () => {
-    const KIBANA_VERSION = '5.1.0';
-
-    let server;
-
-    beforeEach(function() {
-      server = {
-        log: sinon.stub(),
-        logWithMetadata: sinon.stub(),
-        plugins: {
-          elasticsearch: {
-            getCluster: sinon
-              .stub()
-              .withArgs('admin')
-              .returns({ callWithInternalUser: sinon.stub() }),
-            status: {
-              red: sinon.stub(),
-            },
-            url: esTestConfig.getUrl(),
-          },
-        },
-        config() {
-          return {
-            get: sinon.stub(),
-          };
-        },
-      };
-    });
-
-    function setNodes(/* ...versions */) {
-      const versions = _.shuffle(arguments);
-      const nodes = {};
-      let i = 0;
-
-      while (versions.length) {
-        const name = 'node-' + ++i;
-        const version = versions.shift();
-
-        const node = {
-          version: version,
-          http: {
-            publish_address: 'http_address',
-          },
-          ip: 'ip',
-        };
-
-        if (!_.isString(version)) _.assign(node, version);
-        nodes[name] = node;
-      }
-
-      const cluster = server.plugins.elasticsearch.getCluster('admin');
-      cluster.callWithInternalUser
-        .withArgs('nodes.info', sinon.match.any)
-        .returns(Bluebird.resolve({ nodes: nodes }));
-    }
-
-    function setNodeWithoutHTTP(version) {
-      const nodes = { 'node-without-http': { version, ip: 'ip' } };
-      const cluster = server.plugins.elasticsearch.getCluster('admin');
-      cluster.callWithInternalUser
-        .withArgs('nodes.info', sinon.match.any)
-        .returns(Bluebird.resolve({ nodes: nodes }));
-    }
-
-    it('returns true with single a node that matches', async () => {
-      setNodes('5.1.0');
-      const result = await ensureEsVersion(server, KIBANA_VERSION);
-      expect(result).to.be(true);
-    });
-
-    it('returns true with multiple nodes that satisfy', async () => {
-      setNodes('5.1.0', '5.2.0', '5.1.1-Beta1');
-      const result = await ensureEsVersion(server, KIBANA_VERSION);
-      expect(result).to.be(true);
-    });
-
-    it('throws an error with a single node that is out of date', async () => {
-      // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana.
-      setNodes('5.1.0', '5.2.0', '5.0.0');
-      try {
-        await ensureEsVersion(server, KIBANA_VERSION);
-      } catch (e) {
-        expect(e).to.be.a(Error);
-      }
-    });
-
-    it('does not throw on outdated nodes, if `ignoreVersionMismatch` is enabled in development mode', async () => {
-      // set config values
-      server.config = () => ({
-        get: name => {
-          switch (name) {
-            case 'env.dev':
-              return true;
-            default:
-              throw new Error(`Unknown option "${name}"`);
-          }
-        },
-      });
-
-      // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana.
-      setNodes('5.1.0', '5.2.0', '5.0.0');
-
-      const ignoreVersionMismatch = true;
-      const result = await ensureEsVersion(server, KIBANA_VERSION, ignoreVersionMismatch);
-      expect(result).to.be(true);
-    });
-
-    it('throws an error if `ignoreVersionMismatch` is enabled in production mode', async () => {
-      // set config values
-      server.config = () => ({
-        get: name => {
-          switch (name) {
-            case 'env.dev':
-              return false;
-            default:
-              throw new Error(`Unknown option "${name}"`);
-          }
-        },
-      });
-
-      // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana.
-      setNodes('5.1.0', '5.2.0', '5.0.0');
-
-      try {
-        const ignoreVersionMismatch = true;
-        await ensureEsVersion(server, KIBANA_VERSION, ignoreVersionMismatch);
-      } catch (e) {
-        expect(e).to.be.a(Error);
-      }
-    });
-
-    it('fails if that single node is a client node', async () => {
-      setNodes('5.1.0', '5.2.0', { version: '5.0.0', attributes: { client: 'true' } });
-      try {
-        await ensureEsVersion(server, KIBANA_VERSION);
-      } catch (e) {
-        expect(e).to.be.a(Error);
-      }
-    });
-
-    it('warns if a node is only off by a patch version', async () => {
-      setNodes('5.1.1');
-      await ensureEsVersion(server, KIBANA_VERSION);
-      sinon.assert.callCount(server.logWithMetadata, 2);
-      expect(server.logWithMetadata.getCall(0).args[0]).to.contain('debug');
-      expect(server.logWithMetadata.getCall(1).args[0]).to.contain('warning');
-    });
-
-    it('warns if a node is off by a patch version and without http publish address', async () => {
-      setNodeWithoutHTTP('5.1.1');
-      await ensureEsVersion(server, KIBANA_VERSION);
-      sinon.assert.callCount(server.logWithMetadata, 2);
-      expect(server.logWithMetadata.getCall(0).args[0]).to.contain('debug');
-      expect(server.logWithMetadata.getCall(1).args[0]).to.contain('warning');
-    });
-
-    it('errors if a node incompatible and without http publish address', async () => {
-      setNodeWithoutHTTP('6.1.1');
-      try {
-        await ensureEsVersion(server, KIBANA_VERSION);
-      } catch (e) {
-        expect(e.message).to.contain('incompatible nodes');
-        expect(e).to.be.a(Error);
-      }
-    });
-
-    it('only warns once per node list', async () => {
-      setNodes('5.1.1');
-
-      await ensureEsVersion(server, KIBANA_VERSION);
-      sinon.assert.callCount(server.logWithMetadata, 2);
-      expect(server.logWithMetadata.getCall(0).args[0]).to.contain('debug');
-      expect(server.logWithMetadata.getCall(1).args[0]).to.contain('warning');
-
-      await ensureEsVersion(server, KIBANA_VERSION);
-      sinon.assert.callCount(server.logWithMetadata, 3);
-      expect(server.logWithMetadata.getCall(2).args[0]).to.contain('debug');
-    });
-
-    it('warns again if the node list changes', async () => {
-      setNodes('5.1.1');
-
-      await ensureEsVersion(server, KIBANA_VERSION);
-      sinon.assert.callCount(server.logWithMetadata, 2);
-      expect(server.logWithMetadata.getCall(0).args[0]).to.contain('debug');
-      expect(server.logWithMetadata.getCall(1).args[0]).to.contain('warning');
-
-      setNodes('5.1.2');
-      await ensureEsVersion(server, KIBANA_VERSION);
-      sinon.assert.callCount(server.logWithMetadata, 4);
-      expect(server.logWithMetadata.getCall(2).args[0]).to.contain('debug');
-      expect(server.logWithMetadata.getCall(3).args[0]).to.contain('warning');
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/health_check.js b/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/health_check.js
deleted file mode 100644
index 3b593c6352394..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/health_check.js
+++ /dev/null
@@ -1,151 +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 Bluebird from 'bluebird';
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-
-const NoConnections = require('elasticsearch').errors.NoConnections;
-
-import healthCheck from '../health_check';
-import kibanaVersion from '../kibana_version';
-
-const esPort = 9220;
-
-describe('plugins/elasticsearch', () => {
-  describe('lib/health_check', function() {
-    let health;
-    let plugin;
-    let cluster;
-    let server;
-    const sandbox = sinon.createSandbox();
-
-    function getTimerCount() {
-      return Object.keys(sandbox.clock.timers || {}).length;
-    }
-
-    beforeEach(() => {
-      sandbox.useFakeTimers();
-      const COMPATIBLE_VERSION_NUMBER = '5.0.0';
-
-      // Stub the Kibana version instead of drawing from package.json.
-      sandbox.stub(kibanaVersion, 'get').returns(COMPATIBLE_VERSION_NUMBER);
-
-      // setup the plugin stub
-      plugin = {
-        name: 'elasticsearch',
-        status: {
-          red: sinon.stub(),
-          green: sinon.stub(),
-          yellow: sinon.stub(),
-        },
-      };
-
-      cluster = { callWithInternalUser: sinon.stub(), errors: { NoConnections } };
-      cluster.callWithInternalUser.withArgs('index', sinon.match.any).returns(Bluebird.resolve());
-      cluster.callWithInternalUser
-        .withArgs('mget', sinon.match.any)
-        .returns(Bluebird.resolve({ ok: true }));
-      cluster.callWithInternalUser
-        .withArgs('get', sinon.match.any)
-        .returns(Bluebird.resolve({ found: false }));
-      cluster.callWithInternalUser
-        .withArgs('search', sinon.match.any)
-        .returns(Bluebird.resolve({ hits: { hits: [] } }));
-      cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any).returns(
-        Bluebird.resolve({
-          nodes: {
-            'node-01': {
-              version: COMPATIBLE_VERSION_NUMBER,
-              http_address: `inet[/127.0.0.1:${esPort}]`,
-              ip: '127.0.0.1',
-            },
-          },
-        })
-      );
-
-      // Setup the server mock
-      server = {
-        logWithMetadata: sinon.stub(),
-        info: { port: 5601 },
-        config: () => ({ get: sinon.stub() }),
-        plugins: {
-          elasticsearch: {
-            getCluster: sinon.stub().returns(cluster),
-          },
-        },
-        ext: sinon.stub(),
-      };
-
-      health = healthCheck(plugin, server, 0);
-    });
-
-    afterEach(() => sandbox.restore());
-
-    it('should stop when cluster is shutdown', () => {
-      // ensure that health.start() is responsible for the timer we are observing
-      expect(getTimerCount()).to.be(0);
-      health.start();
-      expect(getTimerCount()).to.be(1);
-
-      // ensure that a server extension was registered
-      sinon.assert.calledOnce(server.ext);
-      sinon.assert.calledWithExactly(server.ext, sinon.match.string, sinon.match.func);
-
-      const [, handler] = server.ext.firstCall.args;
-      handler(); // this should be health.stop
-
-      // ensure that the handler unregistered the timer
-      expect(getTimerCount()).to.be(0);
-    });
-
-    it('should set the cluster green if everything is ready', function() {
-      cluster.callWithInternalUser.withArgs('ping').returns(Bluebird.resolve());
-
-      return health.run().then(function() {
-        sinon.assert.calledOnce(plugin.status.yellow);
-        sinon.assert.calledWithExactly(plugin.status.yellow, 'Waiting for Elasticsearch');
-
-        sinon.assert.calledOnce(
-          cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any)
-        );
-        sinon.assert.notCalled(plugin.status.red);
-        sinon.assert.calledOnce(plugin.status.green);
-        sinon.assert.calledWithExactly(plugin.status.green, 'Ready');
-      });
-    });
-
-    describe('#waitUntilReady', function() {
-      it('waits for green status', function() {
-        plugin.status.once = sinon.spy(function(event, handler) {
-          expect(event).to.be('green');
-          setImmediate(handler);
-        });
-
-        const waitUntilReadyPromise = health.waitUntilReady();
-
-        sandbox.clock.runAll();
-
-        return waitUntilReadyPromise.then(function() {
-          sinon.assert.calledOnce(plugin.status.once);
-        });
-      });
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/ensure_es_version.js b/src/legacy/core_plugins/elasticsearch/server/lib/ensure_es_version.js
deleted file mode 100644
index 8d304cd558418..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/server/lib/ensure_es_version.js
+++ /dev/null
@@ -1,126 +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.
- */
-
-/**
- * ES and Kibana versions are locked, so Kibana should require that ES has the same version as
- * that defined in Kibana's package.json.
- */
-
-import { forEach, get } from 'lodash';
-import { coerce } from 'semver';
-import isEsCompatibleWithKibana from './is_es_compatible_with_kibana';
-
-/**
- * tracks the node descriptions that get logged in warnings so
- * that we don't spam the log with the same message over and over.
- *
- * There are situations, like in testing or multi-tenancy, where
- * the server argument changes, so we must track the previous
- * node warnings per server
- */
-const lastWarnedNodesForServer = new WeakMap();
-
-export function ensureEsVersion(server, kibanaVersion, ignoreVersionMismatch = false) {
-  const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
-
-  server.logWithMetadata(['plugin', 'debug'], 'Checking Elasticsearch version');
-  return callWithInternalUser('nodes.info', {
-    filterPath: ['nodes.*.version', 'nodes.*.http.publish_address', 'nodes.*.ip'],
-  }).then(function(info) {
-    // Aggregate incompatible ES nodes.
-    const incompatibleNodes = [];
-
-    // Aggregate ES nodes which should prompt a Kibana upgrade.
-    const warningNodes = [];
-
-    forEach(info.nodes, esNode => {
-      if (!isEsCompatibleWithKibana(esNode.version, kibanaVersion)) {
-        // Exit early to avoid collecting ES nodes with newer major versions in the `warningNodes`.
-        return incompatibleNodes.push(esNode);
-      }
-
-      // It's acceptable if ES and Kibana versions are not the same so long as
-      // they are not incompatible, but we should warn about it
-
-      // Ignore version qualifiers
-      // https://github.com/elastic/elasticsearch/issues/36859
-      const looseMismatch = coerce(esNode.version).version !== coerce(kibanaVersion).version;
-      if (looseMismatch) {
-        warningNodes.push(esNode);
-      }
-    });
-
-    function getHumanizedNodeNames(nodes) {
-      return nodes.map(node => {
-        const publishAddress = get(node, 'http.publish_address')
-          ? get(node, 'http.publish_address') + ' '
-          : '';
-        return 'v' + node.version + ' @ ' + publishAddress + '(' + node.ip + ')';
-      });
-    }
-
-    if (warningNodes.length) {
-      const simplifiedNodes = warningNodes.map(node => ({
-        version: node.version,
-        http: {
-          publish_address: get(node, 'http.publish_address'),
-        },
-        ip: node.ip,
-      }));
-
-      // Don't show the same warning over and over again.
-      const warningNodeNames = getHumanizedNodeNames(simplifiedNodes).join(', ');
-      if (lastWarnedNodesForServer.get(server) !== warningNodeNames) {
-        lastWarnedNodesForServer.set(server, warningNodeNames);
-        server.logWithMetadata(
-          ['warning'],
-          `You're running Kibana ${kibanaVersion} with some different versions of ` +
-            'Elasticsearch. Update Kibana or Elasticsearch to the same ' +
-            `version to prevent compatibility issues: ${warningNodeNames}`,
-          {
-            kibanaVersion,
-            nodes: simplifiedNodes,
-          }
-        );
-      }
-    }
-
-    if (incompatibleNodes.length && !shouldIgnoreVersionMismatch(server, ignoreVersionMismatch)) {
-      const incompatibleNodeNames = getHumanizedNodeNames(incompatibleNodes);
-      throw new Error(
-        `This version of Kibana requires Elasticsearch v` +
-          `${kibanaVersion} on all nodes. I found ` +
-          `the following incompatible nodes in your cluster: ${incompatibleNodeNames.join(', ')}`
-      );
-    }
-
-    return true;
-  });
-}
-
-function shouldIgnoreVersionMismatch(server, ignoreVersionMismatch) {
-  const isDevMode = server.config().get('env.dev');
-  if (!isDevMode && ignoreVersionMismatch) {
-    throw new Error(
-      `Option "elasticsearch.ignoreVersionMismatch" can only be used in development mode`
-    );
-  }
-
-  return isDevMode && ignoreVersionMismatch;
-}
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/health_check.js b/src/legacy/core_plugins/elasticsearch/server/lib/health_check.js
deleted file mode 100644
index 40053ec774542..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/server/lib/health_check.js
+++ /dev/null
@@ -1,75 +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 Bluebird from 'bluebird';
-import kibanaVersion from './kibana_version';
-import { ensureEsVersion } from './ensure_es_version';
-
-export default function(plugin, server, requestDelay, ignoreVersionMismatch) {
-  plugin.status.yellow('Waiting for Elasticsearch');
-
-  function waitUntilReady() {
-    return new Bluebird(resolve => {
-      plugin.status.once('green', resolve);
-    });
-  }
-
-  function check() {
-    return ensureEsVersion(server, kibanaVersion.get(), ignoreVersionMismatch)
-      .then(() => plugin.status.green('Ready'))
-      .catch(err => plugin.status.red(err));
-  }
-
-  let timeoutId = null;
-
-  function scheduleCheck(ms) {
-    if (timeoutId) return;
-
-    const myId = setTimeout(function() {
-      check().finally(function() {
-        if (timeoutId === myId) startorRestartChecking();
-      });
-    }, ms);
-
-    timeoutId = myId;
-  }
-
-  function startorRestartChecking() {
-    scheduleCheck(stopChecking() ? requestDelay : 1);
-  }
-
-  function stopChecking() {
-    if (!timeoutId) return false;
-    clearTimeout(timeoutId);
-    timeoutId = null;
-    return true;
-  }
-
-  server.ext('onPreStop', stopChecking);
-
-  return {
-    waitUntilReady: waitUntilReady,
-    run: check,
-    start: startorRestartChecking,
-    stop: stopChecking,
-    isRunning: function() {
-      return !!timeoutId;
-    },
-  };
-}
diff --git a/src/legacy/server/http/integration_tests/default_route_provider.test.ts b/src/legacy/server/http/integration_tests/default_route_provider.test.ts
index 4898cb2b67852..d91438d904558 100644
--- a/src/legacy/server/http/integration_tests/default_route_provider.test.ts
+++ b/src/legacy/server/http/integration_tests/default_route_provider.test.ts
@@ -29,7 +29,7 @@ let mockDefaultRouteSetting: any = '';
 describe('default route provider', () => {
   let root: Root;
   beforeAll(async () => {
-    root = kbnTestServer.createRoot();
+    root = kbnTestServer.createRoot({ migrations: { skip: true } });
 
     await root.setup();
     await root.start();
diff --git a/src/legacy/server/http/integration_tests/default_route_provider_config.test.ts b/src/legacy/server/http/integration_tests/default_route_provider_config.test.ts
index da785a59893ab..8365941cbeb10 100644
--- a/src/legacy/server/http/integration_tests/default_route_provider_config.test.ts
+++ b/src/legacy/server/http/integration_tests/default_route_provider_config.test.ts
@@ -30,6 +30,7 @@ describe('default route provider', () => {
       server: {
         defaultRoute: '/app/some/default/route',
       },
+      migrations: { skip: true },
     });
 
     await root.setup();
diff --git a/src/legacy/server/http/integration_tests/max_payload_size.test.js b/src/legacy/server/http/integration_tests/max_payload_size.test.js
index 4408f0141bb21..7f22f83c78f0e 100644
--- a/src/legacy/server/http/integration_tests/max_payload_size.test.js
+++ b/src/legacy/server/http/integration_tests/max_payload_size.test.js
@@ -21,7 +21,7 @@ import * as kbnTestServer from '../../../../test_utils/kbn_server';
 
 let root;
 beforeAll(async () => {
-  root = kbnTestServer.createRoot({ server: { maxPayloadBytes: 100 } });
+  root = kbnTestServer.createRoot({ server: { maxPayloadBytes: 100 }, migrations: { skip: true } });
 
   await root.setup();
   await root.start();
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 776275715921b..92be88b91c652 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
@@ -108,7 +108,10 @@ describe('onPostAuthInterceptor', () => {
     availableSpaces: any[],
     testOptions = { simulateGetSpacesFailure: false, simulateGetSingleSpaceFailure: false }
   ) {
-    const { http } = await root.setup();
+    const { http, elasticsearch } = await root.setup();
+
+    // Mock esNodesCompatibility$ to prevent `root.start()` from blocking on ES version check
+    elasticsearch.esNodesCompatibility$ = elasticsearchServiceMock.createInternalSetup().esNodesCompatibility$;
 
     const loggingMock = loggingServiceMock
       .create()
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
index d6ff4a20052e4..5e6cf67ee8c90 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
@@ -17,6 +17,7 @@ import {
 
 import * as kbnTestServer from '../../../../../../src/test_utils/kbn_server';
 import { LegacyAPI } from '../../plugin';
+import { elasticsearchServiceMock } from 'src/core/server/mocks';
 
 describe('onRequestInterceptor', () => {
   let root: ReturnType<typeof kbnTestServer.createRoot>;
@@ -104,7 +105,9 @@ describe('onRequestInterceptor', () => {
     routes: 'legacy' | 'new-platform';
   }
   async function setup(opts: SetupOpts = { basePath: '/', routes: 'legacy' }) {
-    const { http } = await root.setup();
+    const { http, elasticsearch } = await root.setup();
+    // Mock esNodesCompatibility$ to prevent `root.start()` from blocking on ES version check
+    elasticsearch.esNodesCompatibility$ = elasticsearchServiceMock.createInternalSetup().esNodesCompatibility$;
 
     initSpacesOnRequestInterceptor({
       getLegacyAPI: () =>

From 2260e7cdbe2da24bfa13866fc37bcdbc8793dd74 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Fri, 31 Jan 2020 18:10:34 +0100
Subject: [PATCH 13/26] [Uptime] Added location overview in monitor in status
 column (#55720)

* Reintroduce a column for url.

* Reintroduce original URL column.

* added location overview column

* fix types

* update snaps

* Update busted test snapshots.

* Update x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_status_column.tsx

Co-Authored-By: Justin Kambic <justin.kambic@elastic.co>

* update test

* rename

* update mobile layout

* update column laytout

* fixed i18n

* remove icon

Co-authored-by: Justin Kambic <justin.kambic@elastic.co>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../uptime/common/constants/constants.ts      |   7 -
 .../plugins/uptime/common/constants/index.ts  |   2 +-
 .../plugins/uptime/common/constants/ui.ts     |  33 +++
 .../monitor_bar_series.test.tsx.snap          |   1 +
 .../functional/charts/monitor_bar_series.tsx  |   2 +-
 .../location_map/location_status_tags.tsx     |  24 +-
 .../__snapshots__/monitor_list.test.tsx.snap  |  26 +-
 .../monitor_list_pagination.test.tsx.snap     |  24 +-
 .../monitor_list_status_column.test.tsx.snap  | 239 ++++++++++++++---
 .../monitor_list_status_column.test.tsx       | 241 +++++++++++++++++-
 .../functional/monitor_list/monitor_list.tsx  |  31 ++-
 .../monitor_status_list.tsx                   |  13 +-
 .../monitor_status_row.tsx                    |   7 +-
 .../monitor_list_status_column.tsx            | 127 +++++++--
 .../functional/monitor_list/translations.ts   |   8 +
 15 files changed, 662 insertions(+), 123 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/uptime/common/constants/constants.ts
 create mode 100644 x-pack/legacy/plugins/uptime/common/constants/ui.ts

diff --git a/x-pack/legacy/plugins/uptime/common/constants/constants.ts b/x-pack/legacy/plugins/uptime/common/constants/constants.ts
deleted file mode 100644
index 0c35bc9734486..0000000000000
--- a/x-pack/legacy/plugins/uptime/common/constants/constants.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 const UNNAMED_LOCATION = 'Unnamed-location';
diff --git a/x-pack/legacy/plugins/uptime/common/constants/index.ts b/x-pack/legacy/plugins/uptime/common/constants/index.ts
index 0a95960825f02..9d5ad4607491c 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/index.ts
@@ -11,4 +11,4 @@ export { INDEX_NAMES } from './index_names';
 export * from './capabilities';
 export { PLUGIN } from './plugin';
 export { QUERY, STATES } from './query';
-export * from './constants';
+export * from './ui';
diff --git a/x-pack/legacy/plugins/uptime/common/constants/ui.ts b/x-pack/legacy/plugins/uptime/common/constants/ui.ts
new file mode 100644
index 0000000000000..c91a2f6625194
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/common/constants/ui.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.
+ */
+
+export enum STATUS {
+  UP = 'up',
+  DOWN = 'down',
+}
+
+export const UNNAMED_LOCATION = 'Unnamed-location';
+
+export const SHORT_TS_LOCALE = 'en-short-locale';
+
+export const SHORT_TIMESPAN_LOCALE = {
+  relativeTime: {
+    future: 'in %s',
+    past: '%s ago',
+    s: '%ds',
+    ss: '%ss',
+    m: '%dm',
+    mm: '%dm',
+    h: '%dh',
+    hh: '%dh',
+    d: '%dd',
+    dd: '%dd',
+    M: '%d Mon',
+    MM: '%d Mon',
+    y: '%d Yr',
+    yy: '%d Yr',
+  },
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
index 78b2bfdecb87a..c3b99c9785cbe 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`MonitorBarSeries component renders a series when there are down items 1
   style={
     Object {
       "height": 50,
+      "marginRight": 15,
       "maxWidth": "1200px",
       "width": "100%",
     }
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
index a0cbdc5922123..ce91bf5b1638f 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
@@ -53,7 +53,7 @@ export const MonitorBarSeries = ({
   const id = 'downSeries';
 
   return seriesHasDownValues(histogramSeries) ? (
-    <div style={{ height: 50, width: '100%', maxWidth: '1200px' }}>
+    <div style={{ height: 50, width: '100%', maxWidth: '1200px', marginRight: 15 }}>
       <Chart>
         <Settings xDomain={{ min: absoluteStartDate, max: absoluteEndDate }} />
         <Axis
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
index 6955bf198eae0..7f5f1d5c3b323 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
@@ -11,6 +11,7 @@ import { EuiBadge, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { UptimeThemeContext } from '../../../contexts';
 import { MonitorLocation } from '../../../../common/runtime_types';
+import { SHORT_TIMESPAN_LOCALE, SHORT_TS_LOCALE } from '../../../../common/constants';
 
 const TimeStampSpan = styled.span`
   display: inline-block;
@@ -89,24 +90,11 @@ export const LocationStatusTags = ({ locations }: Props) => {
   const prevLocal: string = moment.locale() ?? 'en';
 
   const renderTags = () => {
-    moment.defineLocale('en-tag', {
-      relativeTime: {
-        future: 'in %s',
-        past: '%s ago',
-        s: '%ds',
-        ss: '%ss',
-        m: '%dm',
-        mm: '%dm',
-        h: '%dh',
-        hh: '%dh',
-        d: '%dd',
-        dd: '%dd',
-        M: '%d Mon',
-        MM: '%d Mon',
-        y: '%d Yr',
-        yy: '%d Yr',
-      },
-    });
+    const shortLocale = moment.locale(SHORT_TS_LOCALE) === SHORT_TS_LOCALE;
+    if (!shortLocale) {
+      moment.defineLocale(SHORT_TS_LOCALE, SHORT_TIMESPAN_LOCALE);
+    }
+
     const tags = (
       <TagContainer>
         <span>{downLocations.map((item, ind) => tagLabel(item, ind, danger))}</span>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
index 1de49f1223699..f779efca7b18a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
@@ -24,20 +24,24 @@ exports[`MonitorList component renders a no items message when no data is provid
           Object {
             "align": "left",
             "field": "state.monitor.status",
+            "mobileOptions": Object {
+              "fullWidth": true,
+            },
             "name": "Status",
             "render": [Function],
-            "width": "20%",
           },
           Object {
             "align": "left",
             "field": "state.monitor.name",
+            "mobileOptions": Object {
+              "fullWidth": true,
+            },
             "name": "Name",
             "render": [Function],
             "sortable": true,
-            "width": "30%",
           },
           Object {
-            "aligh": "left",
+            "align": "left",
             "field": "state.url.full",
             "name": "Url",
             "render": [Function],
@@ -58,6 +62,7 @@ exports[`MonitorList component renders a no items message when no data is provid
             "name": "",
             "render": [Function],
             "sortable": true,
+            "width": "24px",
           },
         ]
       }
@@ -83,6 +88,7 @@ exports[`MonitorList component renders a no items message when no data is provid
         <OverviewPageLink
           dataTestSubj="xpack.uptime.monitorList.prevButton"
           direction="prev"
+          pagination=""
         />
       </EuiFlexItem>
       <EuiFlexItem
@@ -91,6 +97,7 @@ exports[`MonitorList component renders a no items message when no data is provid
         <OverviewPageLink
           dataTestSubj="xpack.uptime.monitorList.nextButton"
           direction="next"
+          pagination=""
         />
       </EuiFlexItem>
     </EuiFlexGroup>
@@ -122,20 +129,24 @@ exports[`MonitorList component renders the monitor list 1`] = `
           Object {
             "align": "left",
             "field": "state.monitor.status",
+            "mobileOptions": Object {
+              "fullWidth": true,
+            },
             "name": "Status",
             "render": [Function],
-            "width": "20%",
           },
           Object {
             "align": "left",
             "field": "state.monitor.name",
+            "mobileOptions": Object {
+              "fullWidth": true,
+            },
             "name": "Name",
             "render": [Function],
             "sortable": true,
-            "width": "30%",
           },
           Object {
-            "aligh": "left",
+            "align": "left",
             "field": "state.url.full",
             "name": "Url",
             "render": [Function],
@@ -156,6 +167,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             "name": "",
             "render": [Function],
             "sortable": true,
+            "width": "24px",
           },
         ]
       }
@@ -243,6 +255,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
         <OverviewPageLink
           dataTestSubj="xpack.uptime.monitorList.prevButton"
           direction="prev"
+          pagination=""
         />
       </EuiFlexItem>
       <EuiFlexItem
@@ -251,6 +264,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
         <OverviewPageLink
           dataTestSubj="xpack.uptime.monitorList.nextButton"
           direction="next"
+          pagination=""
         />
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap
index aa9d3a3ed0d8c..03a5a15eea1a4 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_pagination.test.tsx.snap
@@ -24,20 +24,24 @@ exports[`MonitorList component renders a no items message when no data is provid
           Object {
             "align": "left",
             "field": "state.monitor.status",
+            "mobileOptions": Object {
+              "fullWidth": true,
+            },
             "name": "Status",
             "render": [Function],
-            "width": "20%",
           },
           Object {
             "align": "left",
             "field": "state.monitor.name",
+            "mobileOptions": Object {
+              "fullWidth": true,
+            },
             "name": "Name",
             "render": [Function],
             "sortable": true,
-            "width": "30%",
           },
           Object {
-            "aligh": "left",
+            "align": "left",
             "field": "state.url.full",
             "name": "Url",
             "render": [Function],
@@ -58,6 +62,7 @@ exports[`MonitorList component renders a no items message when no data is provid
             "name": "",
             "render": [Function],
             "sortable": true,
+            "width": "24px",
           },
         ]
       }
@@ -83,6 +88,7 @@ exports[`MonitorList component renders a no items message when no data is provid
         <OverviewPageLink
           dataTestSubj="xpack.uptime.monitorList.prevButton"
           direction="prev"
+          pagination=""
         />
       </EuiFlexItem>
       <EuiFlexItem
@@ -91,6 +97,7 @@ exports[`MonitorList component renders a no items message when no data is provid
         <OverviewPageLink
           dataTestSubj="xpack.uptime.monitorList.nextButton"
           direction="next"
+          pagination=""
         />
       </EuiFlexItem>
     </EuiFlexGroup>
@@ -122,20 +129,24 @@ exports[`MonitorList component renders the monitor list 1`] = `
           Object {
             "align": "left",
             "field": "state.monitor.status",
+            "mobileOptions": Object {
+              "fullWidth": true,
+            },
             "name": "Status",
             "render": [Function],
-            "width": "20%",
           },
           Object {
             "align": "left",
             "field": "state.monitor.name",
+            "mobileOptions": Object {
+              "fullWidth": true,
+            },
             "name": "Name",
             "render": [Function],
             "sortable": true,
-            "width": "30%",
           },
           Object {
-            "aligh": "left",
+            "align": "left",
             "field": "state.url.full",
             "name": "Url",
             "render": [Function],
@@ -156,6 +167,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             "name": "",
             "render": [Function],
             "sortable": true,
+            "width": "24px",
           },
         ]
       }
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
index 69a0616a7bed8..f3b90fbf6ee91 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
@@ -1,11 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`MonitorListStatusColumn can handle a non-numeric timestamp value 1`] = `
-<EuiFlexGroup
+<Styled(EuiFlexGroup)
   alignItems="center"
   gutterSize="none"
+  responsive={false}
+  wrap={false}
 >
-  <EuiFlexItem>
+  <EuiFlexItem
+    grow={1}
+    style={
+      Object {
+        "flexBasis": 40,
+      }
+    }
+  >
     <EuiHealth
       color="success"
       style={
@@ -16,35 +25,55 @@ exports[`MonitorListStatusColumn can handle a non-numeric timestamp value 1`] =
     >
       Up
     </EuiHealth>
-    <EuiToolTip
-      content={
+    <styled.span>
+      <EuiToolTip
+        content={
+          <EuiText
+            color="ghost"
+            size="xs"
+          >
+            Thu May 09 2019 10:15:11 GMT-0400
+          </EuiText>
+        }
+        delay="regular"
+        position="top"
+      >
         <EuiText
-          color="ghost"
+          color="subdued"
           size="xs"
         >
-          Thu May 09 2019 10:15:11 GMT-0400
+          a few seconds ago
         </EuiText>
-      }
-      delay="regular"
-      position="top"
+      </EuiToolTip>
+    </styled.span>
+  </EuiFlexItem>
+  <EuiFlexItem
+    grow={2}
+  >
+    <EuiText
+      size="s"
     >
-      <EuiText
-        color="subdued"
-        size="xs"
-      >
-        a few seconds ago
-      </EuiText>
-    </EuiToolTip>
+      in 0/0 Location
+    </EuiText>
   </EuiFlexItem>
-</EuiFlexGroup>
+</Styled(EuiFlexGroup)>
 `;
 
 exports[`MonitorListStatusColumn provides expected tooltip and display times 1`] = `
-<EuiFlexGroup
+<Styled(EuiFlexGroup)
   alignItems="center"
   gutterSize="none"
+  responsive={false}
+  wrap={false}
 >
-  <EuiFlexItem>
+  <EuiFlexItem
+    grow={1}
+    style={
+      Object {
+        "flexBasis": 40,
+      }
+    }
+  >
     <EuiHealth
       color="success"
       style={
@@ -55,25 +84,171 @@ exports[`MonitorListStatusColumn provides expected tooltip and display times 1`]
     >
       Up
     </EuiHealth>
-    <EuiToolTip
-      content={
+    <styled.span>
+      <EuiToolTip
+        content={
+          <EuiText
+            color="ghost"
+            size="xs"
+          >
+            Thu May 09 2019 10:15:11 GMT-0400
+          </EuiText>
+        }
+        delay="regular"
+        position="top"
+      >
         <EuiText
-          color="ghost"
+          color="subdued"
           size="xs"
         >
-          Thu May 09 2019 10:15:11 GMT-0400
+          a few seconds ago
         </EuiText>
+      </EuiToolTip>
+    </styled.span>
+  </EuiFlexItem>
+  <EuiFlexItem
+    grow={2}
+  >
+    <EuiText
+      size="s"
+    >
+      in 0/0 Location
+    </EuiText>
+  </EuiFlexItem>
+</Styled(EuiFlexGroup)>
+`;
+
+exports[`MonitorListStatusColumn will display location status 1`] = `
+<Styled(EuiFlexGroup)
+  alignItems="center"
+  gutterSize="none"
+  responsive={false}
+  wrap={false}
+>
+  <EuiFlexItem
+    grow={1}
+    style={
+      Object {
+        "flexBasis": 40,
+      }
+    }
+  >
+    <EuiHealth
+      color="success"
+      style={
+        Object {
+          "display": "block",
+        }
       }
-      delay="regular"
-      position="top"
     >
-      <EuiText
-        color="subdued"
-        size="xs"
+      Up
+    </EuiHealth>
+    <styled.span>
+      <EuiToolTip
+        content={
+          <EuiText
+            color="ghost"
+            size="xs"
+          >
+            Thu May 09 2019 10:15:11 GMT-0400
+          </EuiText>
+        }
+        delay="regular"
+        position="top"
       >
-        a few seconds ago
-      </EuiText>
-    </EuiToolTip>
+        <EuiText
+          color="subdued"
+          size="xs"
+        >
+          a few seconds ago
+        </EuiText>
+      </EuiToolTip>
+    </styled.span>
+  </EuiFlexItem>
+  <EuiFlexItem
+    grow={2}
+  >
+    <EuiText
+      size="s"
+    >
+      in 1/3 Locations
+    </EuiText>
   </EuiFlexItem>
-</EuiFlexGroup>
+</Styled(EuiFlexGroup)>
+`;
+
+exports[`MonitorListStatusColumn will render display location status 1`] = `
+.c1 {
+  padding-left: 17px;
+}
+
+@media (max-width:574px) {
+  .c0 {
+    min-width: 230px;
+  }
+}
+
+<div
+  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow c0"
+>
+  <div
+    class="euiFlexItem euiFlexItem--flexGrow1"
+    style="flex-basis:40px"
+  >
+    <div
+      class="euiHealth"
+      style="display:block"
+    >
+      <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>
+    </div>
+    <span
+      class="c1"
+    >
+      <span
+        class="euiToolTipAnchor"
+      >
+        <div
+          class="euiText euiText--extraSmall"
+        >
+          <div
+            class="euiTextColor euiTextColor--subdued"
+          >
+            a few seconds ago
+          </div>
+        </div>
+      </span>
+    </span>
+  </div>
+  <div
+    class="euiFlexItem euiFlexItem--flexGrow2"
+  >
+    <div
+      class="euiText euiText--small"
+    >
+      in 1/3 Locations
+    </div>
+  </div>
+</div>
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_status_column.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_status_column.test.tsx
index 2a834377fee8e..406e18535f34c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_status_column.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_status_column.test.tsx
@@ -6,8 +6,10 @@
 
 import React from 'react';
 import moment from 'moment';
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { MonitorListStatusColumn } from '../monitor_list_status_column';
+import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { getLocationStatus, MonitorListStatusColumn } from '../monitor_list_status_column';
+import { Check } from '../../../../../common/graphql/types';
+import { STATUS } from '../../../../../common/constants';
 
 describe('MonitorListStatusColumn', () => {
   beforeAll(() => {
@@ -18,15 +20,246 @@ describe('MonitorListStatusColumn', () => {
     Date.prototype.toString = jest.fn(() => 'Tue, 01 Jan 2019 00:00:00 GMT');
   });
 
+  let upChecks: Check[];
+
+  let downChecks: Check[];
+
+  let checks: Check[];
+
+  beforeEach(() => {
+    upChecks = [
+      {
+        agent: { id: '6a2f2a1c-e346-49ed-8418-6d48af8841d6' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'up',
+        },
+        observer: {
+          geo: {
+            name: 'Berlin',
+            location: {
+              lat: 40.73060997761786,
+              lon: -73.93524203449488,
+            },
+          },
+        },
+        timestamp: '1579794631464',
+      },
+      {
+        agent: { id: '1117fd01-bc1a-4aa5-bfab-40ab455eadf9' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'up',
+        },
+        observer: {
+          geo: {
+            name: 'Islamabad',
+            location: {
+              lat: 40.73060997761786,
+              lon: -73.93524203449488,
+            },
+          },
+        },
+        timestamp: '1579794634220',
+      },
+      {
+        agent: { id: 'eda59510-45e8-4dfe-b0f8-959c449e3565' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'up',
+        },
+        observer: {
+          geo: {
+            name: 'st-paul',
+            location: {
+              lat: 52.48744798824191,
+              lon: 13.394797928631306,
+            },
+          },
+        },
+        timestamp: '1579794628368',
+      },
+    ];
+
+    downChecks = [
+      {
+        agent: { id: '6a2f2a1c-e346-49ed-8418-6d48af8841d6' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'down',
+        },
+        observer: {
+          geo: {
+            name: 'Berlin',
+            location: {
+              lat: 40.73060997761786,
+              lon: -73.93524203449488,
+            },
+          },
+        },
+        timestamp: '1579794631464',
+      },
+      {
+        agent: { id: '1117fd01-bc1a-4aa5-bfab-40ab455eadf9' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'down',
+        },
+        observer: {
+          geo: {
+            name: 'Islamabad',
+            location: {
+              lat: 40.73060997761786,
+              lon: -73.93524203449488,
+            },
+          },
+        },
+        timestamp: '1579794634220',
+      },
+      {
+        agent: { id: 'eda59510-45e8-4dfe-b0f8-959c449e3565' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'down',
+        },
+        observer: {
+          geo: {
+            name: 'st-paul',
+            location: {
+              lat: 52.48744798824191,
+              lon: 13.394797928631306,
+            },
+          },
+        },
+        timestamp: '1579794628368',
+      },
+    ];
+
+    checks = [
+      {
+        agent: { id: '6a2f2a1c-e346-49ed-8418-6d48af8841d6' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'up',
+        },
+        observer: {
+          geo: {
+            name: 'Berlin',
+            location: {
+              lat: 40.73060997761786,
+              lon: -73.93524203449488,
+            },
+          },
+        },
+        timestamp: '1579794631464',
+      },
+      {
+        agent: { id: '1117fd01-bc1a-4aa5-bfab-40ab455eadf9' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'down',
+        },
+        observer: {
+          geo: {
+            name: 'Islamabad',
+            location: {
+              lat: 40.73060997761786,
+              lon: -73.93524203449488,
+            },
+          },
+        },
+        timestamp: '1579794634220',
+      },
+      {
+        agent: { id: 'eda59510-45e8-4dfe-b0f8-959c449e3565' },
+        container: null,
+        kubernetes: null,
+        monitor: {
+          ip: '104.86.46.103',
+          name: '',
+          status: 'down',
+        },
+        observer: {
+          geo: {
+            name: 'st-paul',
+            location: {
+              lat: 52.48744798824191,
+              lon: 13.394797928631306,
+            },
+          },
+        },
+        timestamp: '1579794628368',
+      },
+    ];
+  });
+
   it('provides expected tooltip and display times', () => {
-    const component = shallowWithIntl(<MonitorListStatusColumn status="up" timestamp="2314123" />);
+    const component = shallowWithIntl(
+      <MonitorListStatusColumn status="up" timestamp="2314123" checks={[]} />
+    );
     expect(component).toMatchSnapshot();
   });
 
   it('can handle a non-numeric timestamp value', () => {
     const component = shallowWithIntl(
-      <MonitorListStatusColumn status="up" timestamp={new Date().toString()} />
+      <MonitorListStatusColumn status="up" timestamp={new Date().toString()} checks={[]} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  it('will display location status', () => {
+    const component = shallowWithIntl(
+      <MonitorListStatusColumn status="up" timestamp={new Date().toString()} checks={checks} />
     );
     expect(component).toMatchSnapshot();
   });
+
+  it('will render display location status', () => {
+    const component = renderWithIntl(
+      <MonitorListStatusColumn status="up" timestamp={new Date().toString()} checks={checks} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  it(' will test getLocationStatus location', () => {
+    let statusMessage = getLocationStatus(checks, STATUS.UP);
+
+    expect(statusMessage).toBe('in 1/3 Locations');
+
+    statusMessage = getLocationStatus(checks, STATUS.DOWN);
+
+    expect(statusMessage).toBe('in 2/3 Locations');
+
+    statusMessage = getLocationStatus(upChecks, STATUS.UP);
+
+    expect(statusMessage).toBe('in 3/3 Locations');
+
+    statusMessage = getLocationStatus(downChecks, STATUS.UP);
+
+    expect(statusMessage).toBe('in 0/3 Locations');
+  });
 });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
index 1d0930f1faaef..c8385440a7d49 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
@@ -16,8 +16,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { get } from 'lodash';
-import React, { useState, Fragment } from 'react';
+import React, { useState } from 'react';
 import styled from 'styled-components';
 import { withUptimeGraphQL, UptimeGraphQLQueryProps } from '../../higher_order';
 import { monitorStatesQuery } from '../../../queries/monitor_states_query';
@@ -68,10 +67,11 @@ export const MonitorListComponent = (props: Props) => {
     loading,
   } = props;
   const [drawerIds, updateDrawerIds] = useState<string[]>([]);
-  const items = get<MonitorSummary[]>(data, 'monitorStates.summaries', []);
 
-  const nextPagePagination = get<string>(data, 'monitorStates.nextPagePagination');
-  const prevPagePagination = get<string>(data, 'monitorStates.prevPagePagination');
+  const items = data?.monitorStates?.summaries ?? [];
+
+  const nextPagePagination = data?.monitorStates?.nextPagePagination ?? '';
+  const prevPagePagination = data?.monitorStates?.prevPagePagination ?? '';
 
   const getExpandedRowMap = () => {
     return drawerIds.reduce((map: ExpandedRowMap, id: string) => {
@@ -89,18 +89,24 @@ export const MonitorListComponent = (props: Props) => {
   const columns = [
     {
       align: 'left' as const,
-      width: '20%',
       field: 'state.monitor.status',
       name: labels.STATUS_COLUMN_LABEL,
-      render: (status: string, { state: { timestamp } }: MonitorSummary) => {
-        return <MonitorListStatusColumn status={status} timestamp={timestamp} />;
+      mobileOptions: {
+        fullWidth: true,
+      },
+      render: (status: string, { state: { timestamp, checks } }: MonitorSummary) => {
+        return (
+          <MonitorListStatusColumn status={status} timestamp={timestamp} checks={checks ?? []} />
+        );
       },
     },
     {
       align: 'left' as const,
-      width: '30%',
       field: 'state.monitor.name',
       name: labels.NAME_COLUMN_LABEL,
+      mobileOptions: {
+        fullWidth: true,
+      },
       render: (name: string, summary: MonitorSummary) => (
         <MonitorPageLink monitorId={summary.monitor_id} linkParameters={linkParameters}>
           {name ? name : `Unnamed - ${summary.monitor_id}`}
@@ -109,7 +115,7 @@ export const MonitorListComponent = (props: Props) => {
       sortable: true,
     },
     {
-      aligh: 'left' as const,
+      align: 'left' as const,
       field: 'state.url.full',
       name: labels.URL,
       render: (url: string, summary: MonitorSummary) => (
@@ -140,6 +146,7 @@ export const MonitorListComponent = (props: Props) => {
       name: '',
       sortable: true,
       isExpander: true,
+      width: '24px',
       render: (id: string) => {
         return (
           <EuiButtonIcon
@@ -159,7 +166,7 @@ export const MonitorListComponent = (props: Props) => {
   ];
 
   return (
-    <Fragment>
+    <>
       <EuiPanel>
         <EuiTitle size="xs">
           <h5>
@@ -211,7 +218,7 @@ export const MonitorListComponent = (props: Props) => {
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiPanel>
-    </Fragment>
+    </>
   );
 };
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
index 04c5dc7d71371..a2042e379dd80 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { Check } from '../../../../../common/graphql/types';
 import { LocationLink } from './location_link';
 import { MonitorStatusRow } from './monitor_status_row';
-import { UNNAMED_LOCATION } from '../../../../../common/constants';
+import { STATUS, UNNAMED_LOCATION } from '../../../../../common/constants';
 
 interface MonitorStatusListProps {
   /**
@@ -20,9 +20,6 @@ interface MonitorStatusListProps {
   checks: Check[];
 }
 
-export const UP = 'up';
-export const DOWN = 'down';
-
 export const MonitorStatusList = ({ checks }: MonitorStatusListProps) => {
   const upChecks: Set<string> = new Set();
   const downChecks: Set<string> = new Set();
@@ -31,9 +28,9 @@ export const MonitorStatusList = ({ checks }: MonitorStatusListProps) => {
     // Doing this way because name is either string or null, get() default value only works on undefined value
     const location = get<string | null>(check, 'observer.geo.name', null) || UNNAMED_LOCATION;
 
-    if (check.monitor.status === UP) {
+    if (check.monitor.status === STATUS.UP) {
       upChecks.add(capitalize(location));
-    } else if (check.monitor.status === DOWN) {
+    } else if (check.monitor.status === STATUS.DOWN) {
       downChecks.add(capitalize(location));
     }
   });
@@ -43,8 +40,8 @@ export const MonitorStatusList = ({ checks }: MonitorStatusListProps) => {
 
   return (
     <>
-      <MonitorStatusRow locationNames={downChecks} status={DOWN} />
-      <MonitorStatusRow locationNames={absUpChecks} status={UP} />
+      <MonitorStatusRow locationNames={downChecks} status={STATUS.DOWN} />
+      <MonitorStatusRow locationNames={absUpChecks} status={STATUS.UP} />
       {(downChecks.has(UNNAMED_LOCATION) || upChecks.has(UNNAMED_LOCATION)) && (
         <>
           <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx
index e724986c2505e..50028e1ddea18 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx
@@ -8,8 +8,7 @@ import React, { useContext } from 'react';
 import { EuiHealth, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { UptimeThemeContext } from '../../../../contexts';
-import { UP } from './monitor_status_list';
-import { UNNAMED_LOCATION } from '../../../../../common/constants';
+import { UNNAMED_LOCATION, STATUS } from '../../../../../common/constants';
 
 interface MonitorStatusRowProps {
   /**
@@ -27,7 +26,7 @@ export const MonitorStatusRow = ({ locationNames, status }: MonitorStatusRowProp
     colors: { success, danger },
   } = useContext(UptimeThemeContext);
 
-  const color = status === UP ? success : danger;
+  const color = status === STATUS.UP ? success : danger;
 
   let checkListArray = [...locationNames];
   // If un-named location exists, move it to end
@@ -44,7 +43,7 @@ export const MonitorStatusRow = ({ locationNames, status }: MonitorStatusRowProp
   return (
     <>
       <EuiHealth color={color}>
-        {status === UP ? (
+        {status === STATUS.UP ? (
           <FormattedMessage
             id="xpack.uptime.monitorList.drawer.locations.statusUp"
             defaultMessage="Up in {locations}"
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 0a3a0962a4d09..7e23be572a6f9 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
@@ -4,21 +4,44 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiHealth, EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elastic/eui';
 import React from 'react';
+import moment from 'moment';
 import { i18n } from '@kbn/i18n';
+import { capitalize } from 'lodash';
+import styled from 'styled-components';
+import { EuiHealth, EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elastic/eui';
 import { parseTimestamp } from './parse_timestamp';
+import { Check } from '../../../../common/graphql/types';
+import {
+  STATUS,
+  SHORT_TIMESPAN_LOCALE,
+  UNNAMED_LOCATION,
+  SHORT_TS_LOCALE,
+} from '../../../../common/constants';
+
+import * as labels from './translations';
 
 interface MonitorListStatusColumnProps {
   status: string;
   timestamp: string;
+  checks: Check[];
 }
 
+const PaddedSpan = styled.span`
+  padding-left: 17px;
+`;
+
+const StatusColumnFlexG = styled(EuiFlexGroup)`
+  @media (max-width: 574px) {
+    min-width: 230px;
+  }
+`;
+
 const getHealthColor = (status: string): string => {
   switch (status) {
-    case 'up':
+    case STATUS.UP:
       return 'success';
-    case 'down':
+    case STATUS.DOWN:
       return 'danger';
     default:
       return '';
@@ -27,42 +50,98 @@ const getHealthColor = (status: string): string => {
 
 const getHealthMessage = (status: string): string | null => {
   switch (status) {
-    case 'up':
-      return i18n.translate('xpack.uptime.monitorList.statusColumn.upLabel', {
-        defaultMessage: 'Up',
-      });
-    case 'down':
-      return i18n.translate('xpack.uptime.monitorList.statusColumn.downLabel', {
-        defaultMessage: 'Down',
-      });
+    case STATUS.UP:
+      return labels.UP;
+    case STATUS.DOWN:
+      return labels.DOWN;
     default:
       return null;
   }
 };
 
+const getRelativeShortTimeStamp = (timeStamp: any) => {
+  const prevLocale: string = moment.locale() ?? 'en';
+
+  const shortLocale = moment.locale(SHORT_TS_LOCALE) === SHORT_TS_LOCALE;
+
+  if (!shortLocale) {
+    moment.defineLocale(SHORT_TS_LOCALE, SHORT_TIMESPAN_LOCALE);
+  }
+
+  const shortTimestamp = parseTimestamp(timeStamp).fromNow();
+
+  // Reset it so, it does't impact other part of the app
+  moment.locale(prevLocale);
+  return shortTimestamp;
+};
+
+export const getLocationStatus = (checks: Check[], status: string) => {
+  const upChecks: Set<string> = new Set();
+  const downChecks: Set<string> = new Set();
+
+  checks.forEach((check: Check) => {
+    const location = check?.observer?.geo?.name ?? UNNAMED_LOCATION;
+
+    if (check.monitor.status === STATUS.UP) {
+      upChecks.add(capitalize(location));
+    } else if (check.monitor.status === STATUS.DOWN) {
+      downChecks.add(capitalize(location));
+    }
+  });
+
+  // if monitor is down in one dns, it will be considered down so removing it from up list
+  const absUpChecks: Set<string> = new Set([...upChecks].filter(item => !downChecks.has(item)));
+
+  const totalLocations = absUpChecks.size + downChecks.size;
+  let statusMessage = '';
+  if (status === STATUS.DOWN) {
+    statusMessage = `${downChecks.size}/${totalLocations}`;
+  } else {
+    statusMessage = `${absUpChecks.size}/${totalLocations}`;
+  }
+
+  if (totalLocations > 1) {
+    return i18n.translate('xpack.uptime.monitorList.statusColumn.locStatusMessage.multiple', {
+      defaultMessage: 'in {noLoc} Locations',
+      values: { noLoc: statusMessage },
+    });
+  }
+
+  return i18n.translate('xpack.uptime.monitorList.statusColumn.locStatusMessage', {
+    defaultMessage: 'in {noLoc} Location',
+    values: { noLoc: statusMessage },
+  });
+};
+
 export const MonitorListStatusColumn = ({
   status,
+  checks = [],
   timestamp: tsString,
 }: MonitorListStatusColumnProps) => {
   const timestamp = parseTimestamp(tsString);
   return (
-    <EuiFlexGroup alignItems="center" gutterSize="none">
-      <EuiFlexItem>
+    <StatusColumnFlexG alignItems="center" gutterSize="none" wrap={false} responsive={false}>
+      <EuiFlexItem grow={1} style={{ flexBasis: 40 }}>
         <EuiHealth color={getHealthColor(status)} style={{ display: 'block' }}>
           {getHealthMessage(status)}
         </EuiHealth>
-        <EuiToolTip
-          content={
-            <EuiText color="ghost" size="xs">
-              {timestamp.toLocaleString()}
+        <PaddedSpan>
+          <EuiToolTip
+            content={
+              <EuiText color="ghost" size="xs">
+                {timestamp.toLocaleString()}
+              </EuiText>
+            }
+          >
+            <EuiText size="xs" color="subdued">
+              {getRelativeShortTimeStamp(tsString)}
             </EuiText>
-          }
-        >
-          <EuiText size="xs" color="subdued">
-            {timestamp.fromNow()}
-          </EuiText>
-        </EuiToolTip>
+          </EuiToolTip>
+        </PaddedSpan>
+      </EuiFlexItem>
+      <EuiFlexItem grow={2}>
+        <EuiText size="s">{getLocationStatus(checks, status)}</EuiText>
       </EuiFlexItem>
-    </EuiFlexGroup>
+    </StatusColumnFlexG>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts
index beacdec1ae265..5252d90215e95 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts
@@ -56,3 +56,11 @@ export const NO_DATA_MESSAGE = i18n.translate('xpack.uptime.monitorList.noItemMe
 export const URL = i18n.translate('xpack.uptime.monitorList.table.url.name', {
   defaultMessage: 'Url',
 });
+
+export const UP = i18n.translate('xpack.uptime.monitorList.statusColumn.upLabel', {
+  defaultMessage: 'Up',
+});
+
+export const DOWN = i18n.translate('xpack.uptime.monitorList.statusColumn.downLabel', {
+  defaultMessage: 'Down',
+});

From 440a37a6dbc13427755e027418ee5e3aed482295 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Fri, 31 Jan 2020 11:11:07 -0600
Subject: [PATCH 14/26] [DOCS] Share options for Visualize (#56407)

* [DOCS] Share options for Visualize

* Removed files

* Comments from Gail
---
 docs/user/visualize.asciidoc      | 51 ++++++++++++++++++++++++++++---
 docs/visualize/inspector.asciidoc | 11 -------
 docs/visualize/saving.asciidoc    | 19 ------------
 3 files changed, 47 insertions(+), 34 deletions(-)
 delete mode 100644 docs/visualize/inspector.asciidoc
 delete mode 100644 docs/visualize/saving.asciidoc

diff --git a/docs/user/visualize.asciidoc b/docs/user/visualize.asciidoc
index cfd2bac4989c1..5692fe6d1ae01 100644
--- a/docs/user/visualize.asciidoc
+++ b/docs/user/visualize.asciidoc
@@ -75,6 +75,53 @@ modifications to the saved search are automatically reflected in the
 visualization. To disable automatic updates, you can disconnect a visualization
 from the saved search.
 
+[float]
+[[vis-inspector]]
+== Inspect visualizations
+
+Many visualizations allow you to inspect the query and data behind the visualization.
+
+. In the {kib} toolbar, click *Inspect*.
+. To download the data, click *Download CSV*, then choose one of the following options:
+* *Formatted CSV* - Downloads the data in table format.
+* *Raw CSV* - Downloads the data as provided.
+. To view the requests for collecting data, select *Requests* from the *View*
+dropdown.
+
+[float]
+[[save-visualize]]
+== Save visualizations
+To use your visualizations in <<dashboard, dashboards>>, you must save them.
+
+. In the {kib} toolbar, click *Save*.
+. Enter the visualization *Title* and optional *Description*, then *Save* the visualization.
+
+To access the saved visualization, go to *Management > {kib} > Saved Objects*.
+
+[float]
+[[save-visualization-read-only-access]]
+==== Read only access
+When you have insufficient privileges to save visualizations, the following indicator is
+displayed and the *Save* button is not visible.
+
+For more information, refer to <<xpack-security-authorization>>.
+
+[role="screenshot"]
+image::visualize/images/read-only-badge.png[Example of Visualize's read only access indicator in Kibana's header]
+
+[float]
+[[visualize-share-options]]
+== Share visualizations
+
+When you've finished your visualization, you can share it outside of {kib}.
+
+From the *Share* menu, you can:
+
+* Embed the code in a web page. Users must have {kib} access
+to view an embedded visualization.
+* Share a direct link to a {kib} visualization.
+* Generate a PDF report.
+* Generate a PNG report.
 
 --
 include::{kib-repo-dir}/visualize/visualize_rollup_data.asciidoc[]
@@ -95,7 +142,3 @@ include::{kib-repo-dir}/visualize/heatmap.asciidoc[]
 include::{kib-repo-dir}/visualize/for-dashboard.asciidoc[]
 
 include::{kib-repo-dir}/visualize/vega.asciidoc[]
-
-include::{kib-repo-dir}/visualize/saving.asciidoc[]
-
-include::{kib-repo-dir}/visualize/inspector.asciidoc[]
diff --git a/docs/visualize/inspector.asciidoc b/docs/visualize/inspector.asciidoc
deleted file mode 100644
index ed98daea211e1..0000000000000
--- a/docs/visualize/inspector.asciidoc
+++ /dev/null
@@ -1,11 +0,0 @@
-[[vis-inspector]]
-== Inspect visualizations
-
-Many visualizations allow you to inspect the query and data behind the visualization.
-
-. In the {kib} toolbar, click *Inspect*.
-. To download the data, click *Download CSV*, then choose one of the following options:
-* *Formatted CSV* - Downloads the data in table format.
-* *Raw CSV* - Downloads the data as provided.
-. To view the data collection requests, select *Requests* from the *View*
-dropdown.
diff --git a/docs/visualize/saving.asciidoc b/docs/visualize/saving.asciidoc
deleted file mode 100644
index e3330446bfad1..0000000000000
--- a/docs/visualize/saving.asciidoc
+++ /dev/null
@@ -1,19 +0,0 @@
-[[save-visualize]]
-== Save visualizations
-To use your visualizations in <<dashboard, dashboards>>, you must save them.
-
-. In the {kib} toolbar, click *Save*.
-. Enter the visualization *Title* and optional *Description*, then *Save* the visualization.
-
-To access the saved visualization, go to *Management > {kib} > Saved Objects*.
-
-[float]
-[[save-visualization-read-only-access]]
-==== Read only access
-When you have insufficient privileges to save visualizations, the following indicator is
-displayed and the *Save* button is not visible.
-
-[role="screenshot"]
-image::visualize/images/read-only-badge.png[Example of Visualize's read only access indicator in Kibana's header]
-
-For more information, see <<xpack-security-authorization>>.

From e24863ed86bc71aeff5eadadcdc916cd5ed99502 Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Fri, 31 Jan 2020 12:30:19 -0500
Subject: [PATCH 15/26] [SIEM][Detection Engine] Modified gap detection util to
 accept all dateMath formats (#56055)

* Partial commit - got tests working and `getGapBetweenRuns` working with `from`  and `to` being any string (invalid, ISO string, now, now-x).

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../detection_engine/signals/utils.test.ts    | 136 +++++++++++++-----
 .../lib/detection_engine/signals/utils.ts     |  30 ++--
 2 files changed, 123 insertions(+), 43 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.test.ts
index d6a3da5a393f8..bf25ab8bfd7ea 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.test.ts
@@ -5,14 +5,29 @@
  */
 
 import moment from 'moment';
+import sinon from 'sinon';
 
-import { generateId, parseInterval, getDriftTolerance, getGapBetweenRuns } from './utils';
+import {
+  generateId,
+  parseInterval,
+  parseScheduleDates,
+  getDriftTolerance,
+  getGapBetweenRuns,
+} from './utils';
 
 describe('utils', () => {
+  const anchor = '2020-01-01T06:06:06.666Z';
+  const unix = moment(anchor).valueOf();
   let nowDate = moment('2020-01-01T00:00:00.000Z');
+  let clock: sinon.SinonFakeTimers;
 
   beforeEach(() => {
     nowDate = moment('2020-01-01T00:00:00.000Z');
+    clock = sinon.useFakeTimers(unix);
+  });
+
+  afterEach(() => {
+    clock.restore();
   });
 
   describe('generateId', () => {
@@ -27,7 +42,7 @@ describe('utils', () => {
     });
   });
 
-  describe('getIntervalMilliseconds', () => {
+  describe('parseInterval', () => {
     test('it returns a duration when given one that is valid', () => {
       const duration = parseInterval('5m');
       expect(duration).not.toBeNull();
@@ -40,8 +55,36 @@ describe('utils', () => {
     });
   });
 
-  describe('getDriftToleranceMilliseconds', () => {
-    test('it returns a drift tolerance in milliseconds of 1 minute when from overlaps to by 1 minute and the interval is 5 minutes', () => {
+  describe('parseScheduleDates', () => {
+    test('it returns a moment when given an ISO string', () => {
+      const result = parseScheduleDates('2020-01-01T00:00:00.000Z');
+      expect(result).not.toBeNull();
+      expect(result).toEqual(moment('2020-01-01T00:00:00.000Z'));
+    });
+
+    test('it returns a moment when given `now`', () => {
+      const result = parseScheduleDates('now');
+
+      expect(result).not.toBeNull();
+      expect(moment.isMoment(result)).toBeTruthy();
+    });
+
+    test('it returns a moment when given `now-x`', () => {
+      const result = parseScheduleDates('now-6m');
+
+      expect(result).not.toBeNull();
+      expect(moment.isMoment(result)).toBeTruthy();
+    });
+
+    test('it returns null when given a string that is not an ISO string, `now` or `now-x`', () => {
+      const result = parseScheduleDates('invalid');
+
+      expect(result).toBeNull();
+    });
+  });
+
+  describe('getDriftTolerance', () => {
+    test('it returns a drift tolerance in milliseconds of 1 minute when "from" overlaps "to" by 1 minute and the interval is 5 minutes', () => {
       const drift = getDriftTolerance({
         from: 'now-6m',
         to: 'now',
@@ -51,7 +94,7 @@ describe('utils', () => {
       expect(drift?.asMilliseconds()).toEqual(moment.duration(1, 'minute').asMilliseconds());
     });
 
-    test('it returns a drift tolerance of 0 when from equals the interval', () => {
+    test('it returns a drift tolerance of 0 when "from" equals the interval', () => {
       const drift = getDriftTolerance({
         from: 'now-5m',
         to: 'now',
@@ -60,7 +103,7 @@ describe('utils', () => {
       expect(drift?.asMilliseconds()).toEqual(0);
     });
 
-    test('it returns a drift tolerance of 5 minutes when from is 10 minutes but the interval is 5 minutes', () => {
+    test('it returns a drift tolerance of 5 minutes when "from" is 10 minutes but the interval is 5 minutes', () => {
       const drift = getDriftTolerance({
         from: 'now-10m',
         to: 'now',
@@ -70,7 +113,7 @@ describe('utils', () => {
       expect(drift?.asMilliseconds()).toEqual(moment.duration(5, 'minutes').asMilliseconds());
     });
 
-    test('it returns a drift tolerance of 10 minutes when from is 10 minutes ago and the interval is 0', () => {
+    test('it returns a drift tolerance of 10 minutes when "from" is 10 minutes ago and the interval is 0', () => {
       const drift = getDriftTolerance({
         from: 'now-10m',
         to: 'now',
@@ -80,36 +123,61 @@ describe('utils', () => {
       expect(drift?.asMilliseconds()).toEqual(moment.duration(10, 'minutes').asMilliseconds());
     });
 
-    test('returns null if the "to" is not "now" since we have limited support for date math', () => {
+    test('returns a drift tolerance of 1 minute when "from" is invalid and defaults to "now-6m" and interval is 5 minutes', () => {
       const drift = getDriftTolerance({
-        from: 'now-6m',
-        to: 'invalid', // if not set to "now" this function returns null
-        interval: moment.duration(1000, 'milliseconds'),
+        from: 'invalid',
+        to: 'now',
+        interval: moment.duration(5, 'minutes'),
       });
-      expect(drift).toBeNull();
+      expect(drift).not.toBeNull();
+      expect(drift?.asMilliseconds()).toEqual(moment.duration(1, 'minute').asMilliseconds());
     });
 
-    test('returns null if the "from" does not start with "now-" since we have limited support for date math', () => {
+    test('returns a drift tolerance of 1 minute when "from" does not include `now` and defaults to "now-6m" and interval is 5 minutes', () => {
       const drift = getDriftTolerance({
-        from: 'valid', // if not set to "now-x" where x is an interval such as 6m
+        from: '10m',
         to: 'now',
-        interval: moment.duration(1000, 'milliseconds'),
+        interval: moment.duration(5, 'minutes'),
+      });
+      expect(drift).not.toBeNull();
+      expect(drift?.asMilliseconds()).toEqual(moment.duration(1, 'minute').asMilliseconds());
+    });
+
+    test('returns a drift tolerance of 4 minutes when "to" is "now-x", from is a valid input and interval is 5 minute', () => {
+      const drift = getDriftTolerance({
+        from: 'now-10m',
+        to: 'now-1m',
+        interval: moment.duration(5, 'minutes'),
       });
-      expect(drift).toBeNull();
+      expect(drift).not.toBeNull();
+      expect(drift?.asMilliseconds()).toEqual(moment.duration(4, 'minutes').asMilliseconds());
     });
 
-    test('returns null if the "from" starts with "now-" but has a string instead of an integer', () => {
+    test('it returns expected drift tolerance when "from" is an ISO string', () => {
       const drift = getDriftTolerance({
-        from: 'now-dfdf', // if not set to "now-x" where x is an interval such as 6m
+        from: moment()
+          .subtract(10, 'minutes')
+          .toISOString(),
         to: 'now',
-        interval: moment.duration(1000, 'milliseconds'),
+        interval: moment.duration(5, 'minutes'),
       });
-      expect(drift).toBeNull();
+      expect(drift).not.toBeNull();
+      expect(drift?.asMilliseconds()).toEqual(moment.duration(5, 'minutes').asMilliseconds());
+    });
+
+    test('it returns expected drift tolerance when "to" is an ISO string', () => {
+      const drift = getDriftTolerance({
+        from: 'now-6m',
+        to: moment().toISOString(),
+        interval: moment.duration(5, 'minutes'),
+      });
+      expect(drift).not.toBeNull();
+      expect(drift?.asMilliseconds()).toEqual(moment.duration(1, 'minute').asMilliseconds());
     });
   });
 
   describe('getGapBetweenRuns', () => {
-    test('it returns a gap of 0 when from and interval match each other and the previous started was from the previous interval time', () => {
+    test('it returns a gap of 0 when "from" and interval match each other and the previous started was from the previous interval time', () => {
       const gap = getGapBetweenRuns({
         previousStartedAt: nowDate.clone().subtract(5, 'minutes'),
         interval: '5m',
@@ -121,7 +189,7 @@ describe('utils', () => {
       expect(gap?.asMilliseconds()).toEqual(0);
     });
 
-    test('it returns a negative gap of 1 minute when from overlaps to by 1 minute and the previousStartedAt was 5 minutes ago', () => {
+    test('it returns a negative gap of 1 minute when "from" overlaps to by 1 minute and the previousStartedAt was 5 minutes ago', () => {
       const gap = getGapBetweenRuns({
         previousStartedAt: nowDate.clone().subtract(5, 'minutes'),
         interval: '5m',
@@ -133,7 +201,7 @@ describe('utils', () => {
       expect(gap?.asMilliseconds()).toEqual(moment.duration(-1, 'minute').asMilliseconds());
     });
 
-    test('it returns a negative gap of 5 minutes when from overlaps to by 1 minute and the previousStartedAt was 5 minutes ago', () => {
+    test('it returns a negative gap of 5 minutes when "from" overlaps to by 1 minute and the previousStartedAt was 5 minutes ago', () => {
       const gap = getGapBetweenRuns({
         previousStartedAt: nowDate.clone().subtract(5, 'minutes'),
         interval: '5m',
@@ -145,7 +213,7 @@ describe('utils', () => {
       expect(gap?.asMilliseconds()).toEqual(moment.duration(-5, 'minute').asMilliseconds());
     });
 
-    test('it returns a negative gap of 1 minute when from overlaps to by 1 minute and the previousStartedAt was 10 minutes ago and so was the interval', () => {
+    test('it returns a negative gap of 1 minute when "from" overlaps to by 1 minute and the previousStartedAt was 10 minutes ago and so was the interval', () => {
       const gap = getGapBetweenRuns({
         previousStartedAt: nowDate.clone().subtract(10, 'minutes'),
         interval: '10m',
@@ -233,26 +301,28 @@ describe('utils', () => {
       expect(gap).toBeNull();
     });
 
-    test('it returns null if from is an invalid string such as "invalid"', () => {
+    test('it returns the expected result when "from" is an invalid string such as "invalid"', () => {
       const gap = getGapBetweenRuns({
-        previousStartedAt: nowDate.clone(),
+        previousStartedAt: nowDate.clone().subtract(7, 'minutes'),
         interval: '5m',
-        from: 'invalid', // if not set to "now-x" where x is an interval such as 6m
+        from: 'invalid',
         to: 'now',
         now: nowDate.clone(),
       });
-      expect(gap).toBeNull();
+      expect(gap?.asMilliseconds()).not.toBeNull();
+      expect(gap?.asMilliseconds()).toEqual(moment.duration(1, 'minute').asMilliseconds());
     });
 
-    test('it returns null if to is an invalid string such as "invalid"', () => {
+    test('it returns the expected result when "to" is an invalid string such as "invalid"', () => {
       const gap = getGapBetweenRuns({
-        previousStartedAt: nowDate.clone(),
+        previousStartedAt: nowDate.clone().subtract(7, 'minutes'),
         interval: '5m',
-        from: 'now-5m',
-        to: 'invalid', // if not set to "now" this function returns null
+        from: 'now-6m',
+        to: 'invalid',
         now: nowDate.clone(),
       });
-      expect(gap).toBeNull();
+      expect(gap?.asMilliseconds()).not.toBeNull();
+      expect(gap?.asMilliseconds()).toEqual(moment.duration(1, 'minute').asMilliseconds());
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.ts
index 5a4c67ebaaa36..940ea8be2ac36 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/utils.ts
@@ -5,6 +5,7 @@
  */
 import { createHash } from 'crypto';
 import moment from 'moment';
+import dateMath from '@elastic/datemath';
 
 import { parseDuration } from '../../../../../alerting/server/lib';
 
@@ -26,25 +27,34 @@ export const parseInterval = (intervalString: string): moment.Duration | null =>
   }
 };
 
+export const parseScheduleDates = (time: string): moment.Moment | null => {
+  const isValidDateString = !isNaN(Date.parse(time));
+  const isValidInput = isValidDateString || time.trim().startsWith('now');
+  const formattedDate = isValidDateString
+    ? moment(time)
+    : isValidInput
+    ? dateMath.parse(time)
+    : null;
+
+  return formattedDate ?? null;
+};
+
 export const getDriftTolerance = ({
   from,
   to,
   interval,
+  now = moment(),
 }: {
   from: string;
   to: string;
   interval: moment.Duration;
+  now?: moment.Moment;
 }): moment.Duration | null => {
-  if (to.trim() !== 'now') {
-    // we only support 'now' for drift detection
-    return null;
-  }
-  if (!from.trim().startsWith('now-')) {
-    // we only support from tha starts with now for drift detection
-    return null;
-  }
-  const split = from.split('-');
-  const duration = parseInterval(split[1]);
+  const toDate = parseScheduleDates(to) ?? now;
+  const fromDate = parseScheduleDates(from) ?? dateMath.parse('now-6m');
+  const timeSegment = toDate.diff(fromDate);
+  const duration = moment.duration(timeSegment);
+
   if (duration !== null) {
     return duration.subtract(interval);
   } else {

From 74ee0d0ba41c4dc60ad2595f85b5a6f4be1696ec Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Fri, 31 Jan 2020 14:26:12 -0500
Subject: [PATCH 16/26] [Docs] - Deprecate kibana_user role (#54606)

* rename kibana_user => kibana_admin

* add migration note

* [DOCS] Fixes link for use in multiple books

* i18n fixes after merge from master

* fix i18n

* Apply suggestions from code review

Co-Authored-By: gchaps <33642766+gchaps@users.noreply.github.com>

* Apply suggestions from code review

Co-Authored-By: Brandon Kobel <brandon.kobel@gmail.com>

Co-authored-by: Lisa Cawley <lcawley@elastic.co>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>
Co-authored-by: Brandon Kobel <brandon.kobel@gmail.com>
---
 docs/management/watcher-ui/index.asciidoc     |  2 +-
 docs/migration/migrate_8_0.asciidoc           | 15 ++++++++++++
 docs/uptime-guide/security.asciidoc           |  4 ++--
 docs/user/monitoring/viewing-metrics.asciidoc |  2 +-
 .../security/authorization/index.asciidoc     |  6 ++---
 docs/user/security/reporting.asciidoc         |  8 +++----
 docs/user/security/securing-kibana.asciidoc   |  4 ++--
 .../public/views/access_denied/index.html     |  4 ++--
 .../utils/beat_schema/8.0.0/filebeat.ts       |  2 +-
 .../plugins/transform/common/constants.ts     |  4 ++--
 ...pace_aware_privilege_section.test.tsx.snap |  8 +++----
 .../space_aware_privilege_section.tsx         |  8 +++----
 .../translations/translations/ja-JP.json      |  6 ++---
 .../translations/translations/zh-CN.json      |  6 ++---
 .../apis/console/feature_controls.ts          | 23 +++++++++++++++++++
 .../monitoring/setup/collection/security.js   |  2 +-
 .../apis/short_urls/feature_controls.ts       |  4 ++--
 .../dashboard_mode/dashboard_view_mode.js     |  2 +-
 .../apps/security/doc_level_security_roles.js |  4 ++--
 .../apps/security/field_level_security.js     |  8 +++----
 .../apps/security/secure_roles_perm.js        |  4 ++--
 .../functional/apps/security/user_email.js    |  4 ++--
 x-pack/test/functional/apps/security/users.js |  6 ++---
 .../page_objects/monitoring_page.js           |  2 +-
 .../apis/security/kerberos_login.ts           |  4 ++--
 .../apis/security/pki_auth.ts                 |  4 ++--
 x-pack/test_utils/kbn_server_config.ts        |  4 ++--
 27 files changed, 94 insertions(+), 56 deletions(-)

diff --git a/docs/management/watcher-ui/index.asciidoc b/docs/management/watcher-ui/index.asciidoc
index 79db96d759aa5..44610a2fd3426 100644
--- a/docs/management/watcher-ui/index.asciidoc
+++ b/docs/management/watcher-ui/index.asciidoc
@@ -34,7 +34,7 @@ If the {es} {security-features} are enabled, you must have the
 {ref}/security-privileges.html[`manage_watcher` or `monitor_watcher`]
 cluster privileges to use Watcher in {kib}.
 
-Alternately, you can have the built-in `kibana_user` role
+Alternately, you can have the built-in `kibana_admin` role
 and either of these watcher roles:
 
 * `watcher_admin`. You can perform all Watcher actions, including create and edit watches.
diff --git a/docs/migration/migrate_8_0.asciidoc b/docs/migration/migrate_8_0.asciidoc
index df4d8a0b65ee7..146d4e97b6cf4 100644
--- a/docs/migration/migrate_8_0.asciidoc
+++ b/docs/migration/migrate_8_0.asciidoc
@@ -80,6 +80,21 @@ specified explicitly.
 
 *Impact:* Any workflow that involved manually clearing generated bundles will have to be updated with the new path.
 
+[float]
+[[breaking_80_user_role_changes]]
+=== User role changes
+
+[float]
+==== `kibana_user` role has been removed and `kibana_admin` has been added.
+
+*Details:* The `kibana_user` role has been removed and `kibana_admin` has been added to better
+reflect its intended use. This role continues to grant all access to every
+{kib} feature. If you wish to restrict access to specific features, create
+custom roles with {kibana-ref}/kibana-privileges.html[{kib} privileges].
+
+*Impact:* Any users currently assigned the `kibana_user` role will need to
+instead be assigned the `kibana_admin` role to maintain their current
+access level.
 
 [float]
 [[breaking_80_reporting_changes]]
diff --git a/docs/uptime-guide/security.asciidoc b/docs/uptime-guide/security.asciidoc
index 2a960348b1e02..6651b33ea0e0e 100644
--- a/docs/uptime-guide/security.asciidoc
+++ b/docs/uptime-guide/security.asciidoc
@@ -42,7 +42,7 @@ PUT /_security/role/uptime
 === Assign the role to a user
 
 Next, you'll need to create a user with both the `uptime` role, and another role with sufficient {kibana-ref}/kibana-privileges.html[Kibana privileges],
-such as the `kibana_user` role.
+such as the `kibana_admin` role.
 You can do this with the following request:
 
 ["source","sh",subs="attributes,callouts"]
@@ -50,7 +50,7 @@ You can do this with the following request:
 PUT /_security/user/jacknich
 {
   "password" : "j@rV1s",
-  "roles" : [ "uptime", "kibana_user" ],
+  "roles" : [ "uptime", "kibana_admin" ],
   "full_name" : "Jack Nicholson",
   "email" : "jacknich@example.com",
   "metadata" : {
diff --git a/docs/user/monitoring/viewing-metrics.asciidoc b/docs/user/monitoring/viewing-metrics.asciidoc
index 61bcb9a49c901..11516e32400fb 100644
--- a/docs/user/monitoring/viewing-metrics.asciidoc
+++ b/docs/user/monitoring/viewing-metrics.asciidoc
@@ -63,7 +63,7 @@ remote monitoring cluster, you must use credentials that are valid on both the
 
 --
 
-.. Create users that have the `monitoring_user` and `kibana_user` 
+.. Create users that have the `monitoring_user` and `kibana_admin` 
 {ref}/built-in-roles.html[built-in roles].
 
 . Open {kib} in your web browser. 
diff --git a/docs/user/security/authorization/index.asciidoc b/docs/user/security/authorization/index.asciidoc
index 2636b3dfc1bd3..853c735418cea 100644
--- a/docs/user/security/authorization/index.asciidoc
+++ b/docs/user/security/authorization/index.asciidoc
@@ -2,11 +2,11 @@
 [[xpack-security-authorization]]
 
 === Granting access to {kib}
-The Elastic Stack comes with the `kibana_user` {ref}/built-in-roles.html[built-in role], which you can use to grant access to all Kibana features in all spaces. To grant users access to a subset of spaces or features, you can create a custom role that grants the desired Kibana privileges. 
+The Elastic Stack comes with the `kibana_admin` {ref}/built-in-roles.html[built-in role], which you can use to grant access to all Kibana features in all spaces. To grant users access to a subset of spaces or features, you can create a custom role that grants the desired Kibana privileges. 
 
-When you assign a user multiple roles, the user receives a union of the roles’ privileges. Therefore, assigning the `kibana_user` role in addition to a custom role that grants Kibana privileges is ineffective because `kibana_user` has access to all the features in all spaces.
+When you assign a user multiple roles, the user receives a union of the roles’ privileges. Therefore, assigning the `kibana_admin` role in addition to a custom role that grants Kibana privileges is ineffective because `kibana_admin` has access to all the features in all spaces.
 
-NOTE: When running multiple tenants of Kibana by changing the `kibana.index` in your `kibana.yml`, you cannot use `kibana_user` to grant access. You must create custom roles that authorize the user for that specific tenant. Although multi-tenant installations are supported, the recommended approach to securing access to Kibana segments is to grant users access to specific spaces.
+NOTE: When running multiple tenants of Kibana by changing the `kibana.index` in your `kibana.yml`, you cannot use `kibana_admin` to grant access. You must create custom roles that authorize the user for that specific tenant. Although multi-tenant installations are supported, the recommended approach to securing access to Kibana segments is to grant users access to specific spaces.
 
 [role="xpack"]
 === {kib} role management
diff --git a/docs/user/security/reporting.asciidoc b/docs/user/security/reporting.asciidoc
index 5f5d85fe8d3be..825580bdc772e 100644
--- a/docs/user/security/reporting.asciidoc
+++ b/docs/user/security/reporting.asciidoc
@@ -85,14 +85,14 @@ elasticsearch.username: 'custom_kibana_system'
 [[reporting-roles-user-api]]
 ==== With the user API
 This example uses the {ref}/security-api-put-user.html[user API] to create a user who has the
-`reporting_user` role and the `kibana_user` role:
+`reporting_user` role and the `kibana_admin` role:
 
 [source, sh]
 ---------------------------------------------------------------
 POST /_security/user/reporter
 {
   "password" : "x-pack-test-password",
-  "roles" : ["kibana_user", "reporting_user"],
+  "roles" : ["kibana_admin", "reporting_user"],
   "full_name" : "Reporting User"
 }
 ---------------------------------------------------------------
@@ -106,11 +106,11 @@ roles on a per user basis, or assign roles to groups of users. By default, role
 mappings are configured in
 {ref}/mapping-roles.html[`config/shield/role_mapping.yml`].
 For example, the following snippet assigns the user named Bill Murray the
-`kibana_user` and `reporting_user` roles:
+`kibana_admin` and `reporting_user` roles:
 
 [source,yaml]
 --------------------------------------------------------------------------------
-kibana_user:
+kibana_admin:
   - "cn=Bill Murray,dc=example,dc=com"
 reporting_user:
   - "cn=Bill Murray,dc=example,dc=com"
diff --git a/docs/user/security/securing-kibana.asciidoc b/docs/user/security/securing-kibana.asciidoc
index 2d07b57bfabe1..b6b5248777f6b 100644
--- a/docs/user/security/securing-kibana.asciidoc
+++ b/docs/user/security/securing-kibana.asciidoc
@@ -104,7 +104,7 @@ You can manage privileges on the *Management / Security / Roles* page in {kib}.
 If you're using the native realm with Basic Authentication, you can assign roles
 using the *Management / Security / Users* page in {kib} or the
 {ref}/security-api.html#security-user-apis[user management APIs]. For example, 
-the following creates a user named `jacknich` and assigns it the `kibana_user` 
+the following creates a user named `jacknich` and assigns it the `kibana_admin` 
 role:
 
 [source,js]
@@ -112,7 +112,7 @@ role:
 POST /_security/user/jacknich
 {
   "password" : "t0pS3cr3t",
-  "roles" : [ "kibana_user" ]
+  "roles" : [ "kibana_admin" ]
 }
 --------------------------------------------------------------------------------
 // CONSOLE
diff --git a/x-pack/legacy/plugins/monitoring/public/views/access_denied/index.html b/x-pack/legacy/plugins/monitoring/public/views/access_denied/index.html
index 8c67451b86f36..63cd4440ecf8a 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/access_denied/index.html
+++ b/x-pack/legacy/plugins/monitoring/public/views/access_denied/index.html
@@ -15,9 +15,9 @@
         class="kuiInfoPanelBody__message"
         i18n-id="xpack.monitoring.accessDenied.notAuthorizedDescription"
         i18n-default-message="You are not authorized to access Monitoring. To use Monitoring, you
-        need the privileges granted by both the `{kibanaUser}` and
+        need the privileges granted by both the `{kibanaAdmin}` and
         `{monitoringUser}` roles."
-        i18n-values="{ kibanaUser: 'kibana_user', monitoringUser: 'monitoring_user' }"
+        i18n-values="{ kibanaAdmin: 'kibana_admin', monitoringUser: 'monitoring_user' }"
       ></div>
 
       <div
diff --git a/x-pack/legacy/plugins/siem/server/utils/beat_schema/8.0.0/filebeat.ts b/x-pack/legacy/plugins/siem/server/utils/beat_schema/8.0.0/filebeat.ts
index b46cecdc762b7..a5877f6c34b8f 100644
--- a/x-pack/legacy/plugins/siem/server/utils/beat_schema/8.0.0/filebeat.ts
+++ b/x-pack/legacy/plugins/siem/server/utils/beat_schema/8.0.0/filebeat.ts
@@ -3132,7 +3132,7 @@ export const filebeatSchema: Schema = [
               {
                 name: 'user.roles',
                 description: 'Roles to which the principal belongs',
-                example: ['kibana_user', 'beats_admin'],
+                example: ['kibana_admin', 'beats_admin'],
                 type: 'keyword',
               },
               {
diff --git a/x-pack/legacy/plugins/transform/common/constants.ts b/x-pack/legacy/plugins/transform/common/constants.ts
index c85408d3c5ce6..39138c12c8299 100644
--- a/x-pack/legacy/plugins/transform/common/constants.ts
+++ b/x-pack/legacy/plugins/transform/common/constants.ts
@@ -39,11 +39,11 @@ export const API_BASE_PATH = '/api/transform/';
 // - dest index: index, create_index (can be applied to a pattern e.g. df-*)
 //
 // In the UI additional privileges are required:
-// - kibana_user (builtin)
+// - kibana_admin (builtin)
 // - dest index: monitor (applied to df-*)
 // - cluster: monitor
 //
-// Note that users with kibana_user can see all Kibana index patterns and saved searches
+// Note that users with kibana_admin can see all Kibana index patterns and saved searches
 // in the source selection modal when creating a transform, but the wizard will trigger
 // error callouts when there are no sufficient privileges to read the actual source indices.
 
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/space_aware_privilege_section.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/space_aware_privilege_section.test.tsx.snap
index 07034aca18ec2..1fd565c7d07f3 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/space_aware_privilege_section.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/__snapshots__/space_aware_privilege_section.test.tsx.snap
@@ -24,14 +24,14 @@ exports[`<SpaceAwarePrivilegeSection> with user profile disabling "manageSpaces"
   </p>
   <p>
     <FormattedMessage
-      defaultMessage="Please ensure your account has all privileges granted by the {kibanaUser} role, and try again."
+      defaultMessage="Please ensure your account has all privileges granted by the {kibanaAdmin} role, and try again."
       id="xpack.security.management.editRole.spaceAwarePrivilegeForm.ensureAccountHasAllPrivilegesGrantedDescription"
       values={
         Object {
-          "kibanaUser": <strong>
+          "kibanaAdmin": <strong>
             <FormattedMessage
-              defaultMessage="kibana_user"
-              id="xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaUserTitle"
+              defaultMessage="kibana_admin"
+              id="xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaAdminTitle"
               values={Object {}}
             />
           </strong>,
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
index 21cadfafe1790..b2b92356e5126 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
@@ -95,13 +95,13 @@ class SpaceAwarePrivilegeSectionUI extends Component<Props, State> {
             <FormattedMessage
               id="xpack.security.management.editRole.spaceAwarePrivilegeForm.ensureAccountHasAllPrivilegesGrantedDescription"
               defaultMessage="Please ensure your account has all privileges granted by the
-              {kibanaUser} role, and try again."
+              {kibanaAdmin} role, and try again."
               values={{
-                kibanaUser: (
+                kibanaAdmin: (
                   <strong>
                     <FormattedMessage
-                      id="xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaUserTitle"
-                      defaultMessage="kibana_user"
+                      id="xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaAdminTitle"
+                      defaultMessage="kibana_admin"
                     />
                   </strong>
                 ),
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 817aa03db31bd..47e11817ffa5d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -8908,7 +8908,7 @@
     "xpack.ml.validateJob.validateJobButtonLabel": "ジョブを検証",
     "xpack.monitoring.accessDenied.backToKibanaButtonLabel": "Kibana に戻る",
     "xpack.monitoring.accessDenied.clusterNotConfiguredDescription": "専用の監視クラスターへのアクセスを試みている場合、監視クラスターで構成されていないユーザーとしてログインしていることが原因である可能性があります。",
-    "xpack.monitoring.accessDenied.notAuthorizedDescription": "監視アクセスが許可されていません。監視を利用するには、「{kibanaUser}」と「{monitoringUser}」の両方のロールからの権限が必要です。",
+    "xpack.monitoring.accessDenied.notAuthorizedDescription": "監視アクセスが許可されていません。監視を利用するには、「{kibanaAdmin}」と「{monitoringUser}」の両方のロールからの権限が必要です。",
     "xpack.monitoring.accessDeniedTitle": "アクセス拒否",
     "xpack.monitoring.ajaxErrorHandler.httpErrorMessage": "HTTP {errStatus}",
     "xpack.monitoring.ajaxErrorHandler.requestErrorNotificationTitle": "監視リクエストエラー",
@@ -10644,11 +10644,11 @@
     "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceBasePrivilegeSource": "スペースベース権限",
     "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceFeaturePrivilegeSource": "スペース機能権限",
     "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.unknownPrivilegeSource": "**不明**",
-    "xpack.security.management.editRole.spaceAwarePrivilegeForm.ensureAccountHasAllPrivilegesGrantedDescription": "{kibanaUser} ロールによりアカウントにすべての権限が提供されていることを確認し、再試行してください。",
+    "xpack.security.management.editRole.spaceAwarePrivilegeForm.ensureAccountHasAllPrivilegesGrantedDescription": "{kibanaAdmin} ロールによりアカウントにすべての権限が提供されていることを確認し、再試行してください。",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.globalSpacesName": "* グローバル (すべてのスペース)",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.howToViewAllAvailableSpacesDescription": "利用可能なすべてのスペースを表示する権限がありません。",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.insufficientPrivilegesDescription": "権限が不十分です",
-    "xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaUserTitle": "kibana_user",
+    "xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaAdminTitle": "kibana_admin",
     "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDetails": "選択されたスペースの全機能への完全アクセスを許可します。",
     "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDisplay": "すべて",
     "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDropdownDisplay": "すべて",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d8012bbb526c9..86d9a69dc0900 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -8907,7 +8907,7 @@
     "xpack.ml.validateJob.validateJobButtonLabel": "验证作业",
     "xpack.monitoring.accessDenied.backToKibanaButtonLabel": "返回 Kibana",
     "xpack.monitoring.accessDenied.clusterNotConfiguredDescription": "如果您尝试访问专用监测集群，则这可能是因为该监测集群上未配置您登录时所用的用户帐户。",
-    "xpack.monitoring.accessDenied.notAuthorizedDescription": "您无权访问 Monitoring。要使用 Monitoring，您同时需要 `{kibanaUser}` 和 `{monitoringUser}` 角色授予的权限。",
+    "xpack.monitoring.accessDenied.notAuthorizedDescription": "您无权访问 Monitoring。要使用 Monitoring，您同时需要 `{kibanaAdmin}` 和 `{monitoringUser}` 角色授予的权限。",
     "xpack.monitoring.accessDeniedTitle": "访问被拒绝",
     "xpack.monitoring.ajaxErrorHandler.httpErrorMessage": "HTTP {errStatus}",
     "xpack.monitoring.ajaxErrorHandler.requestErrorNotificationTitle": "Monitoring 请求错误",
@@ -10643,11 +10643,11 @@
     "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceBasePrivilegeSource": "工作区基本权限",
     "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.spaceFeaturePrivilegeSource": "全局功能权限",
     "xpack.security.management.editRole.spaceAwarePrivilegeDisplay.unknownPrivilegeSource": "**未知**",
-    "xpack.security.management.editRole.spaceAwarePrivilegeForm.ensureAccountHasAllPrivilegesGrantedDescription": "请确保您的帐户具有 {kibanaUser} 角色授予的所有权限，然后重试。",
+    "xpack.security.management.editRole.spaceAwarePrivilegeForm.ensureAccountHasAllPrivilegesGrantedDescription": "请确保您的帐户具有 {kibanaAdmin} 角色授予的所有权限，然后重试。",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.globalSpacesName": "* 全局（所有工作区）",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.howToViewAllAvailableSpacesDescription": "您无权查看所有可用工作区。",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.insufficientPrivilegesDescription": "权限不足",
-    "xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaUserTitle": "kibana_user",
+    "xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaAdminTitle": "kibana_admin",
     "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDetails": "授予对选定工作区所有功能的完全访问权限。",
     "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDisplay": "全部",
     "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDropdownDisplay": "全部",
diff --git a/x-pack/test/api_integration/apis/console/feature_controls.ts b/x-pack/test/api_integration/apis/console/feature_controls.ts
index 3f9a086779437..ce926f0d032c8 100644
--- a/x-pack/test/api_integration/apis/console/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/console/feature_controls.ts
@@ -43,6 +43,29 @@ export default function securityTests({ getService }: FtrProviderContext) {
       }
     });
 
+    it('can be accessed by kibana_admin role', async () => {
+      const username = 'kibana_admin';
+      const roleName = 'kibana_admin';
+      try {
+        const password = `${username}-password`;
+
+        await security.user.create(username, {
+          password,
+          roles: [roleName],
+          full_name: 'a kibana admin',
+        });
+
+        await supertest
+          .post(`/api/console/proxy?method=GET&path=${encodeURIComponent('/_cat')}`)
+          .auth(username, password)
+          .set('kbn-xsrf', 'xxx')
+          .send()
+          .expect(200);
+      } finally {
+        await security.user.delete(username);
+      }
+    });
+
     it('can be accessed by global all role', async () => {
       const username = 'global_all';
       const roleName = 'global_all';
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js
index 7e6a2dbe31965..4da08d7cb9726 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js
@@ -44,7 +44,7 @@ export default function({ getService }) {
       await security.user.create(username, {
         password: password,
         full_name: 'Limited User',
-        roles: ['kibana_user', 'monitoring_user'],
+        roles: ['kibana_admin', 'monitoring_user'],
       });
 
       const { body } = await supertestWithoutAuth
diff --git a/x-pack/test/api_integration/apis/short_urls/feature_controls.ts b/x-pack/test/api_integration/apis/short_urls/feature_controls.ts
index db5e11ef367ad..35a6f2c2b382a 100644
--- a/x-pack/test/api_integration/apis/short_urls/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/short_urls/feature_controls.ts
@@ -12,8 +12,8 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
   const security = getService('security');
 
   describe('feature controls', () => {
-    const kibanaUsername = 'kibana_user';
-    const kibanaUserRoleName = 'kibana_user';
+    const kibanaUsername = 'kibana_admin';
+    const kibanaUserRoleName = 'kibana_admin';
 
     const kibanaUserPassword = `${kibanaUsername}-password`;
 
diff --git a/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js b/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js
index 1189fe909ca32..b521c47585d58 100644
--- a/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js
+++ b/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js
@@ -92,7 +92,7 @@ export default function({ getService, getPageObjects }) {
         await testSubjects.setValue('userFormFullNameInput', 'mixeduser');
         await testSubjects.setValue('userFormEmailInput', 'example@example.com');
         await PageObjects.security.assignRoleToUser('kibana_dashboard_only_user');
-        await PageObjects.security.assignRoleToUser('kibana_user');
+        await PageObjects.security.assignRoleToUser('kibana_admin');
         await PageObjects.security.assignRoleToUser('logstash-data');
 
         await PageObjects.security.clickSaveEditUser();
diff --git a/x-pack/test/functional/apps/security/doc_level_security_roles.js b/x-pack/test/functional/apps/security/doc_level_security_roles.js
index 5761369f9e468..480fa6599e036 100644
--- a/x-pack/test/functional/apps/security/doc_level_security_roles.js
+++ b/x-pack/test/functional/apps/security/doc_level_security_roles.js
@@ -58,11 +58,11 @@ export default function({ getService, getPageObjects }) {
         fullname: 'dls EAST',
         email: 'dlstest@elastic.com',
         save: true,
-        roles: ['kibana_user', 'myroleEast'],
+        roles: ['kibana_admin', 'myroleEast'],
       });
       const users = indexBy(await PageObjects.security.getElasticsearchUsers(), 'username');
       log.debug('actualUsers = %j', users);
-      expect(users.userEast.roles).to.eql(['kibana_user', 'myroleEast']);
+      expect(users.userEast.roles).to.eql(['kibana_admin', 'myroleEast']);
       expect(users.userEast.reserved).to.be(false);
     });
 
diff --git a/x-pack/test/functional/apps/security/field_level_security.js b/x-pack/test/functional/apps/security/field_level_security.js
index 16e9d755bf261..93a6f9cd9e0c3 100644
--- a/x-pack/test/functional/apps/security/field_level_security.js
+++ b/x-pack/test/functional/apps/security/field_level_security.js
@@ -79,11 +79,11 @@ export default function({ getService, getPageObjects }) {
         fullname: 'customer one',
         email: 'flstest@elastic.com',
         save: true,
-        roles: ['kibana_user', 'a_viewssnrole'],
+        roles: ['kibana_admin', 'a_viewssnrole'],
       });
       const users = indexBy(await PageObjects.security.getElasticsearchUsers(), 'username');
       log.debug('actualUsers = %j', users);
-      expect(users.customer1.roles).to.eql(['kibana_user', 'a_viewssnrole']);
+      expect(users.customer1.roles).to.eql(['kibana_admin', 'a_viewssnrole']);
     });
 
     it('should add new user customer2 ', async function() {
@@ -95,11 +95,11 @@ export default function({ getService, getPageObjects }) {
         fullname: 'customer two',
         email: 'flstest@elastic.com',
         save: true,
-        roles: ['kibana_user', 'a_view_no_ssn_role'],
+        roles: ['kibana_admin', 'a_view_no_ssn_role'],
       });
       const users = indexBy(await PageObjects.security.getElasticsearchUsers(), 'username');
       log.debug('actualUsers = %j', users);
-      expect(users.customer2.roles).to.eql(['kibana_user', 'a_view_no_ssn_role']);
+      expect(users.customer2.roles).to.eql(['kibana_admin', 'a_view_no_ssn_role']);
     });
 
     it('user customer1 should see ssn', async function() {
diff --git a/x-pack/test/functional/apps/security/secure_roles_perm.js b/x-pack/test/functional/apps/security/secure_roles_perm.js
index ece289b4a666e..4e155872d1041 100644
--- a/x-pack/test/functional/apps/security/secure_roles_perm.js
+++ b/x-pack/test/functional/apps/security/secure_roles_perm.js
@@ -61,13 +61,13 @@ export default function({ getService, getPageObjects }) {
         fullname: 'RashmiFirst RashmiLast',
         email: 'rashmi@myEmail.com',
         save: true,
-        roles: ['logstash_reader', 'kibana_user'],
+        roles: ['logstash_reader', 'kibana_admin'],
       });
       log.debug('After Add user: , userObj.userName');
       const users = indexBy(await PageObjects.security.getElasticsearchUsers(), 'username');
       log.debug('actualUsers = %j', users);
       log.debug('roles: ', users.Rashmi.roles);
-      expect(users.Rashmi.roles).to.eql(['logstash_reader', 'kibana_user']);
+      expect(users.Rashmi.roles).to.eql(['logstash_reader', 'kibana_admin']);
       expect(users.Rashmi.fullname).to.eql('RashmiFirst RashmiLast');
       expect(users.Rashmi.reserved).to.be(false);
       await PageObjects.security.forceLogout();
diff --git a/x-pack/test/functional/apps/security/user_email.js b/x-pack/test/functional/apps/security/user_email.js
index 492eddcfb9f74..a007c40a06b62 100644
--- a/x-pack/test/functional/apps/security/user_email.js
+++ b/x-pack/test/functional/apps/security/user_email.js
@@ -27,11 +27,11 @@ export default function({ getService, getPageObjects }) {
         fullname: 'newuserFirst newuserLast',
         email: 'newuser@myEmail.com',
         save: true,
-        roles: ['kibana_user', 'superuser'],
+        roles: ['kibana_admin', 'superuser'],
       });
       const users = indexBy(await PageObjects.security.getElasticsearchUsers(), 'username');
       log.debug('actualUsers = %j', users);
-      expect(users.newuser.roles).to.eql(['kibana_user', 'superuser']);
+      expect(users.newuser.roles).to.eql(['kibana_admin', 'superuser']);
       expect(users.newuser.fullname).to.eql('newuserFirst newuserLast');
       expect(users.newuser.email).to.eql('newuser@myEmail.com');
       expect(users.newuser.reserved).to.be(false);
diff --git a/x-pack/test/functional/apps/security/users.js b/x-pack/test/functional/apps/security/users.js
index 3eed74881e957..9dc42553f0fdf 100644
--- a/x-pack/test/functional/apps/security/users.js
+++ b/x-pack/test/functional/apps/security/users.js
@@ -42,11 +42,11 @@ export default function({ getService, getPageObjects }) {
         fullname: 'LeeFirst LeeLast',
         email: 'lee@myEmail.com',
         save: true,
-        roles: ['kibana_user'],
+        roles: ['kibana_admin'],
       });
       const users = indexBy(await PageObjects.security.getElasticsearchUsers(), 'username');
       log.debug('actualUsers = %j', users);
-      expect(users.Lee.roles).to.eql(['kibana_user']);
+      expect(users.Lee.roles).to.eql(['kibana_admin']);
       expect(users.Lee.fullname).to.eql('LeeFirst LeeLast');
       expect(users.Lee.email).to.eql('lee@myEmail.com');
       expect(users.Lee.reserved).to.be(false);
@@ -85,7 +85,7 @@ export default function({ getService, getPageObjects }) {
       expect(roles.apm_user.reserved).to.be(true);
       expect(roles.beats_admin.reserved).to.be(true);
       expect(roles.beats_system.reserved).to.be(true);
-      expect(roles.kibana_user.reserved).to.be(true);
+      expect(roles.kibana_admin.reserved).to.be(true);
       expect(roles.kibana_system.reserved).to.be(true);
       expect(roles.logstash_system.reserved).to.be(true);
       expect(roles.monitoring_user.reserved).to.be(true);
diff --git a/x-pack/test/functional/page_objects/monitoring_page.js b/x-pack/test/functional/page_objects/monitoring_page.js
index 6920010d67187..8de5b5e69d34d 100644
--- a/x-pack/test/functional/page_objects/monitoring_page.js
+++ b/x-pack/test/functional/page_objects/monitoring_page.js
@@ -14,7 +14,7 @@ export function MonitoringPageProvider({ getPageObjects, getService }) {
       // always create this because our tear down tries to delete it
       await security.user.create('basic_monitoring_user', {
         password: 'monitoring_user_password',
-        roles: ['monitoring_user', 'kibana_user'],
+        roles: ['monitoring_user', 'kibana_admin'],
         full_name: 'basic monitoring',
       });
 
diff --git a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
index 0346da334d2f2..203f90c55aa82 100644
--- a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
+++ b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
@@ -38,7 +38,7 @@ export default function({ getService }: FtrProviderContext) {
       await getService('esSupertest')
         .post('/_security/role_mapping/krb5')
         .send({
-          roles: ['kibana_user'],
+          roles: ['kibana_admin'],
           enabled: true,
           rules: { field: { 'realm.name': 'kerb1' } },
         })
@@ -119,7 +119,7 @@ export default function({ getService }: FtrProviderContext) {
           .set('Cookie', sessionCookie.cookieString())
           .expect(200, {
             username: 'tester@TEST.ELASTIC.CO',
-            roles: ['kibana_user'],
+            roles: ['kibana_admin'],
             full_name: null,
             email: null,
             metadata: {
diff --git a/x-pack/test/pki_api_integration/apis/security/pki_auth.ts b/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
index 4eee900e68bec..186ed824b3b6c 100644
--- a/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
+++ b/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
@@ -48,7 +48,7 @@ export default function({ getService }: FtrProviderContext) {
         .post('/_security/role_mapping/first_client_pki')
         .ca(CA_CERT)
         .send({
-          roles: ['kibana_user'],
+          roles: ['kibana_admin'],
           enabled: true,
           rules: { field: { dn: 'CN=first_client' } },
         })
@@ -107,7 +107,7 @@ export default function({ getService }: FtrProviderContext) {
 
       expect(response.body).to.eql({
         username: 'first_client',
-        roles: ['kibana_user'],
+        roles: ['kibana_admin'],
         full_name: null,
         email: null,
         enabled: true,
diff --git a/x-pack/test_utils/kbn_server_config.ts b/x-pack/test_utils/kbn_server_config.ts
index 75f5ac736b7c0..3cac6ed5df014 100644
--- a/x-pack/test_utils/kbn_server_config.ts
+++ b/x-pack/test_utils/kbn_server_config.ts
@@ -26,9 +26,9 @@ export const TestKbnServerConfig = {
   },
   users: [
     {
-      username: 'kibana_user',
+      username: 'kibana_admin',
       password: 'x-pack-test-password',
-      roles: ['kibana_user'],
+      roles: ['kibana_admin'],
     },
   ],
 };

From c2a6e7571b4803558b004f9d64c409a0a58ccab3 Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Fri, 31 Jan 2020 12:50:17 -0700
Subject: [PATCH 17/26] [Reporting] Use ES plugin from NP (#56209)

* [Reporting] Use ES plugin from NP

* fix elasticsearchErrors reference

* fix mocha test

* convert to jest

* fix the code and tests

* cosmetics

* fix mocha tests

* fix imports

* fix mocha tests

* fix jest

* simplify

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../csv/server/execute_job.test.js            | 272 +++++++++---------
 .../export_types/csv/server/execute_job.ts    |  15 +-
 .../server/create_job/create_job.ts           |  15 +-
 .../server/execute_job.ts                     |   8 +-
 .../server/lib/generate_csv.ts                |   3 +
 .../server/lib/generate_csv_search.ts         |  11 +-
 .../png/server/execute_job/index.test.js      |  27 +-
 .../png/server/execute_job/index.ts           |   2 +
 .../server/execute_job/index.test.js          |  26 +-
 .../printable_pdf/server/execute_job/index.ts |   2 +
 x-pack/legacy/plugins/reporting/index.ts      |  29 +-
 .../reporting/server/lib/create_queue.ts      |   6 +-
 .../server/lib/create_worker.test.ts          |  31 +-
 .../reporting/server/lib/create_worker.ts     |   6 +-
 .../reporting/server/lib/enqueue_job.ts       |   4 +-
 .../fixtures/legacy_elasticsearch.js          |  34 ++-
 .../esqueue/__tests__/helpers/create_index.js |   6 +-
 .../server/lib/esqueue/__tests__/index.js     |   2 +-
 .../server/lib/esqueue/__tests__/job.js       |  16 +-
 .../server/lib/esqueue/__tests__/worker.js    |  66 ++---
 .../lib/esqueue/helpers/create_index.js       |   4 +-
 .../reporting/server/lib/esqueue/index.js     |   2 +-
 .../reporting/server/lib/esqueue/job.js       |   6 +-
 .../reporting/server/lib/esqueue/worker.js    |   8 +-
 .../reporting/server/lib/jobs_query.ts        |  14 +-
 .../reporting/server/lib/validate/index.ts    |   6 +-
 ...js => validate_max_content_length.test.js} |  57 ++--
 .../validate/validate_max_content_length.ts   |  12 +-
 .../legacy/plugins/reporting/server/plugin.ts |  32 +--
 .../generate_from_savedobject_immediate.ts    |   5 +-
 .../reporting/server/routes/generation.ts     |  17 +-
 .../reporting/server/routes/jobs.test.js      |  50 ++--
 .../plugins/reporting/server/routes/jobs.ts   |   5 +-
 .../server/routes/lib/job_response_handler.ts |   8 +-
 x-pack/legacy/plugins/reporting/types.d.ts    |  13 +-
 35 files changed, 441 insertions(+), 379 deletions(-)
 rename x-pack/legacy/plugins/reporting/server/lib/validate/{__tests__/validate_max_content_length.js => validate_max_content_length.test.js} (65%)

diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
index 1abc923d340e6..06ba36f600b9b 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
@@ -37,9 +37,15 @@ describe('CSV Execute Job', function() {
   let cancellationToken;
   let mockServer;
   let clusterStub;
-  let callWithRequestStub;
+  let callAsCurrentUserStub;
   let uiSettingsGetStub;
 
+  const mockElasticsearch = {
+    dataClient: {
+      asScoped: () => clusterStub,
+    },
+  };
+
   beforeAll(async function() {
     const crypto = nodeCrypto({ encryptionKey });
     encryptedHeaders = await crypto.encrypt(headers);
@@ -55,11 +61,11 @@ describe('CSV Execute Job', function() {
       _scroll_id: 'defaultScrollId',
     };
     clusterStub = {
-      callWithRequest: function() {},
+      callAsCurrentUser: function() {},
     };
 
-    callWithRequestStub = sinon
-      .stub(clusterStub, 'callWithRequest')
+    callAsCurrentUserStub = sinon
+      .stub(clusterStub, 'callAsCurrentUser')
       .resolves(defaultElasticsearchResponse);
 
     const configGetStub = sinon.stub();
@@ -68,7 +74,6 @@ describe('CSV Execute Job', function() {
     uiSettingsGetStub.withArgs('csv:quoteValues').returns(true);
 
     mockServer = {
-      expose: function() {},
       fieldFormatServiceFactory: function() {
         const uiConfigMock = {};
         uiConfigMock['format:defaultTypeMap'] = {
@@ -81,13 +86,6 @@ describe('CSV Execute Job', function() {
 
         return fieldFormatsRegistry;
       },
-      plugins: {
-        elasticsearch: {
-          getCluster: function() {
-            return clusterStub;
-          },
-        },
-      },
       config: function() {
         return {
           get: configGetStub,
@@ -117,7 +115,7 @@ describe('CSV Execute Job', function() {
 
   describe('calls getScopedSavedObjectsClient with request', function() {
     it('containing decrypted headers', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -135,7 +133,7 @@ describe('CSV Execute Job', function() {
         .config()
         .get.withArgs('server.basePath')
         .returns(serverBasePath);
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -153,7 +151,7 @@ describe('CSV Execute Job', function() {
         .config()
         .get.withArgs('server.basePath')
         .returns(serverBasePath);
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobBasePath = 'foo-job/basePath/';
       await executeJob(
         'job789',
@@ -176,7 +174,7 @@ describe('CSV Execute Job', function() {
     it('passed scoped SavedObjectsClient to uiSettingsServiceFactory', async function() {
       const returnValue = Symbol();
       mockServer.savedObjects.getScopedSavedObjectsClient.returns(returnValue);
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -190,15 +188,15 @@ describe('CSV Execute Job', function() {
   });
 
   describe('basic Elasticsearch call behavior', function() {
-    it('should decrypt encrypted headers and pass to callWithRequest', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+    it('should decrypt encrypted headers and pass to callAsCurrentUser', async function() {
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
         cancellationToken
       );
-      expect(callWithRequestStub.called).toBe(true);
-      expect(callWithRequestStub.firstCall.args[0].headers).toEqual(headers);
+      expect(callAsCurrentUserStub.called).toBe(true);
+      expect(callAsCurrentUserStub.firstCall.args[0]).toEqual('search');
     });
 
     it('should pass the index and body to execute the initial search', async function() {
@@ -207,7 +205,7 @@ describe('CSV Execute Job', function() {
         testBody: true,
       };
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const job = {
         headers: encryptedHeaders,
         fields: [],
@@ -219,115 +217,115 @@ describe('CSV Execute Job', function() {
 
       await executeJob('job777', job, cancellationToken);
 
-      const searchCall = callWithRequestStub.firstCall;
-      expect(searchCall.args[1]).toBe('search');
-      expect(searchCall.args[2].index).toBe(index);
-      expect(searchCall.args[2].body).toBe(body);
+      const searchCall = callAsCurrentUserStub.firstCall;
+      expect(searchCall.args[0]).toBe('search');
+      expect(searchCall.args[1].index).toBe(index);
+      expect(searchCall.args[1].body).toBe(body);
     });
 
     it('should pass the scrollId from the initial search to the subsequent scroll', async function() {
       const scrollId = getRandomScrollId();
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: scrollId,
       });
-      callWithRequestStub.onSecondCall().resolves(defaultElasticsearchResponse);
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      callAsCurrentUserStub.onSecondCall().resolves(defaultElasticsearchResponse);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
         cancellationToken
       );
 
-      const scrollCall = callWithRequestStub.secondCall;
+      const scrollCall = callAsCurrentUserStub.secondCall;
 
-      expect(scrollCall.args[1]).toBe('scroll');
-      expect(scrollCall.args[2].scrollId).toBe(scrollId);
+      expect(scrollCall.args[0]).toBe('scroll');
+      expect(scrollCall.args[1].scrollId).toBe(scrollId);
     });
 
     it('should not execute scroll if there are no hits from the search', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
         cancellationToken
       );
 
-      expect(callWithRequestStub.callCount).toBe(2);
+      expect(callAsCurrentUserStub.callCount).toBe(2);
 
-      const searchCall = callWithRequestStub.firstCall;
-      expect(searchCall.args[1]).toBe('search');
+      const searchCall = callAsCurrentUserStub.firstCall;
+      expect(searchCall.args[0]).toBe('search');
 
-      const clearScrollCall = callWithRequestStub.secondCall;
-      expect(clearScrollCall.args[1]).toBe('clearScroll');
+      const clearScrollCall = callAsCurrentUserStub.secondCall;
+      expect(clearScrollCall.args[0]).toBe('clearScroll');
     });
 
     it('should stop executing scroll if there are no hits', async function() {
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: 'scrollId',
       });
-      callWithRequestStub.onSecondCall().resolves({
+      callAsCurrentUserStub.onSecondCall().resolves({
         hits: {
           hits: [],
         },
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
         cancellationToken
       );
 
-      expect(callWithRequestStub.callCount).toBe(3);
+      expect(callAsCurrentUserStub.callCount).toBe(3);
 
-      const searchCall = callWithRequestStub.firstCall;
-      expect(searchCall.args[1]).toBe('search');
+      const searchCall = callAsCurrentUserStub.firstCall;
+      expect(searchCall.args[0]).toBe('search');
 
-      const scrollCall = callWithRequestStub.secondCall;
-      expect(scrollCall.args[1]).toBe('scroll');
+      const scrollCall = callAsCurrentUserStub.secondCall;
+      expect(scrollCall.args[0]).toBe('scroll');
 
-      const clearScroll = callWithRequestStub.thirdCall;
-      expect(clearScroll.args[1]).toBe('clearScroll');
+      const clearScroll = callAsCurrentUserStub.thirdCall;
+      expect(clearScroll.args[0]).toBe('clearScroll');
     });
 
     it('should call clearScroll with scrollId when there are no more hits', async function() {
       const lastScrollId = getRandomScrollId();
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: 'scrollId',
       });
 
-      callWithRequestStub.onSecondCall().resolves({
+      callAsCurrentUserStub.onSecondCall().resolves({
         hits: {
           hits: [],
         },
         _scroll_id: lastScrollId,
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       await executeJob(
         'job456',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
         cancellationToken
       );
 
-      const lastCall = callWithRequestStub.getCall(callWithRequestStub.callCount - 1);
-      expect(lastCall.args[1]).toBe('clearScroll');
-      expect(lastCall.args[2].scrollId).toEqual([lastScrollId]);
+      const lastCall = callAsCurrentUserStub.getCall(callAsCurrentUserStub.callCount - 1);
+      expect(lastCall.args[0]).toBe('clearScroll');
+      expect(lastCall.args[1].scrollId).toEqual([lastScrollId]);
     });
 
     it('calls clearScroll when there is an error iterating the hits', async function() {
       const lastScrollId = getRandomScrollId();
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [
             {
@@ -341,7 +339,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: lastScrollId,
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -352,9 +350,9 @@ describe('CSV Execute Job', function() {
         executeJob('job123', jobParams, cancellationToken)
       ).rejects.toMatchInlineSnapshot(`[TypeError: Cannot read property 'indexOf' of undefined]`);
 
-      const lastCall = callWithRequestStub.getCall(callWithRequestStub.callCount - 1);
-      expect(lastCall.args[1]).toBe('clearScroll');
-      expect(lastCall.args[2].scrollId).toEqual([lastScrollId]);
+      const lastCall = callAsCurrentUserStub.getCall(callAsCurrentUserStub.callCount - 1);
+      expect(lastCall.args[0]).toBe('clearScroll');
+      expect(lastCall.args[1].scrollId).toEqual([lastScrollId]);
     });
   });
 
@@ -364,14 +362,14 @@ describe('CSV Execute Job', function() {
         .config()
         .get.withArgs('xpack.reporting.csv.checkForFormulas')
         .returns(true);
-      callWithRequestStub.onFirstCall().returns({
+      callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: '=SUM(A1:A2)', two: 'bar' } }],
         },
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -392,14 +390,14 @@ describe('CSV Execute Job', function() {
         .config()
         .get.withArgs('xpack.reporting.csv.checkForFormulas')
         .returns(true);
-      callWithRequestStub.onFirstCall().returns({
+      callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { '=SUM(A1:A2)': 'foo', two: 'bar' } }],
         },
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['=SUM(A1:A2)', 'two'],
@@ -420,14 +418,14 @@ describe('CSV Execute Job', function() {
         .config()
         .get.withArgs('xpack.reporting.csv.checkForFormulas')
         .returns(true);
-      callWithRequestStub.onFirstCall().returns({
+      callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
         },
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -448,14 +446,14 @@ describe('CSV Execute Job', function() {
         .config()
         .get.withArgs('xpack.reporting.csv.checkForFormulas')
         .returns(false);
-      callWithRequestStub.onFirstCall().returns({
+      callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{ _source: { one: '=SUM(A1:A2)', two: 'bar' } }],
         },
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -474,8 +472,8 @@ describe('CSV Execute Job', function() {
 
   describe('Elasticsearch call errors', function() {
     it('should reject Promise if search call errors out', async function() {
-      callWithRequestStub.rejects(new Error());
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      callAsCurrentUserStub.rejects(new Error());
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -487,14 +485,14 @@ describe('CSV Execute Job', function() {
     });
 
     it('should reject Promise if scroll call errors out', async function() {
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: 'scrollId',
       });
-      callWithRequestStub.onSecondCall().rejects(new Error());
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      callAsCurrentUserStub.onSecondCall().rejects(new Error());
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -508,14 +506,14 @@ describe('CSV Execute Job', function() {
 
   describe('invalid responses', function() {
     it('should reject Promise if search returns hits but no _scroll_id', async function() {
-      callWithRequestStub.resolves({
+      callAsCurrentUserStub.resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: undefined,
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -529,14 +527,14 @@ describe('CSV Execute Job', function() {
     });
 
     it('should reject Promise if search returns no hits and no _scroll_id', async function() {
-      callWithRequestStub.resolves({
+      callAsCurrentUserStub.resolves({
         hits: {
           hits: [],
         },
         _scroll_id: undefined,
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -550,21 +548,21 @@ describe('CSV Execute Job', function() {
     });
 
     it('should reject Promise if scroll returns hits but no _scroll_id', async function() {
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: 'scrollId',
       });
 
-      callWithRequestStub.onSecondCall().resolves({
+      callAsCurrentUserStub.onSecondCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: undefined,
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -578,21 +576,21 @@ describe('CSV Execute Job', function() {
     });
 
     it('should reject Promise if scroll returns no hits and no _scroll_id', async function() {
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: 'scrollId',
       });
 
-      callWithRequestStub.onSecondCall().resolves({
+      callAsCurrentUserStub.onSecondCall().resolves({
         hits: {
           hits: [],
         },
         _scroll_id: undefined,
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: [],
@@ -610,23 +608,25 @@ describe('CSV Execute Job', function() {
     const scrollId = getRandomScrollId();
 
     beforeEach(function() {
-      // We have to "re-stub" the callWithRequest stub here so that we can use the fakeFunction
+      // We have to "re-stub" the callAsCurrentUser stub here so that we can use the fakeFunction
       // that delays the Promise resolution so we have a chance to call cancellationToken.cancel().
       // Otherwise, we get into an endless loop, and don't have a chance to call cancel
-      callWithRequestStub.restore();
-      callWithRequestStub = sinon.stub(clusterStub, 'callWithRequest').callsFake(async function() {
-        await delay(1);
-        return {
-          hits: {
-            hits: [{}],
-          },
-          _scroll_id: scrollId,
-        };
-      });
+      callAsCurrentUserStub.restore();
+      callAsCurrentUserStub = sinon
+        .stub(clusterStub, 'callAsCurrentUser')
+        .callsFake(async function() {
+          await delay(1);
+          return {
+            hits: {
+              hits: [{}],
+            },
+            _scroll_id: scrollId,
+          };
+        });
     });
 
     it('should stop calling Elasticsearch when cancellationToken.cancel is called', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -634,14 +634,14 @@ describe('CSV Execute Job', function() {
       );
 
       await delay(250);
-      const callCount = callWithRequestStub.callCount;
+      const callCount = callAsCurrentUserStub.callCount;
       cancellationToken.cancel();
       await delay(250);
-      expect(callWithRequestStub.callCount).toBe(callCount + 1); // last call is to clear the scroll
+      expect(callAsCurrentUserStub.callCount).toBe(callCount + 1); // last call is to clear the scroll
     });
 
     it(`shouldn't call clearScroll if it never got a scrollId`, async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -649,13 +649,13 @@ describe('CSV Execute Job', function() {
       );
       cancellationToken.cancel();
 
-      for (let i = 0; i < callWithRequestStub.callCount; ++i) {
-        expect(callWithRequestStub.getCall(i).args[1]).to.not.be('clearScroll');
+      for (let i = 0; i < callAsCurrentUserStub.callCount; ++i) {
+        expect(callAsCurrentUserStub.getCall(i).args[1]).to.not.be('clearScroll');
       }
     });
 
     it('should call clearScroll if it got a scrollId', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       executeJob(
         'job345',
         { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
@@ -665,15 +665,15 @@ describe('CSV Execute Job', function() {
       cancellationToken.cancel();
       await delay(100);
 
-      const lastCall = callWithRequestStub.getCall(callWithRequestStub.callCount - 1);
-      expect(lastCall.args[1]).toBe('clearScroll');
-      expect(lastCall.args[2].scrollId).toEqual([scrollId]);
+      const lastCall = callAsCurrentUserStub.getCall(callAsCurrentUserStub.callCount - 1);
+      expect(lastCall.args[0]).toBe('clearScroll');
+      expect(lastCall.args[1].scrollId).toEqual([scrollId]);
     });
   });
 
   describe('csv content', function() {
     it('should write column headers to output, even if there are no results', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -685,7 +685,7 @@ describe('CSV Execute Job', function() {
 
     it('should use custom uiSettings csv:separator for header', async function() {
       uiSettingsGetStub.withArgs('csv:separator').returns(';');
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -697,7 +697,7 @@ describe('CSV Execute Job', function() {
 
     it('should escape column headers if uiSettings csv:quoteValues is true', async function() {
       uiSettingsGetStub.withArgs('csv:quoteValues').returns(true);
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
@@ -709,7 +709,7 @@ describe('CSV Execute Job', function() {
 
     it(`shouldn't escape column headers if uiSettings csv:quoteValues is false`, async function() {
       uiSettingsGetStub.withArgs('csv:quoteValues').returns(false);
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
@@ -720,8 +720,8 @@ describe('CSV Execute Job', function() {
     });
 
     it('should write column headers to output, when there are results', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
-      callWithRequestStub.onFirstCall().resolves({
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ one: '1', two: '2' }],
         },
@@ -740,8 +740,8 @@ describe('CSV Execute Job', function() {
     });
 
     it('should use comma separated values of non-nested fields from _source', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
-      callWithRequestStub.onFirstCall().resolves({
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
         },
@@ -761,14 +761,14 @@ describe('CSV Execute Job', function() {
     });
 
     it('should concatenate the hits from multiple responses', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
-      callWithRequestStub.onFirstCall().resolves({
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
         },
         _scroll_id: 'scrollId',
       });
-      callWithRequestStub.onSecondCall().resolves({
+      callAsCurrentUserStub.onSecondCall().resolves({
         hits: {
           hits: [{ _source: { one: 'baz', two: 'qux' } }],
         },
@@ -789,8 +789,8 @@ describe('CSV Execute Job', function() {
     });
 
     it('should use field formatters to format fields', async function() {
-      const executeJob = executeJobFactory(mockServer, mockLogger);
-      callWithRequestStub.onFirstCall().resolves({
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{ _source: { one: 'foo', two: 'bar' } }],
         },
@@ -834,7 +834,7 @@ describe('CSV Execute Job', function() {
           .get.withArgs('xpack.reporting.csv.maxSizeBytes')
           .returns(1);
 
-        const executeJob = executeJobFactory(mockServer, mockLogger);
+        const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -867,7 +867,7 @@ describe('CSV Execute Job', function() {
           .get.withArgs('xpack.reporting.csv.maxSizeBytes')
           .returns(9);
 
-        const executeJob = executeJobFactory(mockServer, mockLogger);
+        const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -900,14 +900,14 @@ describe('CSV Execute Job', function() {
           .get.withArgs('xpack.reporting.csv.maxSizeBytes')
           .returns(9);
 
-        callWithRequestStub.onFirstCall().returns({
+        callAsCurrentUserStub.onFirstCall().returns({
           hits: {
             hits: [{ _source: { one: 'foo', two: 'bar' } }],
           },
           _scroll_id: 'scrollId',
         });
 
-        const executeJob = executeJobFactory(mockServer, mockLogger);
+        const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -941,14 +941,14 @@ describe('CSV Execute Job', function() {
           .get.withArgs('xpack.reporting.csv.maxSizeBytes')
           .returns(18);
 
-        callWithRequestStub.onFirstCall().returns({
+        callAsCurrentUserStub.onFirstCall().returns({
           hits: {
             hits: [{ _source: { one: 'foo', two: 'bar' } }],
           },
           _scroll_id: 'scrollId',
         });
 
-        const executeJob = executeJobFactory(mockServer, mockLogger);
+        const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
         const jobParams = {
           headers: encryptedHeaders,
           fields: ['one', 'two'],
@@ -981,14 +981,14 @@ describe('CSV Execute Job', function() {
         .get.withArgs('xpack.reporting.csv.scroll')
         .returns({ duration: scrollDuration });
 
-      callWithRequestStub.onFirstCall().returns({
+      callAsCurrentUserStub.onFirstCall().returns({
         hits: {
           hits: [{}],
         },
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -998,9 +998,9 @@ describe('CSV Execute Job', function() {
 
       await executeJob('job123', jobParams, cancellationToken);
 
-      const searchCall = callWithRequestStub.firstCall;
-      expect(searchCall.args[1]).toBe('search');
-      expect(searchCall.args[2].scroll).toBe(scrollDuration);
+      const searchCall = callAsCurrentUserStub.firstCall;
+      expect(searchCall.args[0]).toBe('search');
+      expect(searchCall.args[1].scroll).toBe(scrollDuration);
     });
 
     it('passes scroll size to initial search call', async function() {
@@ -1010,14 +1010,14 @@ describe('CSV Execute Job', function() {
         .get.withArgs('xpack.reporting.csv.scroll')
         .returns({ size: scrollSize });
 
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -1027,9 +1027,9 @@ describe('CSV Execute Job', function() {
 
       await executeJob('job123', jobParams, cancellationToken);
 
-      const searchCall = callWithRequestStub.firstCall;
-      expect(searchCall.args[1]).toBe('search');
-      expect(searchCall.args[2].size).toBe(scrollSize);
+      const searchCall = callAsCurrentUserStub.firstCall;
+      expect(searchCall.args[0]).toBe('search');
+      expect(searchCall.args[1].size).toBe(scrollSize);
     });
 
     it('passes scroll duration to subsequent scroll call', async function() {
@@ -1039,14 +1039,14 @@ describe('CSV Execute Job', function() {
         .get.withArgs('xpack.reporting.csv.scroll')
         .returns({ duration: scrollDuration });
 
-      callWithRequestStub.onFirstCall().resolves({
+      callAsCurrentUserStub.onFirstCall().resolves({
         hits: {
           hits: [{}],
         },
         _scroll_id: 'scrollId',
       });
 
-      const executeJob = executeJobFactory(mockServer, mockLogger);
+      const executeJob = executeJobFactory(mockServer, mockElasticsearch, mockLogger);
       const jobParams = {
         headers: encryptedHeaders,
         fields: ['one', 'two'],
@@ -1056,9 +1056,9 @@ describe('CSV Execute Job', function() {
 
       await executeJob('job123', jobParams, cancellationToken);
 
-      const scrollCall = callWithRequestStub.secondCall;
-      expect(scrollCall.args[1]).toBe('scroll');
-      expect(scrollCall.args[2].scroll).toBe(scrollDuration);
+      const scrollCall = callAsCurrentUserStub.secondCall;
+      expect(scrollCall.args[0]).toBe('scroll');
+      expect(scrollCall.args[1].scroll).toBe(scrollDuration);
     });
   });
 });
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
index fe64fdc96d904..280bbf13fa992 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.ts
@@ -4,8 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import Hapi from 'hapi';
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from '../../../../../../../src/core/server';
+import { ElasticsearchServiceSetup, KibanaRequest } from '../../../../../../../src/core/server';
 import { CSV_JOB_TYPE } from '../../../common/constants';
 import { cryptoFactory } from '../../../server/lib';
 import { ESQueueWorkerExecuteFn, ExecuteJobFactory, Logger, ServerFacade } from '../../../types';
@@ -15,8 +16,11 @@ import { createGenerateCsv } from './lib/generate_csv';
 
 export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
   JobDocPayloadDiscoverCsv
->> = function executeJobFactoryFn(server: ServerFacade, parentLogger: Logger) {
-  const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
+>> = function executeJobFactoryFn(
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
+  parentLogger: Logger
+) {
   const crypto = cryptoFactory(server);
   const config = server.config();
   const logger = parentLogger.clone([CSV_JOB_TYPE, 'execute-job']);
@@ -74,8 +78,11 @@ export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn<
       },
     };
 
+    const { callAsCurrentUser } = elasticsearch.dataClient.asScoped(
+      KibanaRequest.from(fakeRequest as Hapi.Request)
+    );
     const callEndpoint = (endpoint: string, clientParams = {}, options = {}) => {
-      return callWithRequest(fakeRequest, endpoint, clientParams, options);
+      return callAsCurrentUser(endpoint, clientParams, options);
     };
     const savedObjects = server.savedObjects;
     const savedObjectsClient = savedObjects.getScopedSavedObjectsClient(
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
index a270e3e0329fe..ddef2aa0a6268 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
@@ -6,24 +6,25 @@
 
 import { notFound, notImplemented } from 'boom';
 import { get } from 'lodash';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../../common/constants';
 import { cryptoFactory } from '../../../../server/lib';
 import {
   CreateJobFactory,
   ImmediateCreateJobFn,
-  ServerFacade,
-  RequestFacade,
   Logger,
+  RequestFacade,
+  ServerFacade,
 } from '../../../../types';
 import {
+  JobDocPayloadPanelCsv,
+  JobParamsPanelCsv,
   SavedObject,
   SavedObjectServiceError,
   SavedSearchObjectAttributesJSON,
   SearchPanel,
   TimeRangeParams,
   VisObjectAttributesJSON,
-  JobDocPayloadPanelCsv,
-  JobParamsPanelCsv,
 } from '../../types';
 import { createJobSearch } from './create_job_search';
 
@@ -35,7 +36,11 @@ interface VisData {
 
 export const createJobFactory: CreateJobFactory<ImmediateCreateJobFn<
   JobParamsPanelCsv
->> = function createJobFactoryFn(server: ServerFacade, parentLogger: Logger) {
+>> = function createJobFactoryFn(
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
+  parentLogger: Logger
+) {
   const crypto = cryptoFactory(server);
   const logger = parentLogger.clone([CSV_FROM_SAVEDOBJECT_JOB_TYPE, 'create-job']);
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
index 03f491deaa43d..b1b7b7d818200 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
@@ -5,6 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { CONTENT_TYPE_CSV, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
 import { cryptoFactory } from '../../../server/lib';
 import {
@@ -21,7 +22,11 @@ import { createGenerateCsv } from './lib';
 
 export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
   JobParamsPanelCsv
->> = function executeJobFactoryFn(server: ServerFacade, parentLogger: Logger) {
+>> = function executeJobFactoryFn(
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
+  parentLogger: Logger
+) {
   const crypto = cryptoFactory(server);
   const logger = parentLogger.clone([CSV_FROM_SAVEDOBJECT_JOB_TYPE, 'execute-job']);
 
@@ -85,6 +90,7 @@ export const executeJobFactory: ExecuteJobFactory<ImmediateExecuteFn<
       const generateResults: CsvResultFromSearch = await generateCsv(
         requestObject,
         server,
+        elasticsearch,
         visType as string,
         panel,
         jobParams
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
index 6a4c6df5e1ace..d7b016d13fc22 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
@@ -5,6 +5,7 @@
  */
 
 import { badRequest } from 'boom';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { ServerFacade, RequestFacade, Logger } from '../../../../types';
 import { SearchPanel, VisPanel, JobParamsPanelCsv, FakeRequest } from '../../types';
 import { generateCsvSearch } from './generate_csv_search';
@@ -13,6 +14,7 @@ export function createGenerateCsv(logger: Logger) {
   return async function generateCsv(
     request: RequestFacade | FakeRequest,
     server: ServerFacade,
+    elasticsearch: ElasticsearchServiceSetup,
     visType: string,
     panel: VisPanel | SearchPanel,
     jobParams: JobParamsPanelCsv
@@ -27,6 +29,7 @@ export function createGenerateCsv(logger: Logger) {
         return await generateCsvSearch(
           request as RequestFacade,
           server,
+          elasticsearch,
           logger,
           panel as SearchPanel,
           jobParams
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
index 8f31509962481..1788cc60a23c0 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from '../../../../../../../../src/core/server';
+import { ElasticsearchServiceSetup, KibanaRequest } from '../../../../../../../../src/core/server';
 import { createGenerateCsv } from '../../../csv/server/lib/generate_csv';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import { ServerFacade, RequestFacade, Logger } from '../../../../types';
@@ -58,6 +57,7 @@ const getUiSettings = async (config: any) => {
 export async function generateCsvSearch(
   req: RequestFacade,
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger,
   searchPanel: SearchPanel,
   jobParams: JobParamsDiscoverCsv
@@ -152,8 +152,11 @@ export async function generateCsvSearch(
       sort: sortConfig,
     },
   };
-  const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
-  const callCluster = (...params: [string, object]) => callWithRequest(req, ...params);
+
+  const { callAsCurrentUser } = elasticsearch.dataClient.asScoped(
+    KibanaRequest.from(req.getRawRequest())
+  );
+  const callCluster = (...params: [string, object]) => callAsCurrentUser(...params);
   const config = server.config();
   const uiSettings = await getUiSettings(uiConfig);
 
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 4f02ab5d4c077..bb33ef9c19a1d 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
@@ -32,15 +32,6 @@ beforeEach(() => {
     info: {
       protocol: 'http',
     },
-    plugins: {
-      elasticsearch: {
-        getCluster: memoize(() => {
-          return {
-            callWithRequest: jest.fn(),
-          };
-        }),
-      },
-    },
     savedObjects: {
       getScopedSavedObjectsClient: jest.fn(),
     },
@@ -57,6 +48,12 @@ beforeEach(() => {
 
 afterEach(() => generatePngObservableFactory.mockReset());
 
+const mockElasticsearch = {
+  dataClient: {
+    asScoped: () => ({ callAsCurrentUser: jest.fn() }),
+  },
+};
+
 const getMockLogger = () => new LevelLogger();
 
 const encryptHeaders = async headers => {
@@ -70,7 +67,9 @@ test(`passes browserTimezone to generatePng`, async () => {
   const generatePngObservable = generatePngObservableFactory();
   generatePngObservable.mockReturnValue(Rx.of(Buffer.from('')));
 
-  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, mockElasticsearch, getMockLogger(), {
+    browserDriverFactory: {},
+  });
   const browserTimezone = 'UTC';
   await executeJob(
     'pngJobId',
@@ -88,7 +87,9 @@ test(`passes browserTimezone to generatePng`, async () => {
 });
 
 test(`returns content_type of application/png`, async () => {
-  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, mockElasticsearch, getMockLogger(), {
+    browserDriverFactory: {},
+  });
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePngObservable = generatePngObservableFactory();
@@ -108,7 +109,9 @@ test(`returns content of generatePng getBuffer base64 encoded`, async () => {
   const generatePngObservable = generatePngObservableFactory();
   generatePngObservable.mockReturnValue(Rx.of(Buffer.from(testContent)));
 
-  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, mockElasticsearch, getMockLogger(), {
+    browserDriverFactory: {},
+  });
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pngJobId',
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 7d5c69655c362..c9f370197da66 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,6 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PNG_JOB_TYPE } from '../../../../common/constants';
 import {
@@ -27,6 +28,7 @@ type QueuedPngExecutorFactory = ExecuteJobFactory<ESQueueWorkerExecuteFn<JobDocP
 
 export const executeJobFactory: QueuedPngExecutorFactory = function executeJobFactoryFn(
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger,
   { browserDriverFactory }: { browserDriverFactory: HeadlessChromiumDriverFactory }
 ) {
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 cb038561cd8bc..c21d39f4922cb 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
@@ -33,15 +33,6 @@ beforeEach(() => {
     info: {
       protocol: 'http',
     },
-    plugins: {
-      elasticsearch: {
-        getCluster: memoize(() => {
-          return {
-            callWithRequest: jest.fn(),
-          };
-        }),
-      },
-    },
     savedObjects: {
       getScopedSavedObjectsClient: jest.fn(),
     },
@@ -58,6 +49,11 @@ beforeEach(() => {
 afterEach(() => generatePdfObservableFactory.mockReset());
 
 const getMockLogger = () => new LevelLogger();
+const mockElasticsearch = {
+  dataClient: {
+    asScoped: () => ({ callAsCurrentUser: jest.fn() }),
+  },
+};
 
 const encryptHeaders = async headers => {
   const crypto = cryptoFactory(mockServer);
@@ -70,7 +66,9 @@ test(`passes browserTimezone to generatePdf`, async () => {
   const generatePdfObservable = generatePdfObservableFactory();
   generatePdfObservable.mockReturnValue(Rx.of(Buffer.from('')));
 
-  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, mockElasticsearch, getMockLogger(), {
+    browserDriverFactory: {},
+  });
   const browserTimezone = 'UTC';
   await executeJob(
     'pdfJobId',
@@ -91,7 +89,9 @@ test(`passes browserTimezone to generatePdf`, async () => {
 });
 
 test(`returns content_type of application/pdf`, async () => {
-  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, mockElasticsearch, getMockLogger(), {
+    browserDriverFactory: {},
+  });
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePdfObservable = generatePdfObservableFactory();
@@ -111,7 +111,9 @@ test(`returns content of generatePdf getBuffer base64 encoded`, async () => {
   const generatePdfObservable = generatePdfObservableFactory();
   generatePdfObservable.mockReturnValue(Rx.of(Buffer.from(testContent)));
 
-  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, mockElasticsearch, getMockLogger(), {
+    browserDriverFactory: {},
+  });
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pdfJobId',
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 dee53697c6681..162376e31216e 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,6 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import {
   ServerFacade,
@@ -28,6 +29,7 @@ type QueuedPdfExecutorFactory = ExecuteJobFactory<ESQueueWorkerExecuteFn<JobDocP
 
 export const executeJobFactory: QueuedPdfExecutorFactory = function executeJobFactoryFn(
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger,
   { browserDriverFactory }: { browserDriverFactory: HeadlessChromiumDriverFactory }
 ) {
diff --git a/x-pack/legacy/plugins/reporting/index.ts b/x-pack/legacy/plugins/reporting/index.ts
index d38e19dee2ef2..d2a68e309a4b3 100644
--- a/x-pack/legacy/plugins/reporting/index.ts
+++ b/x-pack/legacy/plugins/reporting/index.ts
@@ -12,12 +12,7 @@ import { PluginStart as DataPluginStart } from '../../../../src/plugins/data/ser
 import { PluginSetupContract as SecurityPluginSetup } from '../../../plugins/security/server';
 import { PLUGIN_ID, UI_SETTINGS_CUSTOM_PDF_LOGO } from './common/constants';
 import { config as reportingConfig } from './config';
-import {
-  LegacySetup,
-  ReportingPlugin,
-  reportingPluginFactory,
-  ReportingSetupDeps,
-} from './server/plugin';
+import { LegacySetup, ReportingPlugin, reportingPluginFactory } from './server/plugin';
 import { ReportingConfigOptions, ReportingPluginSpecOptions } from './types.d';
 
 const kbToBase64Length = (kb: number) => {
@@ -74,10 +69,6 @@ export const reporting = (kibana: any) => {
 
     async init(server: Legacy.Server) {
       const coreSetup = server.newPlatform.setup.core;
-      const pluginsSetup: ReportingSetupDeps = {
-        security: server.newPlatform.setup.plugins.security as SecurityPluginSetup,
-        usageCollection: server.newPlatform.setup.plugins.usageCollection,
-      };
 
       const fieldFormatServiceFactory = async (uiSettings: IUiSettingsClient) => {
         const [, plugins] = await coreSetup.getStartServices();
@@ -90,18 +81,22 @@ export const reporting = (kibana: any) => {
         config: server.config,
         info: server.info,
         route: server.route.bind(server),
-        plugins: {
-          elasticsearch: server.plugins.elasticsearch,
-          xpack_main: server.plugins.xpack_main,
-        },
+        plugins: { xpack_main: server.plugins.xpack_main },
         savedObjects: server.savedObjects,
         fieldFormatServiceFactory,
         uiSettingsServiceFactory: server.uiSettingsServiceFactory,
       };
 
-      const initializerContext = server.newPlatform.coreContext;
-      const plugin: ReportingPlugin = reportingPluginFactory(initializerContext, __LEGACY, this);
-      await plugin.setup(coreSetup, pluginsSetup);
+      const plugin: ReportingPlugin = reportingPluginFactory(
+        server.newPlatform.coreContext,
+        __LEGACY,
+        this
+      );
+      await plugin.setup(coreSetup, {
+        elasticsearch: coreSetup.elasticsearch,
+        security: server.newPlatform.setup.plugins.security as SecurityPluginSetup,
+        usageCollection: server.newPlatform.setup.plugins.usageCollection,
+      });
     },
 
     deprecations({ unused }: any) {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts b/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
index 05b760c0c3bd6..c4e32b3ebcd99 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import {
   ServerFacade,
   ExportTypesRegistry,
@@ -23,6 +24,7 @@ interface CreateQueueFactoryOpts {
 
 export function createQueueFactory(
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger,
   { exportTypesRegistry, browserDriverFactory }: CreateQueueFactoryOpts
 ): Esqueue {
@@ -33,7 +35,7 @@ export function createQueueFactory(
     interval: queueConfig.indexInterval,
     timeout: queueConfig.timeout,
     dateSeparator: '.',
-    client: server.plugins.elasticsearch.getCluster('admin'),
+    client: elasticsearch.dataClient,
     logger: createTaggedLogger(logger, ['esqueue', 'queue-worker']),
   };
 
@@ -41,7 +43,7 @@ export function createQueueFactory(
 
   if (queueConfig.pollEnabled) {
     // create workers to poll the index for idle jobs waiting to be claimed and executed
-    const createWorker = createWorkerFactory(server, logger, {
+    const createWorker = createWorkerFactory(server, elasticsearch, logger, {
       exportTypesRegistry,
       browserDriverFactory,
     });
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
index 6a5c93db32376..f5c42e5505cd1 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
@@ -5,13 +5,14 @@
  */
 
 import * as sinon from 'sinon';
-import { ServerFacade, HeadlessChromiumDriverFactory } from '../../types';
-import { ExportTypesRegistry } from './export_types_registry';
+import { ElasticsearchServiceSetup } from 'kibana/server';
+import { HeadlessChromiumDriverFactory, ServerFacade } from '../../types';
 import { createWorkerFactory } from './create_worker';
 // @ts-ignore
 import { Esqueue } from './esqueue';
 // @ts-ignore
 import { ClientMock } from './esqueue/__tests__/fixtures/legacy_elasticsearch';
+import { ExportTypesRegistry } from './export_types_registry';
 
 const configGetStub = sinon.stub();
 configGetStub.withArgs('xpack.reporting.queue').returns({
@@ -48,10 +49,15 @@ describe('Create Worker', () => {
 
   test('Creates a single Esqueue worker for Reporting', async () => {
     const exportTypesRegistry = getMockExportTypesRegistry();
-    const createWorker = createWorkerFactory(getMockServer(), getMockLogger(), {
-      exportTypesRegistry: exportTypesRegistry as ExportTypesRegistry,
-      browserDriverFactory: {} as HeadlessChromiumDriverFactory,
-    });
+    const createWorker = createWorkerFactory(
+      getMockServer(),
+      {} as ElasticsearchServiceSetup,
+      getMockLogger(),
+      {
+        exportTypesRegistry: exportTypesRegistry as ExportTypesRegistry,
+        browserDriverFactory: {} as HeadlessChromiumDriverFactory,
+      }
+    );
     const registerWorkerSpy = sinon.spy(queue, 'registerWorker');
 
     createWorker(queue);
@@ -82,10 +88,15 @@ Object {
       { executeJobFactory: executeJobFactoryStub },
       { executeJobFactory: executeJobFactoryStub },
     ]);
-    const createWorker = createWorkerFactory(getMockServer(), getMockLogger(), {
-      exportTypesRegistry: exportTypesRegistry as ExportTypesRegistry,
-      browserDriverFactory: {} as HeadlessChromiumDriverFactory,
-    });
+    const createWorker = createWorkerFactory(
+      getMockServer(),
+      {} as ElasticsearchServiceSetup,
+      getMockLogger(),
+      {
+        exportTypesRegistry: exportTypesRegistry as ExportTypesRegistry,
+        browserDriverFactory: {} as HeadlessChromiumDriverFactory,
+      }
+    );
     const registerWorkerSpy = sinon.spy(queue, 'registerWorker');
 
     createWorker(queue);
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
index 67869016a250b..2ca638f641291 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { PLUGIN_ID } from '../../common/constants';
 import { ExportTypesRegistry, HeadlessChromiumDriverFactory } from '../../types';
 import { CancellationToken } from '../../common/cancellation_token';
@@ -29,6 +30,7 @@ interface CreateWorkerFactoryOpts {
 
 export function createWorkerFactory<JobParamsType>(
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger,
   { exportTypesRegistry, browserDriverFactory }: CreateWorkerFactoryOpts
 ) {
@@ -50,7 +52,9 @@ export function createWorkerFactory<JobParamsType>(
       ExportTypeDefinition<JobParamsType, any, any, any>
     >) {
       // TODO: the executeJobFn should be unwrapped in the register method of the export types registry
-      const jobExecutor = exportType.executeJobFactory(server, logger, { browserDriverFactory });
+      const jobExecutor = exportType.executeJobFactory(server, elasticsearch, logger, {
+        browserDriverFactory,
+      });
       jobExecutors.set(exportType.jobType, jobExecutor);
     }
 
diff --git a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
index 14c57fa35dcf4..1da8a3795aacc 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
@@ -5,6 +5,7 @@
  */
 
 import { get } from 'lodash';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 // @ts-ignore
 import { events as esqueueEvents } from './esqueue';
 import {
@@ -35,6 +36,7 @@ interface EnqueueJobFactoryOpts {
 
 export function enqueueJobFactory(
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   parentLogger: Logger,
   { exportTypesRegistry, esqueue }: EnqueueJobFactoryOpts
 ): EnqueueJobFn {
@@ -61,7 +63,7 @@ export function enqueueJobFactory(
     }
 
     // TODO: the createJobFn should be unwrapped in the register method of the export types registry
-    const createJob = exportType.createJobFactory(server, logger) as CreateJobFn;
+    const createJob = exportType.createJobFactory(server, elasticsearch, logger) as CreateJobFn;
     const payload = await createJob(jobParams, headers, request);
 
     const options = {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/fixtures/legacy_elasticsearch.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/fixtures/legacy_elasticsearch.js
index 31bdf7767983d..ebda7ff955b11 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/fixtures/legacy_elasticsearch.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/fixtures/legacy_elasticsearch.js
@@ -1,10 +1,14 @@
-import { uniqueId, times, random } from 'lodash';
-import * as legacyElasticsearch from 'elasticsearch';
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
 
-import { constants } from '../../constants';
+import { uniqueId, times, random } from 'lodash';
+import { errors as esErrors } from 'elasticsearch';
 
 export function ClientMock() {
-  this.callWithInternalUser = (endpoint, params = {}, ...rest) => {
+  this.callAsInternalUser = (endpoint, params = {}, ...rest) => {
     if (endpoint === 'indices.create') {
       return Promise.resolve({ acknowledged: true });
     }
@@ -21,12 +25,12 @@ export function ClientMock() {
         _seq_no: 1,
         _primary_term: 1,
         _shards: { total: shardCount, successful: shardCount, failed: 0 },
-        created: true
+        created: true,
       });
     }
 
     if (endpoint === 'get') {
-      if (params === legacyElasticsearch.errors.NotFound) return legacyElasticsearch.errors.NotFound;
+      if (params === esErrors.NotFound) return esErrors.NotFound;
 
       const _source = {
         jobtype: 'jobtype',
@@ -34,7 +38,7 @@ export function ClientMock() {
 
         payload: {
           id: 'sample-job-1',
-          now: 'Mon Apr 25 2016 14:13:04 GMT-0700 (MST)'
+          now: 'Mon Apr 25 2016 14:13:04 GMT-0700 (MST)',
         },
 
         priority: 10,
@@ -43,7 +47,7 @@ export function ClientMock() {
         attempts: 0,
         max_attempts: 3,
         status: 'pending',
-        ...(rest[0] || {})
+        ...(rest[0] || {}),
       };
 
       return Promise.resolve({
@@ -52,7 +56,7 @@ export function ClientMock() {
         _seq_no: params._seq_no || 1,
         _primary_term: params._primary_term || 1,
         found: true,
-        _source: _source
+        _source: _source,
       });
     }
 
@@ -68,8 +72,8 @@ export function ClientMock() {
           _source: {
             created_at: new Date().toString(),
             number: random(0, count, true),
-            ...source
-          }
+            ...source,
+          },
         };
       });
       return Promise.resolve({
@@ -78,13 +82,13 @@ export function ClientMock() {
         _shards: {
           total: 5,
           successful: 5,
-          failed: 0
+          failed: 0,
         },
         hits: {
           total: count,
           max_score: null,
-          hits: hits
-        }
+          hits: hits,
+        },
       });
     }
 
@@ -96,7 +100,7 @@ export function ClientMock() {
         _seq_no: params.if_seq_no + 1 || 2,
         _primary_term: params.if_primary_term + 1 || 2,
         _shards: { total: shardCount, successful: shardCount, failed: 0 },
-        created: true
+        created: true,
       });
     }
 
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/helpers/create_index.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/helpers/create_index.js
index 23e9aab5bad11..2944574534a82 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/helpers/create_index.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/helpers/create_index.js
@@ -17,7 +17,7 @@ describe('Create Index', function() {
 
     beforeEach(function() {
       client = new ClientMock();
-      createSpy = sinon.spy(client, 'callWithInternalUser').withArgs('indices.create');
+      createSpy = sinon.spy(client, 'callAsInternalUser').withArgs('indices.create');
     });
 
     it('should return true', function() {
@@ -75,10 +75,10 @@ describe('Create Index', function() {
     beforeEach(function() {
       client = new ClientMock();
       sinon
-        .stub(client, 'callWithInternalUser')
+        .stub(client, 'callAsInternalUser')
         .withArgs('indices.exists')
         .callsFake(() => Promise.resolve(true));
-      createSpy = client.callWithInternalUser.withArgs('indices.create');
+      createSpy = client.callAsInternalUser.withArgs('indices.create');
     });
 
     it('should return true', function() {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/index.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/index.js
index 8f1ed69de5e7f..428c0f0bc0736 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/index.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/index.js
@@ -40,7 +40,7 @@ describe('Esqueue class', function() {
 
   describe('Queue construction', function() {
     it('should ping the ES server', function() {
-      const pingSpy = sinon.spy(client, 'callWithInternalUser').withArgs('ping');
+      const pingSpy = sinon.spy(client, 'callAsInternalUser').withArgs('ping');
       new Esqueue('esqueue', { client });
       sinon.assert.calledOnce(pingSpy);
     });
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/job.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/job.js
index 2d8410c18ddea..c7812ec151b00 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/job.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/job.js
@@ -79,7 +79,7 @@ describe('Job Class', function() {
     beforeEach(function() {
       type = 'type1';
       payload = { id: '123' };
-      indexSpy = sinon.spy(client, 'callWithInternalUser').withArgs('index');
+      indexSpy = sinon.spy(client, 'callAsInternalUser').withArgs('index');
     });
 
     it('should create the target index', function() {
@@ -121,7 +121,7 @@ describe('Job Class', function() {
     });
 
     it('should refresh the index', function() {
-      const refreshSpy = client.callWithInternalUser.withArgs('indices.refresh');
+      const refreshSpy = client.callAsInternalUser.withArgs('indices.refresh');
 
       const job = new Job(mockQueue, index, type, payload);
       return job.ready.then(() => {
@@ -165,9 +165,9 @@ describe('Job Class', function() {
     it('should emit error on client index failure', function(done) {
       const errMsg = 'test document index failure';
 
-      client.callWithInternalUser.restore();
+      client.callAsInternalUser.restore();
       sinon
-        .stub(client, 'callWithInternalUser')
+        .stub(client, 'callAsInternalUser')
         .withArgs('index')
         .callsFake(() => Promise.reject(new Error(errMsg)));
       const job = new Job(mockQueue, index, type, payload);
@@ -215,7 +215,7 @@ describe('Job Class', function() {
     beforeEach(function() {
       type = 'type1';
       payload = { id: '123' };
-      indexSpy = sinon.spy(client, 'callWithInternalUser').withArgs('index');
+      indexSpy = sinon.spy(client, 'callAsInternalUser').withArgs('index');
     });
 
     it('should set attempt count to 0', function() {
@@ -281,7 +281,7 @@ describe('Job Class', function() {
           authorization: 'Basic cXdlcnR5',
         },
       };
-      indexSpy = sinon.spy(client, 'callWithInternalUser').withArgs('index');
+      indexSpy = sinon.spy(client, 'callAsInternalUser').withArgs('index');
     });
 
     it('should index the created_by value', function() {
@@ -367,10 +367,10 @@ describe('Job Class', function() {
       };
 
       const job = new Job(mockQueue, index, type, payload, optionals);
-      return Promise.resolve(client.callWithInternalUser('get', {}, optionals))
+      return Promise.resolve(client.callAsInternalUser('get', {}, optionals))
         .then(doc => {
           sinon
-            .stub(client, 'callWithInternalUser')
+            .stub(client, 'callAsInternalUser')
             .withArgs('get')
             .returns(Promise.resolve(doc));
         })
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/worker.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/worker.js
index bd82a9e9f99db..ad93a1882746d 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/worker.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/worker.js
@@ -288,7 +288,7 @@ describe('Worker class', function() {
     describe('error handling', function() {
       it('should pass search errors', function(done) {
         searchStub = sinon
-          .stub(mockQueue.client, 'callWithInternalUser')
+          .stub(mockQueue.client, 'callAsInternalUser')
           .withArgs('search')
           .callsFake(() => Promise.reject());
         worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
@@ -303,7 +303,7 @@ describe('Worker class', function() {
       describe('missing index', function() {
         it('should swallow error', function(done) {
           searchStub = sinon
-            .stub(mockQueue.client, 'callWithInternalUser')
+            .stub(mockQueue.client, 'callAsInternalUser')
             .withArgs('search')
             .callsFake(() => Promise.reject({ status: 404 }));
           worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
@@ -317,7 +317,7 @@ describe('Worker class', function() {
 
         it('should return an empty array', function(done) {
           searchStub = sinon
-            .stub(mockQueue.client, 'callWithInternalUser')
+            .stub(mockQueue.client, 'callAsInternalUser')
             .withArgs('search')
             .callsFake(() => Promise.reject({ status: 404 }));
           worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
@@ -343,7 +343,7 @@ describe('Worker class', function() {
 
       beforeEach(() => {
         searchStub = sinon
-          .stub(mockQueue.client, 'callWithInternalUser')
+          .stub(mockQueue.client, 'callAsInternalUser')
           .withArgs('search')
           .callsFake(() => Promise.resolve({ hits: { hits: [] } }));
         anchorMoment = moment(anchor);
@@ -417,10 +417,10 @@ describe('Worker class', function() {
         type: 'test',
         id: 12345,
       };
-      return mockQueue.client.callWithInternalUser('get', params).then(jobDoc => {
+      return mockQueue.client.callAsInternalUser('get', params).then(jobDoc => {
         job = jobDoc;
         worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
-        updateSpy = sinon.spy(mockQueue.client, 'callWithInternalUser').withArgs('update');
+        updateSpy = sinon.spy(mockQueue.client, 'callAsInternalUser').withArgs('update');
       });
     });
 
@@ -483,9 +483,9 @@ describe('Worker class', function() {
     });
 
     it('should reject the promise on conflict errors', function() {
-      mockQueue.client.callWithInternalUser.restore();
+      mockQueue.client.callAsInternalUser.restore();
       sinon
-        .stub(mockQueue.client, 'callWithInternalUser')
+        .stub(mockQueue.client, 'callAsInternalUser')
         .withArgs('update')
         .returns(Promise.reject({ statusCode: 409 }));
       return worker._claimJob(job).catch(err => {
@@ -494,9 +494,9 @@ describe('Worker class', function() {
     });
 
     it('should reject the promise on other errors', function() {
-      mockQueue.client.callWithInternalUser.restore();
+      mockQueue.client.callAsInternalUser.restore();
       sinon
-        .stub(mockQueue.client, 'callWithInternalUser')
+        .stub(mockQueue.client, 'callAsInternalUser')
         .withArgs('update')
         .returns(Promise.reject({ statusCode: 401 }));
       return worker._claimJob(job).catch(err => {
@@ -532,12 +532,12 @@ describe('Worker class', function() {
     });
 
     afterEach(() => {
-      mockQueue.client.callWithInternalUser.restore();
+      mockQueue.client.callAsInternalUser.restore();
     });
 
     it('should emit for errors from claiming job', function(done) {
       sinon
-        .stub(mockQueue.client, 'callWithInternalUser')
+        .stub(mockQueue.client, 'callAsInternalUser')
         .withArgs('update')
         .rejects({ statusCode: 401 });
 
@@ -558,7 +558,7 @@ describe('Worker class', function() {
 
     it('should reject the promise if an error claiming the job', function() {
       sinon
-        .stub(mockQueue.client, 'callWithInternalUser')
+        .stub(mockQueue.client, 'callAsInternalUser')
         .withArgs('update')
         .rejects({ statusCode: 409 });
       return worker._claimPendingJobs(getMockJobs()).catch(err => {
@@ -568,7 +568,7 @@ describe('Worker class', function() {
 
     it('should get the pending job', function() {
       sinon
-        .stub(mockQueue.client, 'callWithInternalUser')
+        .stub(mockQueue.client, 'callAsInternalUser')
         .withArgs('update')
         .resolves({ test: 'cool' });
       sinon.stub(worker, '_performJob').callsFake(identity);
@@ -590,10 +590,10 @@ describe('Worker class', function() {
       anchorMoment = moment(anchor);
       clock = sinon.useFakeTimers(anchorMoment.valueOf());
 
-      return mockQueue.client.callWithInternalUser('get').then(jobDoc => {
+      return mockQueue.client.callAsInternalUser('get').then(jobDoc => {
         job = jobDoc;
         worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
-        updateSpy = sinon.spy(mockQueue.client, 'callWithInternalUser').withArgs('update');
+        updateSpy = sinon.spy(mockQueue.client, 'callAsInternalUser').withArgs('update');
       });
     });
 
@@ -625,18 +625,18 @@ describe('Worker class', function() {
     });
 
     it('should return true on conflict errors', function() {
-      mockQueue.client.callWithInternalUser.restore();
+      mockQueue.client.callAsInternalUser.restore();
       sinon
-        .stub(mockQueue.client, 'callWithInternalUser')
+        .stub(mockQueue.client, 'callAsInternalUser')
         .withArgs('update')
         .rejects({ statusCode: 409 });
       return worker._failJob(job).then(res => expect(res).to.equal(true));
     });
 
     it('should return false on other document update errors', function() {
-      mockQueue.client.callWithInternalUser.restore();
+      mockQueue.client.callAsInternalUser.restore();
       sinon
-        .stub(mockQueue.client, 'callWithInternalUser')
+        .stub(mockQueue.client, 'callAsInternalUser')
         .withArgs('update')
         .rejects({ statusCode: 401 });
       return worker._failJob(job).then(res => expect(res).to.equal(false));
@@ -672,9 +672,9 @@ describe('Worker class', function() {
     });
 
     it('should emit on other document update errors', function(done) {
-      mockQueue.client.callWithInternalUser.restore();
+      mockQueue.client.callAsInternalUser.restore();
       sinon
-        .stub(mockQueue.client, 'callWithInternalUser')
+        .stub(mockQueue.client, 'callAsInternalUser')
         .withArgs('update')
         .rejects({ statusCode: 401 });
 
@@ -703,9 +703,9 @@ describe('Worker class', function() {
         value: random(0, 100, true),
       };
 
-      return mockQueue.client.callWithInternalUser('get', {}, { payload }).then(jobDoc => {
+      return mockQueue.client.callAsInternalUser('get', {}, { payload }).then(jobDoc => {
         job = jobDoc;
-        updateSpy = sinon.spy(mockQueue.client, 'callWithInternalUser').withArgs('update');
+        updateSpy = sinon.spy(mockQueue.client, 'callAsInternalUser').withArgs('update');
       });
     });
 
@@ -871,7 +871,7 @@ describe('Worker class', function() {
         };
 
         sinon
-          .stub(mockQueue.client, 'callWithInternalUser')
+          .stub(mockQueue.client, 'callAsInternalUser')
           .withArgs('update')
           .rejects({ statusCode: 413 });
 
@@ -893,7 +893,7 @@ describe('Worker class', function() {
     describe('search failure', function() {
       it('causes _processPendingJobs to reject the Promise', function() {
         sinon
-          .stub(mockQueue.client, 'callWithInternalUser')
+          .stub(mockQueue.client, 'callAsInternalUser')
           .withArgs('search')
           .rejects(new Error('test error'));
         worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
@@ -996,7 +996,7 @@ describe('Worker class', function() {
 
       beforeEach(function() {
         sinon
-          .stub(mockQueue.client, 'callWithInternalUser')
+          .stub(mockQueue.client, 'callAsInternalUser')
           .withArgs('search')
           .callsFake(() => Promise.resolve({ hits: { hits: [] } }));
       });
@@ -1086,20 +1086,12 @@ describe('Format Job Object', () => {
   });
 });
 
-// FAILING: https://github.com/elastic/kibana/issues/51372
-describe.skip('Get Doc Path from ES Response', () => {
+describe('Get Doc Path from ES Response', () => {
   it('returns a formatted string after response of an update', function() {
     const responseMock = {
       _index: 'foo',
       _id: 'booId',
     };
-    expect(getUpdatedDocPath(responseMock)).equal('/foo/_doc/booId');
-  });
-  it('returns the same formatted string even if there is no _doc provided', function() {
-    const responseMock = {
-      _index: 'foo',
-      _id: 'booId',
-    };
-    expect(getUpdatedDocPath(responseMock)).equal('/foo/_doc/booId');
+    expect(getUpdatedDocPath(responseMock)).equal('/foo/booId');
   });
 });
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 670c2907fb832..465f27a817ba7 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
@@ -78,13 +78,13 @@ export function createIndex(client, indexName, indexSettings = {}) {
   };
 
   return client
-    .callWithInternalUser('indices.exists', {
+    .callAsInternalUser('indices.exists', {
       index: indexName,
     })
     .then(exists => {
       if (!exists) {
         return client
-          .callWithInternalUser('indices.create', {
+          .callAsInternalUser('indices.create', {
             index: indexName,
             body: body,
           })
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/index.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/index.js
index b42ef84168940..bd30ca9ae0f29 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/index.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/index.js
@@ -32,7 +32,7 @@ export class Esqueue extends EventEmitter {
   }
 
   _initTasks() {
-    const initTasks = [this.client.callWithInternalUser('ping')];
+    const initTasks = [this.client.callAsInternalUser('ping')];
 
     return Promise.all(initTasks).catch(err => {
       this._logger(['initTasks', 'error'], err);
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 a7d8f4df3fd54..826fcf360a4ca 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js
@@ -78,7 +78,7 @@ export class Job extends events.EventEmitter {
     }
 
     this.ready = createIndex(this._client, this.index, this.indexSettings)
-      .then(() => this._client.callWithInternalUser('index', indexParams))
+      .then(() => this._client.callAsInternalUser('index', indexParams))
       .then(doc => {
         this.document = {
           id: doc._id,
@@ -89,7 +89,7 @@ export class Job extends events.EventEmitter {
         this.debug(`Job created in index ${this.index}`);
 
         return this._client
-          .callWithInternalUser('indices.refresh', {
+          .callAsInternalUser('indices.refresh', {
             index: this.index,
           })
           .then(() => {
@@ -111,7 +111,7 @@ export class Job extends events.EventEmitter {
   get() {
     return this.ready
       .then(() => {
-        return this._client.callWithInternalUser('get', {
+        return this._client.callAsInternalUser('get', {
           index: this.index,
           id: this.id,
         });
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
index 7ad84460a0c45..4373597942278 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
@@ -160,7 +160,7 @@ export class Worker extends events.EventEmitter {
     };
 
     return this._client
-      .callWithInternalUser('update', {
+      .callAsInternalUser('update', {
         index: job._index,
         id: job._id,
         if_seq_no: job._seq_no,
@@ -199,7 +199,7 @@ export class Worker extends events.EventEmitter {
     });
 
     return this._client
-      .callWithInternalUser('update', {
+      .callAsInternalUser('update', {
         index: job._index,
         id: job._id,
         if_seq_no: job._seq_no,
@@ -286,7 +286,7 @@ export class Worker extends events.EventEmitter {
         };
 
         return this._client
-          .callWithInternalUser('update', {
+          .callAsInternalUser('update', {
             index: job._index,
             id: job._id,
             if_seq_no: job._seq_no,
@@ -431,7 +431,7 @@ export class Worker extends events.EventEmitter {
     };
 
     return this._client
-      .callWithInternalUser('search', {
+      .callAsInternalUser('search', {
         index: `${this.queue.index}-*`,
         body: query,
       })
diff --git a/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts b/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
index 0c16f780c34ac..3562834230ea1 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/jobs_query.ts
@@ -4,9 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { errors as elasticsearchErrors } from 'elasticsearch';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { get } from 'lodash';
-import { ServerFacade, JobSource } from '../../types';
+import { JobSource, ServerFacade } from '../../types';
 
+const esErrors = elasticsearchErrors as Record<string, any>;
 const defaultSize = 10;
 
 interface QueryBody {
@@ -34,12 +37,9 @@ interface CountAggResult {
   count: number;
 }
 
-export function jobsQueryFactory(server: ServerFacade) {
+export function jobsQueryFactory(server: ServerFacade, elasticsearch: ElasticsearchServiceSetup) {
   const index = server.config().get('xpack.reporting.index');
-  // @ts-ignore `errors` does not exist on type Cluster
-  const { callWithInternalUser, errors: esErrors } = server.plugins.elasticsearch.getCluster(
-    'admin'
-  );
+  const { callAsInternalUser } = elasticsearch.adminClient;
 
   function getUsername(user: any) {
     return get(user, 'username', false);
@@ -61,7 +61,7 @@ export function jobsQueryFactory(server: ServerFacade) {
       body: Object.assign(defaultBody[queryType] || {}, body),
     };
 
-    return callWithInternalUser(queryType, query).catch(err => {
+    return callAsInternalUser(queryType, query).catch(err => {
       if (err instanceof esErrors['401']) return;
       if (err instanceof esErrors['403']) return;
       if (err instanceof esErrors['404']) return;
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 79a64bd82d022..028d8fa143487 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
@@ -5,7 +5,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ServerFacade, Logger } from '../../../types';
+import { ElasticsearchServiceSetup } from 'kibana/server';
+import { Logger, ServerFacade } from '../../../types';
 import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_factory';
 import { validateBrowser } from './validate_browser';
 import { validateEncryptionKey } from './validate_encryption_key';
@@ -14,6 +15,7 @@ import { validateServerHost } from './validate_server_host';
 
 export async function runValidations(
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: Logger,
   browserFactory: HeadlessChromiumDriverFactory
 ) {
@@ -21,7 +23,7 @@ export async function runValidations(
     await Promise.all([
       validateBrowser(server, browserFactory, logger),
       validateEncryptionKey(server, logger),
-      validateMaxContentLength(server, logger),
+      validateMaxContentLength(server, elasticsearch, logger),
       validateServerHost(server),
     ]);
     logger.debug(
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_max_content_length.js b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
similarity index 65%
rename from x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_max_content_length.js
rename to x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
index 48a58618f34cc..942dcaf842696 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/__tests__/validate_max_content_length.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_max_content_length.test.js
@@ -3,14 +3,26 @@
  * 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 { validateMaxContentLength } from '../validate_max_content_length';
+import { validateMaxContentLength } from './validate_max_content_length';
 
 const FIVE_HUNDRED_MEGABYTES = 524288000;
 const ONE_HUNDRED_MEGABYTES = 104857600;
 
 describe('Reporting: Validate Max Content Length', () => {
+  const elasticsearch = {
+    dataClient: {
+      callAsInternalUser: () => ({
+        defaults: {
+          http: {
+            max_content_length: '100mb',
+          },
+        },
+      }),
+    },
+  };
+
   const logger = {
     warning: sinon.spy(),
   };
@@ -24,22 +36,20 @@ describe('Reporting: Validate Max Content Length', () => {
       config: () => ({
         get: sinon.stub().returns(FIVE_HUNDRED_MEGABYTES),
       }),
-      plugins: {
-        elasticsearch: {
-          getCluster: () => ({
-            callWithInternalUser: () => ({
-              defaults: {
-                http: {
-                  max_content_length: '100mb',
-                },
-              },
-            }),
-          }),
-        },
+    };
+    const elasticsearch = {
+      dataClient: {
+        callAsInternalUser: () => ({
+          defaults: {
+            http: {
+              max_content_length: '100mb',
+            },
+          },
+        }),
       },
     };
 
-    await validateMaxContentLength(server, logger);
+    await validateMaxContentLength(server, elasticsearch, logger);
 
     sinon.assert.calledWithMatch(
       logger.warning,
@@ -64,22 +74,11 @@ describe('Reporting: Validate Max Content Length', () => {
       config: () => ({
         get: sinon.stub().returns(ONE_HUNDRED_MEGABYTES),
       }),
-      plugins: {
-        elasticsearch: {
-          getCluster: () => ({
-            callWithInternalUser: () => ({
-              defaults: {
-                http: {
-                  max_content_length: '100mb',
-                },
-              },
-            }),
-          }),
-        },
-      },
     };
 
-    expect(async () => validateMaxContentLength(server, logger.warning)).not.to.throwError();
+    expect(
+      async () => await validateMaxContentLength(server, elasticsearch, logger.warning)
+    ).not.toThrow();
     sinon.assert.notCalled(logger.warning);
   });
 });
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 f91cd40bfd3c7..ce4a5b93e7431 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
@@ -3,18 +3,24 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import numeral from '@elastic/numeral';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { defaults, get } from 'lodash';
 import { Logger, ServerFacade } from '../../../types';
 
 const KIBANA_MAX_SIZE_BYTES_PATH = 'xpack.reporting.csv.maxSizeBytes';
 const ES_MAX_SIZE_BYTES_PATH = 'http.max_content_length';
 
-export async function validateMaxContentLength(server: ServerFacade, logger: Logger) {
+export async function validateMaxContentLength(
+  server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
+  logger: Logger
+) {
   const config = server.config();
-  const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('data');
+  const { callAsInternalUser } = elasticsearch.dataClient;
 
-  const elasticClusterSettingsResponse = await callWithInternalUser('cluster.getSettings', {
+  const elasticClusterSettingsResponse = await callAsInternalUser('cluster.getSettings', {
     includeDefaults: true,
   });
   const { persistent, transient, defaults: defaultSettings } = elasticClusterSettingsResponse;
diff --git a/x-pack/legacy/plugins/reporting/server/plugin.ts b/x-pack/legacy/plugins/reporting/server/plugin.ts
index cf66ec74969ca..a2938d442f7df 100644
--- a/x-pack/legacy/plugins/reporting/server/plugin.ts
+++ b/x-pack/legacy/plugins/reporting/server/plugin.ts
@@ -5,20 +5,26 @@
  */
 
 import { Legacy } from 'kibana';
-import { CoreSetup, CoreStart, Plugin, LoggerFactory } from 'src/core/server';
+import {
+  CoreSetup,
+  CoreStart,
+  ElasticsearchServiceSetup,
+  LoggerFactory,
+  Plugin,
+} from 'src/core/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
 import { PluginSetupContract as SecurityPluginSetup } from '../../../../plugins/security/server';
-import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 // @ts-ignore
 import { mirrorPluginStatus } from '../../../server/lib/mirror_plugin_status';
+import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 import { PLUGIN_ID } from '../common/constants';
+import { logConfiguration } from '../log_configuration';
 import { ReportingPluginSpecOptions } from '../types.d';
-import { registerRoutes } from './routes';
-import { checkLicenseFactory, getExportTypesRegistry, runValidations, LevelLogger } from './lib';
 import { createBrowserDriverFactory } from './browsers';
+import { checkLicenseFactory, getExportTypesRegistry, LevelLogger, runValidations } from './lib';
+import { registerRoutes } from './routes';
 import { registerReportingUsageCollector } from './usage';
-import { logConfiguration } from '../log_configuration';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
 
 export interface ReportingInitializerContext {
   logger: LoggerFactory;
@@ -29,22 +35,16 @@ export type ReportingSetup = object;
 export type ReportingStart = object;
 
 export interface ReportingSetupDeps {
+  elasticsearch: ElasticsearchServiceSetup;
   usageCollection: UsageCollectionSetup;
   security: SecurityPluginSetup;
 }
 export type ReportingStartDeps = object;
 
-type LegacyPlugins = Legacy.Server['plugins'];
-
 export interface LegacySetup {
   config: Legacy.Server['config'];
   info: Legacy.Server['info'];
-  plugins: {
-    elasticsearch: LegacyPlugins['elasticsearch'];
-    xpack_main: XPackMainPlugin & {
-      status?: any;
-    };
-  };
+  plugins: { xpack_main: XPackMainPlugin & { status?: any } };
   route: Legacy.Server['route'];
   savedObjects: Legacy.Server['savedObjects'];
   uiSettingsServiceFactory: Legacy.Server['uiSettingsServiceFactory'];
@@ -76,10 +76,10 @@ export function reportingPluginFactory(
 
     public async setup(core: CoreSetup, plugins: ReportingSetupDeps): Promise<ReportingSetup> {
       const exportTypesRegistry = getExportTypesRegistry();
+      const { usageCollection, elasticsearch } = plugins;
 
       let isCollectorReady = false;
       // Register a function with server to manage the collection of usage stats
-      const { usageCollection } = plugins;
       registerReportingUsageCollector(
         usageCollection,
         __LEGACY,
@@ -91,7 +91,7 @@ export function reportingPluginFactory(
       const browserDriverFactory = await createBrowserDriverFactory(__LEGACY, logger);
 
       logConfiguration(__LEGACY, logger);
-      runValidations(__LEGACY, logger, browserDriverFactory);
+      runValidations(__LEGACY, elasticsearch, logger, browserDriverFactory);
 
       const { xpack_main: xpackMainPlugin } = __LEGACY.plugins;
       mirrorPluginStatus(xpackMainPlugin, legacyPlugin);
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
index f3ed760bba430..fd1d85fef0f21 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
@@ -36,6 +36,7 @@ export function registerGenerateCsvFromSavedObjectImmediate(
   parentLogger: Logger
 ) {
   const routeOptions = getRouteOptionsCsv(server, plugins, parentLogger);
+  const { elasticsearch } = plugins;
 
   /*
    * CSV export with the `immediate` option does not queue a job with Reporting's ESQueue to run the job async. Instead, this does:
@@ -57,8 +58,8 @@ export function registerGenerateCsvFromSavedObjectImmediate(
        *
        * Calling an execute job factory requires passing a browserDriverFactory option, so we should not call the factory from here
        */
-      const createJobFn = createJobFactory(server, logger);
-      const executeJobFn = executeJobFactory(server, logger, {
+      const createJobFn = createJobFactory(server, elasticsearch, logger);
+      const executeJobFn = executeJobFactory(server, elasticsearch, logger, {
         browserDriverFactory: {} as HeadlessChromiumDriverFactory,
       });
       const jobDocPayload: JobDocPayloadPanelCsv = await createJobFn(
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generation.ts b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
index 3c9ef6987b2d9..02a9541484bc6 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generation.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
@@ -5,6 +5,7 @@
  */
 
 import boom from 'boom';
+import { errors as elasticsearchErrors } from 'elasticsearch';
 import { Legacy } from 'kibana';
 import { API_BASE_URL } from '../../common/constants';
 import {
@@ -21,6 +22,8 @@ import { registerGenerateCsvFromSavedObject } from './generate_from_savedobject'
 import { registerGenerateCsvFromSavedObjectImmediate } from './generate_from_savedobject_immediate';
 import { makeRequestFacade } from './lib/make_request_facade';
 
+const esErrors = elasticsearchErrors as Record<string, any>;
+
 export function registerJobGenerationRoutes(
   server: ServerFacade,
   plugins: ReportingSetupDeps,
@@ -30,11 +33,15 @@ export function registerJobGenerationRoutes(
 ) {
   const config = server.config();
   const DOWNLOAD_BASE_URL = config.get('server.basePath') + `${API_BASE_URL}/jobs/download`;
-  // @ts-ignore TODO
-  const { errors: esErrors } = server.plugins.elasticsearch.getCluster('admin');
-
-  const esqueue = createQueueFactory(server, logger, { exportTypesRegistry, browserDriverFactory });
-  const enqueueJob = enqueueJobFactory(server, logger, { exportTypesRegistry, esqueue });
+  const { elasticsearch } = plugins;
+  const esqueue = createQueueFactory(server, elasticsearch, logger, {
+    exportTypesRegistry,
+    browserDriverFactory,
+  });
+  const enqueueJob = enqueueJobFactory(server, elasticsearch, logger, {
+    exportTypesRegistry,
+    esqueue,
+  });
 
   /*
    * Generates enqueued job details to use in responses
diff --git a/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js b/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
index c9d4f9fc027be..811c81c502b81 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
+++ b/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
@@ -43,18 +43,12 @@ beforeEach(() => {
     jobContentEncoding: 'base64',
     jobContentExtension: 'pdf',
   });
-  mockServer.plugins = {
-    elasticsearch: {
-      getCluster: memoize(() => ({ callWithInternalUser: jest.fn() })),
-      createCluster: () => ({
-        callWithRequest: jest.fn(),
-        callWithInternalUser: jest.fn(),
-      }),
-    },
-  };
 });
 
 const mockPlugins = {
+  elasticsearch: {
+    adminClient: { callAsInternalUser: jest.fn() },
+  },
   security: null,
 };
 
@@ -67,9 +61,9 @@ const getHits = (...sources) => {
 };
 
 test(`returns 404 if job not found`, async () => {
-  mockServer.plugins.elasticsearch
-    .getCluster('admin')
-    .callWithInternalUser.mockReturnValue(Promise.resolve(getHits()));
+  mockPlugins.elasticsearch.adminClient = {
+    callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(getHits())),
+  };
 
   registerJobInfoRoutes(mockServer, mockPlugins, exportTypesRegistry, mockLogger);
 
@@ -84,9 +78,11 @@ test(`returns 404 if job not found`, async () => {
 });
 
 test(`returns 401 if not valid job type`, async () => {
-  mockServer.plugins.elasticsearch
-    .getCluster('admin')
-    .callWithInternalUser.mockReturnValue(Promise.resolve(getHits({ jobtype: 'invalidJobType' })));
+  mockPlugins.elasticsearch.adminClient = {
+    callAsInternalUser: jest
+      .fn()
+      .mockReturnValue(Promise.resolve(getHits({ jobtype: 'invalidJobType' }))),
+  };
 
   registerJobInfoRoutes(mockServer, mockPlugins, exportTypesRegistry, mockLogger);
 
@@ -101,11 +97,13 @@ test(`returns 401 if not valid job type`, async () => {
 
 describe(`when job is incomplete`, () => {
   const getIncompleteResponse = async () => {
-    mockServer.plugins.elasticsearch
-      .getCluster('admin')
-      .callWithInternalUser.mockReturnValue(
-        Promise.resolve(getHits({ jobtype: 'unencodedJobType', status: 'pending' }))
-      );
+    mockPlugins.elasticsearch.adminClient = {
+      callAsInternalUser: jest
+        .fn()
+        .mockReturnValue(
+          Promise.resolve(getHits({ jobtype: 'unencodedJobType', status: 'pending' }))
+        ),
+    };
 
     registerJobInfoRoutes(mockServer, mockPlugins, exportTypesRegistry, mockLogger);
 
@@ -145,9 +143,9 @@ describe(`when job is failed`, () => {
       status: 'failed',
       output: { content: 'job failure message' },
     });
-    mockServer.plugins.elasticsearch
-      .getCluster('admin')
-      .callWithInternalUser.mockReturnValue(Promise.resolve(hits));
+    mockPlugins.elasticsearch.adminClient = {
+      callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(hits)),
+    };
 
     registerJobInfoRoutes(mockServer, mockPlugins, exportTypesRegistry, mockLogger);
 
@@ -190,9 +188,9 @@ describe(`when job is completed`, () => {
         title,
       },
     });
-    mockServer.plugins.elasticsearch
-      .getCluster('admin')
-      .callWithInternalUser.mockReturnValue(Promise.resolve(hits));
+    mockPlugins.elasticsearch.adminClient = {
+      callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(hits)),
+    };
 
     registerJobInfoRoutes(mockServer, mockPlugins, exportTypesRegistry, mockLogger);
 
diff --git a/x-pack/legacy/plugins/reporting/server/routes/jobs.ts b/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
index f9b731db5a702..daabc2cf22f4e 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
@@ -38,7 +38,8 @@ export function registerJobInfoRoutes(
   exportTypesRegistry: ExportTypesRegistry,
   logger: Logger
 ) {
-  const jobsQuery = jobsQueryFactory(server);
+  const { elasticsearch } = plugins;
+  const jobsQuery = jobsQueryFactory(server, elasticsearch);
   const getRouteConfig = getRouteConfigFactoryManagementPre(server, plugins, logger);
   const getRouteConfigDownload = getRouteConfigFactoryDownloadPre(server, plugins, logger);
 
@@ -137,7 +138,7 @@ export function registerJobInfoRoutes(
   });
 
   // trigger a download of the output from a job
-  const jobResponseHandler = jobResponseHandlerFactory(server, exportTypesRegistry);
+  const jobResponseHandler = jobResponseHandlerFactory(server, elasticsearch, exportTypesRegistry);
   server.route({
     path: `${MAIN_ENTRY}/download/{docId}`,
     method: 'GET',
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
index 3ba7aa30eedcb..62f0d0a72b389 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/job_response_handler.ts
@@ -5,10 +5,11 @@
  */
 
 import Boom from 'boom';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { ResponseToolkit } from 'hapi';
-import { ServerFacade, ExportTypesRegistry } from '../../../types';
-import { jobsQueryFactory } from '../../lib/jobs_query';
 import { WHITELISTED_JOB_CONTENT_TYPES } from '../../../common/constants';
+import { ExportTypesRegistry, ServerFacade } from '../../../types';
+import { jobsQueryFactory } from '../../lib/jobs_query';
 import { getDocumentPayloadFactory } from './get_document_payload';
 
 interface JobResponseHandlerParams {
@@ -21,9 +22,10 @@ interface JobResponseHandlerOpts {
 
 export function jobResponseHandlerFactory(
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   exportTypesRegistry: ExportTypesRegistry
 ) {
-  const jobsQuery = jobsQueryFactory(server);
+  const jobsQuery = jobsQueryFactory(server, elasticsearch);
   const getDocumentPayload = getDocumentPayloadFactory(server, exportTypesRegistry);
 
   return function jobResponseHandler(
diff --git a/x-pack/legacy/plugins/reporting/types.d.ts b/x-pack/legacy/plugins/reporting/types.d.ts
index 9ba016d8b828d..a4ff39b23747d 100644
--- a/x-pack/legacy/plugins/reporting/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/types.d.ts
@@ -4,15 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ResponseObject } from 'hapi';
 import { EventEmitter } from 'events';
+import { ResponseObject } from 'hapi';
+import { ElasticsearchServiceSetup } from 'kibana/server';
 import { Legacy } from 'kibana';
 import { CallCluster } from '../../../../src/legacy/core_plugins/elasticsearch';
 import { CancellationToken } from './common/cancellation_token';
-import { LevelLogger } from './server/lib/level_logger';
 import { HeadlessChromiumDriverFactory } from './server/browsers/chromium/driver_factory';
 import { BrowserType } from './server/browsers/types';
-import { LegacySetup } from './server/plugin';
+import { LevelLogger } from './server/lib/level_logger';
+import { LegacySetup, ReportingSetupDeps } from './server/plugin';
 
 export type ReportingPlugin = object; // For Plugin contract
 
@@ -276,10 +277,12 @@ export interface ESQueueInstance<JobParamsType, JobDocPayloadType> {
 
 export type CreateJobFactory<CreateJobFnType> = (
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: LevelLogger
 ) => CreateJobFnType;
 export type ExecuteJobFactory<ExecuteJobFnType> = (
   server: ServerFacade,
+  elasticsearch: ElasticsearchServiceSetup,
   logger: LevelLogger,
   opts: {
     browserDriverFactory: HeadlessChromiumDriverFactory;
@@ -302,10 +305,10 @@ export interface ExportTypeDefinition<
   validLicenses: string[];
 }
 
-export { ExportTypesRegistry } from './server/lib/export_types_registry';
+export { CancellationToken } from './common/cancellation_token';
 export { HeadlessChromiumDriver } from './server/browsers/chromium/driver';
 export { HeadlessChromiumDriverFactory } from './server/browsers/chromium/driver_factory';
-export { CancellationToken } from './common/cancellation_token';
+export { ExportTypesRegistry } from './server/lib/export_types_registry';
 
 // Prefer to import this type using: `import { LevelLogger } from 'relative/path/server/lib';`
 export { LevelLogger as Logger };

From 8d54fa8363039a0ded5de96bb78c44b6b6bb2403 Mon Sep 17 00:00:00 2001
From: Catherine Liu <catherine.liu@elastic.co>
Date: Fri, 31 Jan 2020 13:47:41 -0700
Subject: [PATCH 18/26] [Canvas] Migrate Shareable Routes to NP (#56053)

* Migrated shareables routes to NP

* Added tests
---
 x-pack/legacy/plugins/canvas/server/plugin.ts |  3 -
 .../plugins/canvas/server/routes/index.ts     | 12 ---
 .../canvas/server/routes/shareables.ts        | 72 -----------------
 x-pack/plugins/canvas/server/routes/index.ts  |  6 +-
 .../server/routes/shareables/download.test.ts | 55 +++++++++++++
 .../server/routes/shareables/download.ts      | 33 ++++++++
 .../canvas/server/routes/shareables/index.ts  | 14 ++++
 .../shareables/mock_shareable_workpad.json    |  0
 .../shareables/rendered_workpad_schema.ts     | 77 ++++++++++++++++++
 .../server/routes/shareables/zip.test.ts      | 78 +++++++++++++++++++
 .../canvas/server/routes/shareables/zip.ts    | 37 +++++++++
 11 files changed, 298 insertions(+), 89 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/canvas/server/routes/index.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/server/routes/shareables.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/shareables/download.test.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/shareables/download.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/shareables/index.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/shareables/mock_shareable_workpad.json
 create mode 100644 x-pack/plugins/canvas/server/routes/shareables/rendered_workpad_schema.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
 create mode 100644 x-pack/plugins/canvas/server/routes/shareables/zip.ts

diff --git a/x-pack/legacy/plugins/canvas/server/plugin.ts b/x-pack/legacy/plugins/canvas/server/plugin.ts
index ac3edbabce930..1f17e85bfd294 100644
--- a/x-pack/legacy/plugins/canvas/server/plugin.ts
+++ b/x-pack/legacy/plugins/canvas/server/plugin.ts
@@ -5,14 +5,11 @@
  */
 
 import { CoreSetup, PluginsSetup } from './shim';
-import { routes } from './routes';
 import { functions } from '../canvas_plugin_src/functions/server';
 import { loadSampleData } from './sample_data';
 
 export class Plugin {
   public setup(core: CoreSetup, plugins: PluginsSetup) {
-    routes(core);
-
     plugins.interpreter.register({ serverFunctions: functions });
 
     core.injectUiAppVars('canvas', async () => {
diff --git a/x-pack/legacy/plugins/canvas/server/routes/index.ts b/x-pack/legacy/plugins/canvas/server/routes/index.ts
deleted file mode 100644
index 6898a3c459e3d..0000000000000
--- a/x-pack/legacy/plugins/canvas/server/routes/index.ts
+++ /dev/null
@@ -1,12 +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 { shareableWorkpads } from './shareables';
-import { CoreSetup } from '../shim';
-
-export function routes(setup: CoreSetup): void {
-  shareableWorkpads(setup.http.route);
-}
diff --git a/x-pack/legacy/plugins/canvas/server/routes/shareables.ts b/x-pack/legacy/plugins/canvas/server/routes/shareables.ts
deleted file mode 100644
index e8186ceceb47f..0000000000000
--- a/x-pack/legacy/plugins/canvas/server/routes/shareables.ts
+++ /dev/null
@@ -1,72 +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 archiver from 'archiver';
-
-import {
-  API_ROUTE_SHAREABLE_RUNTIME,
-  API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD,
-  API_ROUTE_SHAREABLE_ZIP,
-} from '../../common/lib/constants';
-
-import {
-  SHAREABLE_RUNTIME_FILE,
-  SHAREABLE_RUNTIME_NAME,
-  SHAREABLE_RUNTIME_SRC,
-} from '../../shareable_runtime/constants';
-
-import { CoreSetup } from '../shim';
-
-export function shareableWorkpads(route: CoreSetup['http']['route']) {
-  // get runtime
-  route({
-    method: 'GET',
-    path: API_ROUTE_SHAREABLE_RUNTIME,
-
-    handler: {
-      file: {
-        path: SHAREABLE_RUNTIME_FILE,
-        // The option setting is not for typical use.  We're using it here to avoid
-        // problems in Cloud environments.  See elastic/kibana#47405.
-        confine: false,
-      },
-    },
-  });
-
-  // download runtime
-  route({
-    method: 'GET',
-    path: API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD,
-
-    handler(_request, handler) {
-      // The option setting is not for typical use.  We're using it here to avoid
-      // problems in Cloud environments.  See elastic/kibana#47405.
-      // @ts-ignore No type for inert Hapi handler
-      const file = handler.file(SHAREABLE_RUNTIME_FILE, { confine: false });
-      file.type('application/octet-stream');
-      return file;
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: API_ROUTE_SHAREABLE_ZIP,
-    handler(request, handler) {
-      const workpad = request.payload;
-
-      const archive = archiver('zip');
-      archive.append(JSON.stringify(workpad), { name: 'workpad.json' });
-      archive.file(`${SHAREABLE_RUNTIME_SRC}/template.html`, { name: 'index.html' });
-      archive.file(SHAREABLE_RUNTIME_FILE, { name: `${SHAREABLE_RUNTIME_NAME}.js` });
-
-      const response = handler.response(archive);
-      response.header('content-type', 'application/zip');
-      archive.finalize();
-
-      return response;
-    },
-  });
-}
diff --git a/x-pack/plugins/canvas/server/routes/index.ts b/x-pack/plugins/canvas/server/routes/index.ts
index e9afab5680332..fce278e94bf32 100644
--- a/x-pack/plugins/canvas/server/routes/index.ts
+++ b/x-pack/plugins/canvas/server/routes/index.ts
@@ -5,9 +5,10 @@
  */
 
 import { IRouter, Logger } from 'src/core/server';
-import { initWorkpadRoutes } from './workpad';
 import { initCustomElementsRoutes } from './custom_elements';
 import { initESFieldsRoutes } from './es_fields';
+import { initShareablesRoutes } from './shareables';
+import { initWorkpadRoutes } from './workpad';
 
 export interface RouteInitializerDeps {
   router: IRouter;
@@ -15,7 +16,8 @@ export interface RouteInitializerDeps {
 }
 
 export function initRoutes(deps: RouteInitializerDeps) {
-  initWorkpadRoutes(deps);
   initCustomElementsRoutes(deps);
   initESFieldsRoutes(deps);
+  initShareablesRoutes(deps);
+  initWorkpadRoutes(deps);
 }
diff --git a/x-pack/plugins/canvas/server/routes/shareables/download.test.ts b/x-pack/plugins/canvas/server/routes/shareables/download.test.ts
new file mode 100644
index 0000000000000..be4765217d7aa
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/shareables/download.test.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+jest.mock('fs');
+
+import fs from 'fs';
+import {
+  IRouter,
+  kibanaResponseFactory,
+  RequestHandlerContext,
+  RequestHandler,
+} from 'src/core/server';
+import { httpServiceMock, httpServerMock, loggingServiceMock } from 'src/core/server/mocks';
+import { initializeDownloadShareableWorkpadRoute } from './download';
+
+const mockRouteContext = {} as RequestHandlerContext;
+const path = `api/canvas/workpad/find`;
+const mockRuntime = 'Canvas shareable runtime';
+
+describe('Download Canvas shareables runtime', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+
+  beforeEach(() => {
+    const httpService = httpServiceMock.createSetupContract();
+    const router = httpService.createRouter('') as jest.Mocked<IRouter>;
+    initializeDownloadShareableWorkpadRoute({
+      router,
+      logger: loggingServiceMock.create().get(),
+    });
+
+    routeHandler = router.get.mock.calls[0][1];
+  });
+
+  afterAll(() => {
+    jest.restoreAllMocks();
+  });
+
+  it(`returns 200 with canvas shareables runtime`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      method: 'get',
+      path,
+    });
+
+    const readFileSyncMock = fs.readFileSync as jest.Mock;
+    readFileSyncMock.mockReturnValueOnce(mockRuntime);
+
+    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+
+    expect(response.status).toBe(200);
+    expect(response.payload).toMatchInlineSnapshot(`"Canvas shareable runtime"`);
+  });
+});
diff --git a/x-pack/plugins/canvas/server/routes/shareables/download.ts b/x-pack/plugins/canvas/server/routes/shareables/download.ts
new file mode 100644
index 0000000000000..08bec1e4881ae
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/shareables/download.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 { readFileSync } from 'fs';
+import { SHAREABLE_RUNTIME_FILE } from '../../../../../legacy/plugins/canvas/shareable_runtime/constants';
+import { RouteInitializerDeps } from '../';
+import { API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD } from '../../../../../legacy/plugins/canvas/common/lib/constants';
+
+export function initializeDownloadShareableWorkpadRoute(deps: RouteInitializerDeps) {
+  const { router } = deps;
+  router.get(
+    {
+      path: API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD,
+      validate: false,
+    },
+    async (_context, _request, response) => {
+      // TODO: check if this is still an issue on cloud after migrating to NP
+      //
+      // The option setting is not for typical use.  We're using it here to avoid
+      // problems in Cloud environments.  See elastic/kibana#47405.
+      // @ts-ignore No type for inert Hapi handler
+      // const file = handler.file(SHAREABLE_RUNTIME_FILE, { confine: false });
+      const file = readFileSync(SHAREABLE_RUNTIME_FILE);
+      return response.ok({
+        headers: { 'content-type': 'application/octet-stream' },
+        body: file,
+      });
+    }
+  );
+}
diff --git a/x-pack/plugins/canvas/server/routes/shareables/index.ts b/x-pack/plugins/canvas/server/routes/shareables/index.ts
new file mode 100644
index 0000000000000..0aabd8b955b21
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/shareables/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 { RouteInitializerDeps } from '../';
+import { initializeZipShareableWorkpadRoute } from './zip';
+import { initializeDownloadShareableWorkpadRoute } from './download';
+
+export function initShareablesRoutes(deps: RouteInitializerDeps) {
+  initializeDownloadShareableWorkpadRoute(deps);
+  initializeZipShareableWorkpadRoute(deps);
+}
diff --git a/x-pack/plugins/canvas/server/routes/shareables/mock_shareable_workpad.json b/x-pack/plugins/canvas/server/routes/shareables/mock_shareable_workpad.json
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/x-pack/plugins/canvas/server/routes/shareables/rendered_workpad_schema.ts b/x-pack/plugins/canvas/server/routes/shareables/rendered_workpad_schema.ts
new file mode 100644
index 0000000000000..792200354724e
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/shareables/rendered_workpad_schema.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 { schema } from '@kbn/config-schema';
+
+export const PositionSchema = schema.object({
+  angle: schema.number(),
+  height: schema.number(),
+  left: schema.number(),
+  parent: schema.nullable(schema.string()),
+  top: schema.number(),
+  width: schema.number(),
+});
+
+export const ContainerStyleSchema = schema.object({
+  type: schema.maybe(schema.string()),
+  border: schema.maybe(schema.string()),
+  borderRadius: schema.maybe(schema.string()),
+  padding: schema.maybe(schema.string()),
+  backgroundColor: schema.maybe(schema.string()),
+  backgroundImage: schema.maybe(schema.string()),
+  backgroundSize: schema.maybe(schema.string()),
+  backgroundRepeat: schema.maybe(schema.string()),
+  opacity: schema.maybe(schema.number()),
+  overflow: schema.maybe(schema.string()),
+});
+
+export const RenderableSchema = schema.object({
+  error: schema.nullable(schema.string()),
+  state: schema.string(),
+  value: schema.object({
+    as: schema.string(),
+    containerStyle: ContainerStyleSchema,
+    css: schema.maybe(schema.string()),
+    type: schema.string(),
+    value: schema.any(),
+  }),
+});
+
+export const RenderedWorkpadElementSchema = schema.object({
+  expressionRenderable: RenderableSchema,
+  id: schema.string(),
+  position: PositionSchema,
+});
+
+export const RenderedWorkpadPageSchema = schema.object({
+  id: schema.string(),
+  elements: schema.arrayOf(RenderedWorkpadElementSchema),
+  groups: schema.maybe(schema.arrayOf(schema.arrayOf(RenderedWorkpadElementSchema))),
+  style: schema.recordOf(schema.string(), schema.string()),
+  transition: schema.maybe(
+    schema.oneOf([
+      schema.object({}),
+      schema.object({
+        name: schema.string(),
+      }),
+    ])
+  ),
+});
+
+export const RenderedWorkpadSchema = schema.object({
+  '@created': schema.maybe(schema.string()),
+  '@timestamp': schema.maybe(schema.string()),
+  assets: schema.maybe(schema.recordOf(schema.string(), RenderedWorkpadPageSchema)),
+  colors: schema.arrayOf(schema.string()),
+  css: schema.string(),
+  height: schema.number(),
+  id: schema.string(),
+  isWriteable: schema.maybe(schema.boolean()),
+  name: schema.string(),
+  page: schema.number(),
+  pages: schema.arrayOf(RenderedWorkpadPageSchema),
+  width: schema.number(),
+});
diff --git a/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts b/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
new file mode 100644
index 0000000000000..edb59694a7400
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts
@@ -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.
+ */
+
+jest.mock('archiver');
+
+const archiver = require('archiver') as jest.Mock;
+import {
+  IRouter,
+  kibanaResponseFactory,
+  RequestHandlerContext,
+  RequestHandler,
+} from 'src/core/server';
+import { httpServiceMock, httpServerMock, loggingServiceMock } from 'src/core/server/mocks';
+import { initializeZipShareableWorkpadRoute } from './zip';
+import { API_ROUTE_SHAREABLE_ZIP } from '../../../../../legacy/plugins/canvas/common/lib';
+import {
+  SHAREABLE_RUNTIME_FILE,
+  SHAREABLE_RUNTIME_SRC,
+  SHAREABLE_RUNTIME_NAME,
+} from '../../../../../legacy/plugins/canvas/shareable_runtime/constants';
+
+const mockRouteContext = {} as RequestHandlerContext;
+const mockWorkpad = {};
+const routePath = API_ROUTE_SHAREABLE_ZIP;
+
+describe('Zips Canvas shareables runtime together with workpad', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+
+  beforeEach(() => {
+    const httpService = httpServiceMock.createSetupContract();
+    const router = httpService.createRouter('') as jest.Mocked<IRouter>;
+    initializeZipShareableWorkpadRoute({
+      router,
+      logger: loggingServiceMock.create().get(),
+    });
+
+    routeHandler = router.post.mock.calls[0][1];
+  });
+
+  afterAll(() => {
+    jest.restoreAllMocks();
+  });
+
+  it(`returns 200 with zip file with runtime and workpad`, async () => {
+    const request = httpServerMock.createKibanaRequest({
+      method: 'get',
+      path: routePath,
+      body: mockWorkpad,
+    });
+
+    const mockArchive = {
+      append: jest.fn(),
+      file: jest.fn(),
+      finalize: jest.fn(),
+    };
+
+    archiver.mockReturnValueOnce(mockArchive);
+
+    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+
+    expect(response.status).toBe(200);
+    expect(response.payload).toBe(mockArchive);
+    expect(mockArchive.append).toHaveBeenCalledWith(JSON.stringify(mockWorkpad), {
+      name: 'workpad.json',
+    });
+    expect(mockArchive.file).toHaveBeenCalledTimes(2);
+    expect(mockArchive.file).nthCalledWith(1, `${SHAREABLE_RUNTIME_SRC}/template.html`, {
+      name: 'index.html',
+    });
+    expect(mockArchive.file).nthCalledWith(2, SHAREABLE_RUNTIME_FILE, {
+      name: `${SHAREABLE_RUNTIME_NAME}.js`,
+    });
+    expect(mockArchive.finalize).toBeCalled();
+  });
+});
diff --git a/x-pack/plugins/canvas/server/routes/shareables/zip.ts b/x-pack/plugins/canvas/server/routes/shareables/zip.ts
new file mode 100644
index 0000000000000..e25b96cce96ff
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/shareables/zip.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import archiver from 'archiver';
+import { API_ROUTE_SHAREABLE_ZIP } from '../../../../../legacy/plugins/canvas/common/lib';
+import {
+  SHAREABLE_RUNTIME_FILE,
+  SHAREABLE_RUNTIME_NAME,
+  SHAREABLE_RUNTIME_SRC,
+} from '../../../../../legacy/plugins/canvas/shareable_runtime/constants';
+import { RenderedWorkpadSchema } from './rendered_workpad_schema';
+import { RouteInitializerDeps } from '..';
+
+export function initializeZipShareableWorkpadRoute(deps: RouteInitializerDeps) {
+  const { router } = deps;
+  router.post(
+    {
+      path: API_ROUTE_SHAREABLE_ZIP,
+      validate: { body: RenderedWorkpadSchema },
+    },
+    async (_context, request, response) => {
+      const workpad = request.body;
+      const archive = archiver('zip');
+      archive.append(JSON.stringify(workpad), { name: 'workpad.json' });
+      archive.file(`${SHAREABLE_RUNTIME_SRC}/template.html`, { name: 'index.html' });
+      archive.file(SHAREABLE_RUNTIME_FILE, { name: `${SHAREABLE_RUNTIME_NAME}.js` });
+
+      const result = { headers: { 'content-type': 'application/zip' }, body: archive };
+      archive.finalize();
+
+      return response.ok(result);
+    }
+  );
+}

From c72e8e0986c97dcd6e837537300ecc8b08a0aba5 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Fri, 31 Jan 2020 16:32:20 -0500
Subject: [PATCH 19/26] [SIEM] [Detections] Import rules (#56389)

* refactor import rules to do it by batch

* fix error msg on api to match with json contract

* review I

* fix export
---
 .../__snapshots__/index.test.tsx.snap         |   2 +-
 .../components/import_rule_modal/index.tsx    |   7 +-
 .../routes/rules/export_rules_route.ts        |  38 +-
 .../routes/rules/import_rules_route.ts        | 337 ++++++++++--------
 .../lib/detection_engine/routes/utils.ts      |  10 +
 .../rules/get_export_by_object_ids.test.ts    |   3 +
 .../rules/get_export_by_object_ids.ts         |  75 ++--
 7 files changed, 288 insertions(+), 184 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap
index 64b88912e53a3..6b5ea2c5390f1 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/__snapshots__/index.test.tsx.snap
@@ -47,7 +47,7 @@ exports[`ImportRuleModal renders correctly against snapshot 1`] = `
       </EuiModalBody>
       <EuiModalFooter>
         <EuiButtonEmpty
-          onClick={[MockFunction]}
+          onClick={[Function]}
         >
           Cancel
         </EuiButtonEmpty>
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 91b2ee283609f..9a68797aea79b 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
@@ -90,6 +90,11 @@ export const ImportRuleModalComponent = ({
     }
   }, [selectedFiles, overwrite]);
 
+  const handleCloseModal = useCallback(() => {
+    setSelectedFiles(null);
+    closeModal();
+  }, [closeModal]);
+
   return (
     <>
       {showModal && (
@@ -125,7 +130,7 @@ export const ImportRuleModalComponent = ({
             </EuiModalBody>
 
             <EuiModalFooter>
-              <EuiButtonEmpty onClick={closeModal}>{i18n.CANCEL_BUTTON}</EuiButtonEmpty>
+              <EuiButtonEmpty onClick={handleCloseModal}>{i18n.CANCEL_BUTTON}</EuiButtonEmpty>
               <EuiButton
                 onClick={importRulesCallback}
                 disabled={selectedFiles == null || isImporting}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts
index b9ff2e6018624..ce62469342883 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts
@@ -36,28 +36,32 @@ export const createExportRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
         return headers.response().code(404);
       }
 
-      const exportSizeLimit = server.config().get<number>('savedObjects.maxImportExportSize');
-      if (request.payload?.objects != null && request.payload.objects.length > exportSizeLimit) {
-        return Boom.badRequest(`Can't export more than ${exportSizeLimit} rules`);
-      } else {
-        const nonPackagedRulesCount = await getNonPackagedRulesCount({ alertsClient });
-        if (nonPackagedRulesCount > exportSizeLimit) {
+      try {
+        const exportSizeLimit = server.config().get<number>('savedObjects.maxImportExportSize');
+        if (request.payload?.objects != null && request.payload.objects.length > exportSizeLimit) {
           return Boom.badRequest(`Can't export more than ${exportSizeLimit} rules`);
+        } else {
+          const nonPackagedRulesCount = await getNonPackagedRulesCount({ alertsClient });
+          if (nonPackagedRulesCount > exportSizeLimit) {
+            return Boom.badRequest(`Can't export more than ${exportSizeLimit} rules`);
+          }
         }
-      }
 
-      const exported =
-        request.payload?.objects != null
-          ? await getExportByObjectIds(alertsClient, request.payload.objects)
-          : await getExportAll(alertsClient);
+        const exported =
+          request.payload?.objects != null
+            ? await getExportByObjectIds(alertsClient, request.payload.objects)
+            : await getExportAll(alertsClient);
 
-      const response = request.query.exclude_export_details
-        ? headers.response(exported.rulesNdjson)
-        : headers.response(`${exported.rulesNdjson}${exported.exportDetails}`);
+        const response = request.query.exclude_export_details
+          ? headers.response(exported.rulesNdjson)
+          : headers.response(`${exported.rulesNdjson}${exported.exportDetails}`);
 
-      return response
-        .header('Content-Disposition', `attachment; filename="${request.query.file_name}"`)
-        .header('Content-Type', 'application/ndjson');
+        return response
+          .header('Content-Disposition', `attachment; filename="${request.query.file_name}"`)
+          .header('Content-Type', 'application/ndjson');
+      } catch {
+        return Boom.badRequest(`Sorry, something went wrong to export rules`);
+      }
     },
   };
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
index 71fdef3623bc7..0d57f5739fc15 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -6,8 +6,9 @@
 
 import Boom from 'boom';
 import Hapi from 'hapi';
+import { chunk, isEmpty, isFunction } from 'lodash/fp';
 import { extname } from 'path';
-import { isFunction } from 'lodash/fp';
+import uuid from 'uuid';
 import { createPromiseFromStreams } from '../../../../../../../../../src/legacy/utils/streams';
 import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
 import { createRules } from '../../rules/create_rules';
@@ -18,17 +19,25 @@ import { getIndexExists } from '../../index/get_index_exists';
 import {
   callWithRequestFactory,
   getIndex,
-  createImportErrorObject,
-  transformImportError,
-  ImportSuccessError,
+  createBulkErrorObject,
+  ImportRuleResponse,
 } from '../utils';
 import { createRulesStreamFromNdJson } from '../../rules/create_rules_stream_from_ndjson';
 import { ImportRuleAlertRest } from '../../types';
-import { transformOrImportError } from './utils';
 import { updateRules } from '../../rules/update_rules';
 import { importRulesQuerySchema, importRulesPayloadSchema } from '../schemas/import_rules_schema';
 import { KibanaRequest } from '../../../../../../../../../src/core/server';
 
+type PromiseFromStreams = ImportRuleAlertRest | Error;
+
+/*
+ * We were getting some error like that possible EventEmitter memory leak detected
+ * So we decide to batch the update by 10 to avoid any complication in the node side
+ * https://nodejs.org/docs/latest/api/events.html#events_emitter_setmaxlisteners_n
+ *
+ */
+const CHUNK_PARSED_OBJECT_SIZE = 10;
+
 export const createImportRulesRoute = (server: ServerFacade): Hapi.ServerRoute => {
   return {
     method: 'POST',
@@ -67,145 +76,189 @@ export const createImportRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
 
       const objectLimit = server.config().get<number>('savedObjects.maxImportExportSize');
       const readStream = createRulesStreamFromNdJson(request.payload.file, objectLimit);
-      const parsedObjects = await createPromiseFromStreams<[ImportRuleAlertRest | Error]>([
-        readStream,
-      ]);
-
-      const reduced = await parsedObjects.reduce<Promise<ImportSuccessError>>(
-        async (accum, parsedRule) => {
-          const existingImportSuccessError = await accum;
-          if (parsedRule instanceof Error) {
-            // If the JSON object had a validation or parse error then we return
-            // early with the error and an (unknown) for the ruleId
-            return createImportErrorObject({
-              ruleId: '(unknown)', // TODO: Better handling where we know which ruleId is having issues with imports
-              statusCode: 400,
-              message: parsedRule.message,
-              existingImportSuccessError,
-            });
-          }
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([readStream]);
 
-          const {
-            description,
-            enabled,
-            false_positives: falsePositives,
-            from,
-            immutable,
-            query,
-            language,
-            output_index: outputIndex,
-            saved_id: savedId,
-            meta,
-            filters,
-            rule_id: ruleId,
-            index,
-            interval,
-            max_signals: maxSignals,
-            risk_score: riskScore,
-            name,
-            severity,
-            tags,
-            threat,
-            to,
-            type,
-            references,
-            timeline_id: timelineId,
-            timeline_title: timelineTitle,
-            version,
-          } = parsedRule;
-          try {
-            const finalIndex = outputIndex != null ? outputIndex : getIndex(request, server);
-            const callWithRequest = callWithRequestFactory(request, server);
-            const indexExists = await getIndexExists(callWithRequest, finalIndex);
-            if (!indexExists) {
-              return createImportErrorObject({
-                ruleId,
-                statusCode: 409,
-                message: `To create a rule, the index must exist first. Index ${finalIndex} does not exist`,
-                existingImportSuccessError,
-              });
-            }
-            const rule = await readRules({ alertsClient, ruleId });
-            if (rule == null) {
-              const createdRule = await createRules({
-                alertsClient,
-                actionsClient,
-                description,
-                enabled,
-                falsePositives,
-                from,
-                immutable,
-                query,
-                language,
-                outputIndex: finalIndex,
-                savedId,
-                timelineId,
-                timelineTitle,
-                meta,
-                filters,
-                ruleId,
-                index,
-                interval,
-                maxSignals,
-                riskScore,
-                name,
-                severity,
-                tags,
-                to,
-                type,
-                threat,
-                references,
-                version,
-              });
-              return transformOrImportError(ruleId, createdRule, existingImportSuccessError);
-            } else if (rule != null && request.query.overwrite) {
-              const updatedRule = await updateRules({
-                alertsClient,
-                actionsClient,
-                savedObjectsClient,
-                description,
-                enabled,
-                falsePositives,
-                from,
-                immutable,
-                query,
-                language,
-                outputIndex,
-                savedId,
-                timelineId,
-                timelineTitle,
-                meta,
-                filters,
-                id: undefined,
-                ruleId,
-                index,
-                interval,
-                maxSignals,
-                riskScore,
-                name,
-                severity,
-                tags,
-                to,
-                type,
-                threat,
-                references,
-                version,
-              });
-              return transformOrImportError(ruleId, updatedRule, existingImportSuccessError);
-            } else {
-              return existingImportSuccessError;
-            }
-          } catch (err) {
-            return transformImportError(ruleId, err, existingImportSuccessError);
-          }
-        },
-        Promise.resolve({
-          success: true,
-          success_count: 0,
-          errors: [],
-        })
+      const uniqueParsedObjects = Array.from(
+        parsedObjects
+          .reduce(
+            (acc, parsedRule) => {
+              if (parsedRule instanceof Error) {
+                acc.set(uuid.v4(), parsedRule);
+              } else {
+                const { rule_id: ruleId } = parsedRule;
+                if (ruleId != null) {
+                  acc.set(ruleId, parsedRule);
+                } else {
+                  acc.set(uuid.v4(), parsedRule);
+                }
+              }
+              return acc;
+            }, // using map (preserves ordering)
+            new Map()
+          )
+          .values()
       );
-      return reduced;
+
+      const chunkParseObjects = chunk(CHUNK_PARSED_OBJECT_SIZE, uniqueParsedObjects);
+      let importRuleResponse: ImportRuleResponse[] = [];
+
+      while (chunkParseObjects.length) {
+        const batchParseObjects = chunkParseObjects.shift() ?? [];
+        const newImportRuleResponse = await Promise.all(
+          batchParseObjects.reduce<Array<Promise<ImportRuleResponse>>>((accum, parsedRule) => {
+            const importsWorkerPromise = new Promise<ImportRuleResponse>(
+              async (resolve, reject) => {
+                if (parsedRule instanceof Error) {
+                  // If the JSON object had a validation or parse error then we return
+                  // early with the error and an (unknown) for the ruleId
+                  resolve(
+                    createBulkErrorObject({
+                      ruleId: '(unknown)',
+                      statusCode: 400,
+                      message: parsedRule.message,
+                    })
+                  );
+                  return null;
+                }
+                const {
+                  description,
+                  false_positives: falsePositives,
+                  from,
+                  immutable,
+                  query,
+                  language,
+                  output_index: outputIndex,
+                  saved_id: savedId,
+                  meta,
+                  filters,
+                  rule_id: ruleId,
+                  index,
+                  interval,
+                  max_signals: maxSignals,
+                  risk_score: riskScore,
+                  name,
+                  severity,
+                  tags,
+                  threat,
+                  to,
+                  type,
+                  references,
+                  timeline_id: timelineId,
+                  timeline_title: timelineTitle,
+                  version,
+                } = parsedRule;
+                try {
+                  const finalIndex = getIndex(request, server);
+                  const callWithRequest = callWithRequestFactory(request, server);
+                  const indexExists = await getIndexExists(callWithRequest, finalIndex);
+                  if (!indexExists) {
+                    resolve(
+                      createBulkErrorObject({
+                        ruleId,
+                        statusCode: 409,
+                        message: `To create a rule, the index must exist first. Index ${finalIndex} does not exist`,
+                      })
+                    );
+                  }
+                  const rule = await readRules({ alertsClient, ruleId });
+                  if (rule == null) {
+                    await createRules({
+                      alertsClient,
+                      actionsClient,
+                      description,
+                      enabled: false,
+                      falsePositives,
+                      from,
+                      immutable,
+                      query,
+                      language,
+                      outputIndex: finalIndex,
+                      savedId,
+                      timelineId,
+                      timelineTitle,
+                      meta,
+                      filters,
+                      ruleId,
+                      index,
+                      interval,
+                      maxSignals,
+                      riskScore,
+                      name,
+                      severity,
+                      tags,
+                      to,
+                      type,
+                      threat,
+                      references,
+                      version,
+                    });
+                    resolve({ rule_id: ruleId, status_code: 200 });
+                  } else if (rule != null && request.query.overwrite) {
+                    await updateRules({
+                      alertsClient,
+                      actionsClient,
+                      savedObjectsClient,
+                      description,
+                      enabled: false,
+                      falsePositives,
+                      from,
+                      immutable,
+                      query,
+                      language,
+                      outputIndex,
+                      savedId,
+                      timelineId,
+                      timelineTitle,
+                      meta,
+                      filters,
+                      id: undefined,
+                      ruleId,
+                      index,
+                      interval,
+                      maxSignals,
+                      riskScore,
+                      name,
+                      severity,
+                      tags,
+                      to,
+                      type,
+                      threat,
+                      references,
+                      version,
+                    });
+                    resolve({ rule_id: ruleId, status_code: 200 });
+                  } else if (rule != null) {
+                    resolve(
+                      createBulkErrorObject({
+                        ruleId,
+                        statusCode: 409,
+                        message: `This Rule "${rule.name}" already exists`,
+                      })
+                    );
+                  }
+                } catch (err) {
+                  resolve(
+                    createBulkErrorObject({
+                      ruleId,
+                      statusCode: 400,
+                      message: err.message,
+                    })
+                  );
+                }
+              }
+            );
+            return [...accum, importsWorkerPromise];
+          }, [])
+        );
+        importRuleResponse = [...importRuleResponse, ...newImportRuleResponse];
+      }
+
+      const errorsResp = importRuleResponse.filter(resp => !isEmpty(resp.error));
+      return {
+        success: errorsResp.length === 0,
+        success_count: importRuleResponse.filter(resp => resp.status_code === 200).length,
+        errors: errorsResp,
+      };
     },
   };
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
index 19cd972b60e1a..416c76b5d4eb5 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
@@ -52,6 +52,16 @@ export const createBulkErrorObject = ({
   };
 };
 
+export interface ImportRuleResponse {
+  rule_id: string;
+  status_code?: number;
+  message?: string;
+  error?: {
+    status_code: number;
+    message: string;
+  };
+}
+
 export interface ImportSuccessError {
   success: boolean;
   success_count: number;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
index 05e455efb3f22..236d04acc782b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
@@ -66,6 +66,7 @@ describe('get_export_by_object_ids', () => {
       const objects = [{ rule_id: 'rule-1' }];
       const exports = await getRulesFromObjects(unsafeCast, objects);
       const expected: RulesErrors = {
+        exportedCount: 1,
         missingRules: [],
         rules: [
           {
@@ -141,6 +142,7 @@ describe('get_export_by_object_ids', () => {
       const objects = [{ rule_id: 'rule-1' }];
       const exports = await getRulesFromObjects(unsafeCast, objects);
       const expected: RulesErrors = {
+        exportedCount: 0,
         missingRules: [{ rule_id: 'rule-1' }],
         rules: [],
       };
@@ -164,6 +166,7 @@ describe('get_export_by_object_ids', () => {
       const objects = [{ rule_id: 'rule-1' }];
       const exports = await getRulesFromObjects(unsafeCast, objects);
       const expected: RulesErrors = {
+        exportedCount: 0,
         missingRules: [{ rule_id: 'rule-1' }],
         rules: [],
       };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_export_by_object_ids.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_export_by_object_ids.ts
index a5cf1bbfb7858..7e0d61d040617 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_export_by_object_ids.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_export_by_object_ids.ts
@@ -11,7 +11,20 @@ import { readRules } from './read_rules';
 import { transformRulesToNdjson, transformAlertToRule } from '../routes/rules/utils';
 import { OutputRuleAlertRest } from '../types';
 
+interface ExportSuccesRule {
+  statusCode: 200;
+  rule: Partial<OutputRuleAlertRest>;
+}
+
+interface ExportFailedRule {
+  statusCode: 404;
+  missingRuleId: { rule_id: string };
+}
+
+type ExportRules = ExportSuccesRule | ExportFailedRule;
+
 export interface RulesErrors {
+  exportedCount: number;
   missingRules: Array<{ rule_id: string }>;
   rules: Array<Partial<OutputRuleAlertRest>>;
 }
@@ -33,28 +46,44 @@ export const getRulesFromObjects = async (
   alertsClient: AlertsClient,
   objects: Array<{ rule_id: string }>
 ): Promise<RulesErrors> => {
-  const alertsAndErrors = await objects.reduce<Promise<RulesErrors>>(
-    async (accumPromise, object) => {
-      const accum = await accumPromise;
-      const rule = await readRules({ alertsClient, ruleId: object.rule_id });
-      if (rule != null && isAlertType(rule) && rule.params.immutable !== true) {
-        const transformedRule = transformAlertToRule(rule);
-        return {
-          missingRules: accum.missingRules,
-          rules: [...accum.rules, transformedRule],
-        };
-      } else {
-        return {
-          missingRules: [...accum.missingRules, { rule_id: object.rule_id }],
-          rules: accum.rules,
-        };
-      }
-    },
-    Promise.resolve({
-      exportedCount: 0,
-      missingRules: [],
-      rules: [],
-    })
+  const alertsAndErrors = await Promise.all(
+    objects.reduce<Array<Promise<ExportRules>>>((accumPromise, object) => {
+      const exportWorkerPromise = new Promise<ExportRules>(async resolve => {
+        try {
+          const rule = await readRules({ alertsClient, ruleId: object.rule_id });
+          if (rule != null && isAlertType(rule) && rule.params.immutable !== true) {
+            const transformedRule = transformAlertToRule(rule);
+            resolve({
+              statusCode: 200,
+              rule: transformedRule,
+            });
+          } else {
+            resolve({
+              statusCode: 404,
+              missingRuleId: { rule_id: object.rule_id },
+            });
+          }
+        } catch {
+          resolve({
+            statusCode: 404,
+            missingRuleId: { rule_id: object.rule_id },
+          });
+        }
+      });
+      return [...accumPromise, exportWorkerPromise];
+    }, [])
   );
-  return alertsAndErrors;
+
+  const missingRules = alertsAndErrors.filter(
+    resp => resp.statusCode === 404
+  ) as ExportFailedRule[];
+  const exportedRules = alertsAndErrors.filter(
+    resp => resp.statusCode === 200
+  ) as ExportSuccesRule[];
+
+  return {
+    exportedCount: exportedRules.length,
+    missingRules: missingRules.map(mr => mr.missingRuleId),
+    rules: exportedRules.map(er => er.rule),
+  };
 };

From 3601602feb462eb6a6f1fade7ca41370cc18952b Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Fri, 31 Jan 2020 16:32:30 -0500
Subject: [PATCH 20/26] fix update severity (#56527)

---
 .../rules/components/step_about_rule/index.tsx            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 4ae88b3014d19..9c351e66c2f04 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
@@ -168,7 +168,6 @@ const StepAboutRuleComponent: FC<StepAboutRuleProps> = ({
                     min: 0,
                     fullWidth: false,
                     disabled: isLoading,
-                    options: severityOptions,
                     showTicks: true,
                     tickInterval: 25,
                   },
@@ -239,8 +238,13 @@ const StepAboutRuleComponent: FC<StepAboutRuleProps> = ({
           <FormDataProvider pathsToWatch="severity">
             {({ severity }) => {
               const newRiskScore = defaultRiskScoreBySeverity[severity as SeverityValue];
+              const severityField = form.getFields().severity;
               const riskScoreField = form.getFields().riskScore;
-              if (newRiskScore != null && riskScoreField.value !== newRiskScore) {
+              if (
+                severityField.value !== severity &&
+                newRiskScore != null &&
+                riskScoreField.value !== newRiskScore
+              ) {
                 riskScoreField.setValue(newRiskScore);
               }
               return null;

From 3c2c689e981dbafe0ad8f6af78392ed88282be46 Mon Sep 17 00:00:00 2001
From: Alex Holmansky <alex.holmansky@elastic.co>
Date: Fri, 31 Jan 2020 17:19:16 -0500
Subject: [PATCH 21/26] Use diagnostics-enable action in the workflow. Issue:
 #56526 (#56530)

---
 .github/workflows/pr-project-assigner.yml | 2 +-
 .github/workflows/project-assigner.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-project-assigner.yml b/.github/workflows/pr-project-assigner.yml
index 708c9efea404b..ccaa5b11aa80c 100644
--- a/.github/workflows/pr-project-assigner.yml
+++ b/.github/workflows/pr-project-assigner.yml
@@ -8,7 +8,7 @@ jobs:
     name: Assign a PR to project based on label
     steps:
       - name: Assign to project
-        uses: elastic/github-actions/project-assigner@v1.0.0
+        uses: elastic/github-actions/project-assigner@v1.0.1
         id: project_assigner
         with:
           issue-mappings: |
diff --git a/.github/workflows/project-assigner.yml b/.github/workflows/project-assigner.yml
index aec3bf88f0ee2..737da4f7fe371 100644
--- a/.github/workflows/project-assigner.yml
+++ b/.github/workflows/project-assigner.yml
@@ -8,7 +8,7 @@ jobs:
     name: Assign issue or PR to project based on label
     steps:
       - name: Assign to project
-        uses: elastic/github-actions/project-assigner@v1.0.0
+        uses: elastic/github-actions/project-assigner@v1.0.1
         id: project_assigner
         with:
           issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}, {"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187593}]'

From 1c705d82486ffb9238bd008dc22e770059e124c0 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Fri, 31 Jan 2020 17:06:06 -0600
Subject: [PATCH 22/26]  APM Service Map popover fixes round 1 (#56502)

Some fixes for #54405.

* Use the `popoverPositionFluid` method of `EuiPopover` to properly position the arrow based on where the popover was opened
* Rearrange the variable declarations and effects in the popover index
* Create a `Contents` component to separate the internals of the popover from the index, where the poisitioning is done
* Add a story to show the contents rendering
---
 .../app/ServiceMap/Popover/Contents.tsx       |  66 ++++++++++
 .../app/ServiceMap/Popover/Info.tsx           |   9 +-
 .../ServiceMap/Popover/Popover.stories.tsx    |  49 +++++++
 .../app/ServiceMap/Popover/index.tsx          | 124 +++++++-----------
 4 files changed, 171 insertions(+), 77 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx

diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx
new file mode 100644
index 0000000000000..378ad9509c217
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx
@@ -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 {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiTitle
+} from '@elastic/eui';
+import cytoscape from 'cytoscape';
+import React from 'react';
+import { Buttons } from './Buttons';
+import { Info } from './Info';
+import { ServiceMetricList } from './ServiceMetricList';
+
+const popoverMinWidth = 280;
+
+interface ContentsProps {
+  focusedServiceName?: string;
+  isService: boolean;
+  label: string;
+  onFocusClick: () => void;
+  selectedNodeData: cytoscape.NodeDataDefinition;
+  selectedNodeServiceName: string;
+}
+
+export function Contents({
+  selectedNodeData,
+  focusedServiceName,
+  isService,
+  label,
+  onFocusClick,
+  selectedNodeServiceName
+}: ContentsProps) {
+  return (
+    <EuiFlexGroup
+      direction="column"
+      gutterSize="s"
+      style={{ minWidth: popoverMinWidth }}
+    >
+      <EuiFlexItem>
+        <EuiTitle size="xxs">
+          <h3>{label}</h3>
+        </EuiTitle>
+        <EuiHorizontalRule margin="xs" />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        {isService ? (
+          <ServiceMetricList serviceName={selectedNodeServiceName} />
+        ) : (
+          <Info {...selectedNodeData} />
+        )}
+      </EuiFlexItem>
+      {isService && (
+        <Buttons
+          focusedServiceName={focusedServiceName}
+          onFocusClick={onFocusClick}
+          selectedNodeServiceName={selectedNodeServiceName}
+        />
+      )}
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Info.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Info.tsx
index 1c5443e404f9b..d432119505382 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Info.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Info.tsx
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
 import { i18n } from '@kbn/i18n';
+import cytoscape from 'cytoscape';
+import React from 'react';
 import styled from 'styled-components';
-import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
 
 const ItemRow = styled.div`
   line-height: 2;
@@ -19,8 +20,8 @@ const ItemTitle = styled.dt`
 
 const ItemDescription = styled.dd``;
 
-interface InfoProps {
-  type: string;
+interface InfoProps extends cytoscape.NodeDataDefinition {
+  type?: string;
   subtype?: string;
 }
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx
new file mode 100644
index 0000000000000..b26488c5ef7de
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx
@@ -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 { storiesOf } from '@storybook/react';
+import React from 'react';
+import {
+  ApmPluginContext,
+  ApmPluginContextValue
+} from '../../../../context/ApmPluginContext';
+import { Contents } from './Contents';
+
+const selectedNodeData = {
+  id: 'opbeans-node',
+  label: 'opbeans-node',
+  href:
+    '#/services/opbeans-node/service-map?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
+  agentName: 'nodejs',
+  type: 'service'
+};
+
+storiesOf('app/ServiceMap/Popover/Contents', module).add(
+  'example',
+  () => {
+    return (
+      <ApmPluginContext.Provider
+        value={
+          ({ core: { notifications: {} } } as unknown) as ApmPluginContextValue
+        }
+      >
+        <Contents
+          selectedNodeData={selectedNodeData}
+          isService={true}
+          label="opbeans-node"
+          onFocusClick={() => {}}
+          selectedNodeServiceName="opbeans-node"
+        />
+      </ApmPluginContext.Provider>
+    );
+  },
+  {
+    info: {
+      propTablesExclude: [ApmPluginContext.Provider],
+      source: false
+    }
+  }
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx
index dfb78aaa0214c..e8e37cfdfb1f0 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx
@@ -4,27 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiHorizontalRule,
-  EuiPopover,
-  EuiTitle
-} from '@elastic/eui';
+import { EuiPopover } from '@elastic/eui';
 import cytoscape from 'cytoscape';
 import React, {
   CSSProperties,
+  useCallback,
   useContext,
   useEffect,
-  useState,
-  useCallback
+  useRef,
+  useState
 } from 'react';
 import { CytoscapeContext } from '../Cytoscape';
-import { Buttons } from './Buttons';
-import { Info } from './Info';
-import { ServiceMetricList } from './ServiceMetricList';
-
-const popoverMinWidth = 280;
+import { Contents } from './Contents';
 
 interface PopoverProps {
   focusedServiceName?: string;
@@ -35,56 +26,62 @@ export function Popover({ focusedServiceName }: PopoverProps) {
   const [selectedNode, setSelectedNode] = useState<
     cytoscape.NodeSingular | undefined
   >(undefined);
-  const onFocusClick = useCallback(() => setSelectedNode(undefined), [
+  const deselect = useCallback(() => setSelectedNode(undefined), [
     setSelectedNode
   ]);
-
-  useEffect(() => {
-    const selectHandler: cytoscape.EventHandler = event => {
-      setSelectedNode(event.target);
-    };
-    const unselectHandler: cytoscape.EventHandler = () => {
-      setSelectedNode(undefined);
-    };
-
-    if (cy) {
-      cy.on('select', 'node', selectHandler);
-      cy.on('unselect', 'node', unselectHandler);
-      cy.on('data viewport', unselectHandler);
-    }
-
-    return () => {
-      if (cy) {
-        cy.removeListener('select', 'node', selectHandler);
-        cy.removeListener('unselect', 'node', unselectHandler);
-        cy.removeListener('data viewport', undefined, unselectHandler);
-      }
-    };
-  }, [cy]);
-
   const renderedHeight = selectedNode?.renderedHeight() ?? 0;
   const renderedWidth = selectedNode?.renderedWidth() ?? 0;
   const { x, y } = selectedNode?.renderedPosition() ?? { x: 0, y: 0 };
   const isOpen = !!selectedNode;
-  const selectedNodeServiceName: string = selectedNode?.data('id');
   const isService = selectedNode?.data('type') === 'service';
   const triggerStyle: CSSProperties = {
     background: 'transparent',
     height: renderedHeight,
     position: 'absolute',
-    width: renderedWidth
+    width: renderedWidth,
+    border: '3px dotted red'
   };
-  const trigger = <div className="trigger" style={triggerStyle} />;
-
+  const trigger = <div style={triggerStyle} />;
   const zoom = cy?.zoom() ?? 1;
   const height = selectedNode?.height() ?? 0;
-  const translateY = y - (zoom + 1) * (height / 2);
+  const translateY = y - ((zoom + 1) * height) / 4;
   const popoverStyle: CSSProperties = {
     position: 'absolute',
     transform: `translate(${x}px, ${translateY}px)`
   };
-  const data = selectedNode?.data() ?? {};
-  const label = data.label || selectedNodeServiceName;
+  const selectedNodeData = selectedNode?.data() ?? {};
+  const selectedNodeServiceName = selectedNodeData.id;
+  const label = selectedNodeData.label || selectedNodeServiceName;
+  const popoverRef = useRef<EuiPopover>(null);
+
+  // Set up Cytoscape event handlers
+  useEffect(() => {
+    const selectHandler: cytoscape.EventHandler = event => {
+      setSelectedNode(event.target);
+    };
+
+    if (cy) {
+      cy.on('select', 'node', selectHandler);
+      cy.on('unselect', 'node', deselect);
+      cy.on('data viewport', deselect);
+    }
+
+    return () => {
+      if (cy) {
+        cy.removeListener('select', 'node', selectHandler);
+        cy.removeListener('unselect', 'node', deselect);
+        cy.removeListener('data viewport', undefined, deselect);
+      }
+    };
+  }, [cy, deselect]);
+
+  // Handle positioning of popover. This makes it so the popover positions
+  // itself correctly and the arrows are always pointing to where they should.
+  useEffect(() => {
+    if (popoverRef.current) {
+      popoverRef.current.positionPopoverFluid();
+    }
+  }, [popoverRef, x, y]);
 
   return (
     <EuiPopover
@@ -92,35 +89,16 @@ export function Popover({ focusedServiceName }: PopoverProps) {
       button={trigger}
       closePopover={() => {}}
       isOpen={isOpen}
+      ref={popoverRef}
       style={popoverStyle}
     >
-      <EuiFlexGroup
-        direction="column"
-        gutterSize="s"
-        style={{ minWidth: popoverMinWidth }}
-      >
-        <EuiFlexItem>
-          <EuiTitle size="xxs">
-            <h3>{label}</h3>
-          </EuiTitle>
-          <EuiHorizontalRule margin="xs" />
-        </EuiFlexItem>
-
-        <EuiFlexItem>
-          {isService ? (
-            <ServiceMetricList serviceName={selectedNodeServiceName} />
-          ) : (
-            <Info {...data} />
-          )}
-        </EuiFlexItem>
-        {isService && (
-          <Buttons
-            focusedServiceName={focusedServiceName}
-            onFocusClick={onFocusClick}
-            selectedNodeServiceName={selectedNodeServiceName}
-          />
-        )}
-      </EuiFlexGroup>
+      <Contents
+        selectedNodeData={selectedNodeData}
+        isService={isService}
+        label={label}
+        onFocusClick={deselect}
+        selectedNodeServiceName={selectedNodeServiceName}
+      />
     </EuiPopover>
   );
 }

From 49e9c793dfeb3ef545b6060df6037d86b945f99f Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Sat, 1 Feb 2020 00:20:29 +0100
Subject: [PATCH 23/26] [Uptime] Update relative time handling (#55693)

* update relative time handling

* fix type

* update logic to handle end date

* fix test

* PR feedback

* refactor code

* refactor interval time

* fix tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../url_params/get_supported_url_params.ts    |  3 ++-
 .../helper/url_params/parse_absolute_date.ts  |  4 +--
 .../search/find_potential_matches.ts          |  1 -
 .../monitor_states/search/query_context.ts    |  7 ++---
 .../__test__/parse_relative_date.test.ts      | 23 ++++++++++++++++
 .../lib/helper/get_histogram_interval.ts      | 27 ++++++++++++++++---
 6 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/server/lib/helper/__test__/parse_relative_date.test.ts

diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
index c1382d455313f..f01448d9e37ac 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
@@ -84,7 +84,8 @@ export const getSupportedUrlParams = (params: {
     ),
     absoluteDateRangeEnd: parseAbsoluteDate(
       dateRangeEnd || DATE_RANGE_END,
-      ABSOLUTE_DATE_RANGE_END
+      ABSOLUTE_DATE_RANGE_END,
+      { roundUp: true }
     ),
     autorefreshInterval: parseUrlInt(autorefreshInterval, AUTOREFRESH_INTERVAL),
     autorefreshIsPaused: parseIsPaused(autorefreshIsPaused, AUTOREFRESH_IS_PAUSED),
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts
index eaf720a8d2f7e..2b0921f07abc9 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts
@@ -6,8 +6,8 @@
 
 import DateMath from '@elastic/datemath';
 
-export const parseAbsoluteDate = (date: string, defaultValue: number): number => {
-  const momentWrapper = DateMath.parse(date);
+export const parseAbsoluteDate = (date: string, defaultValue: number, options = {}): number => {
+  const momentWrapper = DateMath.parse(date, options);
   if (momentWrapper) {
     return momentWrapper.valueOf();
   }
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 e34bc6ab805c0..634d6369531d8 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
@@ -25,7 +25,6 @@ export const findPotentialMatches = async (
   size: number
 ) => {
   const queryResult = await query(queryContext, searchAfter, size);
-
   const checkGroups = new Set<string>();
   const monitorIds: string[] = [];
   get<any>(queryResult, 'aggregations.monitors.buckets', []).forEach((b: any) => {
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
index d97b7653402a3..961cc94dcea19 100644
--- 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
@@ -4,10 +4,10 @@
  * 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';
+import { parseRelativeDate } from '../../../helper/get_histogram_interval';
 
 export class QueryContext {
   callES: APICaller;
@@ -95,8 +95,9 @@ export class QueryContext {
     // latencies and slowdowns that's dangerous. Making this value larger makes things
     // only slower, but only marginally so, and prevents people from seeing weird
     // behavior.
-    const tsStart = DateMath.parse(this.dateRangeEnd)!.subtract(5, 'minutes');
-    const tsEnd = DateMath.parse(this.dateRangeEnd)!;
+
+    const tsEnd = parseRelativeDate(this.dateRangeEnd, { roundUp: true })!;
+    const tsStart = tsEnd.subtract(5, 'minutes');
 
     return {
       range: {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/parse_relative_date.test.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/parse_relative_date.test.ts
new file mode 100644
index 0000000000000..ec6e48c62c62e
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/parse_relative_date.test.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 { parseRelativeDate } from '../get_histogram_interval';
+import { Moment } from 'moment';
+
+describe('Parsing a relative end date properly', () => {
+  it('converts the upper range of relative end dates to now', async () => {
+    const thisWeekEndDate = 'now/w';
+
+    let endDate = parseRelativeDate(thisWeekEndDate, { roundUp: true });
+    expect(Date.now() - (endDate as Moment).valueOf()).toBeLessThan(1000);
+
+    const todayEndDate = 'now/d';
+
+    endDate = parseRelativeDate(todayEndDate, { roundUp: true });
+
+    expect(Date.now() - (endDate as Moment).valueOf()).toBeLessThan(1000);
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval.ts
index 0dedc3e456f51..26515fb4b4c63 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval.ts
@@ -7,18 +7,39 @@
 import DateMath from '@elastic/datemath';
 import { QUERY } from '../../../common/constants';
 
+export const parseRelativeDate = (dateStr: string, options = {}) => {
+  // We need this this parsing because if user selects This week or this date
+  // That represents end date in future, if week or day is still in the middle
+  // Uptime data can never be collected in future, so we will reset date to now
+  // in That case. Example case we select this week range will be to='now/w' and from = 'now/w';
+
+  const parsedDate = DateMath.parse(dateStr, options);
+  const dateTimestamp = parsedDate?.valueOf() ?? 0;
+  if (dateTimestamp > Date.now()) {
+    return DateMath.parse('now');
+  }
+  return parsedDate;
+};
+
 export const getHistogramInterval = (
   dateRangeStart: string,
   dateRangeEnd: string,
   bucketCount?: number
 ): number => {
-  const from = DateMath.parse(dateRangeStart);
-  const to = DateMath.parse(dateRangeEnd);
+  const from = parseRelativeDate(dateRangeStart);
+
+  // roundUp is required for relative date like now/w to get the end of the week
+  const to = parseRelativeDate(dateRangeEnd, { roundUp: true });
   if (from === undefined) {
     throw Error('Invalid dateRangeStart value');
   }
   if (to === undefined) {
     throw Error('Invalid dateRangeEnd value');
   }
-  return Math.round((to.valueOf() - from.valueOf()) / (bucketCount || QUERY.DEFAULT_BUCKET_COUNT));
+  const interval = Math.round(
+    (to.valueOf() - from.valueOf()) / (bucketCount || QUERY.DEFAULT_BUCKET_COUNT)
+  );
+
+  // Interval can never be zero, if it's 0 we return at least 1ms interval
+  return interval > 0 ? interval : 1;
 };

From 0a17cde3fb375e24daf2aa13e8e51d5ae1a3ca83 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Fri, 31 Jan 2020 18:34:59 -0500
Subject: [PATCH 24/26] [SIEM] [Detections] [BUG] Feedback to user about
 generated encryption key (#56464)

* wip

* Expose whether the encryption key is randomly generated for saved-objects

* give feedback to user if encryption key is randomly generated

* remove package distributable

* update msg for no api integration key

* Update x-pack/plugins/encrypted_saved_objects/server/config.ts

Co-Authored-By: Brandon Kobel <brandon.kobel@gmail.com>

* review II

* fix type

* rename encryptionKeyRandomlyGenerated ->  usingEphemeralEncryptionKey

* fix test and mistake

Co-authored-by: Brandon Kobel <brandon.kobel@gmail.com>
---
 .../plugins/encrypted_saved_objects/index.ts  |  4 ++-
 x-pack/legacy/plugins/siem/index.ts           |  4 +++
 .../rules/use_pre_packaged_rules.tsx          | 13 ++++++++-
 .../detection_engine/signals/types.ts         |  1 +
 .../signals/use_privilege_user.tsx            | 13 ++++++++-
 .../no_api_integration_callout/index.tsx      | 26 +++++++++++++++++
 .../translations.ts                           | 28 +++++++++++++++++++
 .../components/user_info/index.tsx            | 24 +++++++++++++++-
 .../detection_engine/detection_engine.tsx     | 14 +++++++---
 .../detection_engine/rules/create/index.tsx   |  8 ++----
 .../detection_engine/rules/details/index.tsx  | 13 ++++-----
 .../detection_engine/rules/edit/index.tsx     |  9 ++----
 .../pages/detection_engine/rules/helpers.tsx  | 10 +++++++
 .../pages/detection_engine/rules/index.tsx    | 13 ++++-----
 .../routes/__mocks__/request_responses.ts     |  1 +
 .../privileges/read_privileges_route.ts       |  2 ++
 x-pack/legacy/plugins/siem/server/types.ts    |  1 +
 .../server/config.test.ts                     | 22 +++++++++++++--
 .../encrypted_saved_objects/server/config.ts  | 11 ++++----
 .../encrypted_saved_objects/server/mocks.ts   |  1 +
 .../server/plugin.test.ts                     |  1 +
 .../encrypted_saved_objects/server/plugin.ts  |  4 ++-
 22 files changed, 180 insertions(+), 43 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/translations.ts

diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/index.ts b/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
index 85aa5c22135b6..69058a7a33f59 100644
--- a/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
+++ b/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
@@ -21,7 +21,9 @@ export const encryptedSavedObjects = (kibana: {
     // Some legacy plugins still use `enabled` config key, so we keep it here, but the rest of the
     // keys is handled by the New Platform plugin.
     config: (Joi: Root) =>
-      Joi.object({ enabled: Joi.boolean().default(true) })
+      Joi.object({
+        enabled: Joi.boolean().default(true),
+      })
         .unknown(true)
         .default(),
 
diff --git a/x-pack/legacy/plugins/siem/index.ts b/x-pack/legacy/plugins/siem/index.ts
index cd9b7f59226b0..0a3e447ac64a1 100644
--- a/x-pack/legacy/plugins/siem/index.ts
+++ b/x-pack/legacy/plugins/siem/index.ts
@@ -5,6 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { get } from 'lodash/fp';
 import { resolve } from 'path';
 import { Server } from 'hapi';
 import { Root } from 'joi';
@@ -155,6 +156,9 @@ export const siem = (kibana: any) => {
       const initializerContext = { ...coreContext, env } as PluginInitializerContext;
       const serverFacade = {
         config,
+        usingEphemeralEncryptionKey:
+          get('usingEphemeralEncryptionKey', newPlatform.setup.plugins.encryptedSavedObjects) ??
+          false,
         plugins: {
           alerting: plugins.alerting,
           actions: newPlatform.start.plugins.actions,
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.tsx
index 14d40f9ffbc37..d77d6283692a2 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.tsx
@@ -29,6 +29,7 @@ interface UsePrePackagedRuleProps {
   hasIndexWrite: boolean | null;
   hasManageApiKey: boolean | null;
   isAuthenticated: boolean | null;
+  hasEncryptionKey: boolean | null;
   isSignalIndexExists: boolean | null;
 }
 
@@ -38,6 +39,7 @@ interface UsePrePackagedRuleProps {
  * @param hasIndexWrite boolean
  * @param hasManageApiKey boolean
  * @param isAuthenticated boolean
+ * @param hasEncryptionKey boolean
  * @param isSignalIndexExists boolean
  *
  */
@@ -46,6 +48,7 @@ export const usePrePackagedRules = ({
   hasIndexWrite,
   hasManageApiKey,
   isAuthenticated,
+  hasEncryptionKey,
   isSignalIndexExists,
 }: UsePrePackagedRuleProps): Return => {
   const [rulesStatus, setRuleStatus] = useState<
@@ -117,6 +120,7 @@ export const usePrePackagedRules = ({
             hasIndexWrite &&
             hasManageApiKey &&
             isAuthenticated &&
+            hasEncryptionKey &&
             isSignalIndexExists
           ) {
             setLoadingCreatePrePackagedRules(true);
@@ -180,7 +184,14 @@ export const usePrePackagedRules = ({
       isSubscribed = false;
       abortCtrl.abort();
     };
-  }, [canUserCRUD, hasIndexWrite, hasManageApiKey, isAuthenticated, isSignalIndexExists]);
+  }, [
+    canUserCRUD,
+    hasIndexWrite,
+    hasManageApiKey,
+    isAuthenticated,
+    hasEncryptionKey,
+    isSignalIndexExists,
+  ]);
 
   return {
     loading,
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 ea4860dafd40f..752de13567e5c 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
@@ -97,4 +97,5 @@ export interface Privilege {
     };
   };
   is_authenticated: boolean;
+  has_encryption_key: boolean;
 }
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 b93009c8ce2c2..55f3386b503d8 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
@@ -14,6 +14,7 @@ import * as i18n from './translations';
 interface Return {
   loading: boolean;
   isAuthenticated: boolean | null;
+  hasEncryptionKey: boolean | null;
   hasIndexManage: boolean | null;
   hasManageApiKey: boolean | null;
   hasIndexWrite: boolean | null;
@@ -25,9 +26,17 @@ interface Return {
 export const usePrivilegeUser = (): Return => {
   const [loading, setLoading] = useState(true);
   const [privilegeUser, setPrivilegeUser] = useState<
-    Pick<Return, 'isAuthenticated' | 'hasIndexManage' | 'hasManageApiKey' | 'hasIndexWrite'>
+    Pick<
+      Return,
+      | 'isAuthenticated'
+      | 'hasEncryptionKey'
+      | 'hasIndexManage'
+      | 'hasManageApiKey'
+      | 'hasIndexWrite'
+    >
   >({
     isAuthenticated: null,
+    hasEncryptionKey: null,
     hasIndexManage: null,
     hasManageApiKey: null,
     hasIndexWrite: null,
@@ -50,6 +59,7 @@ export const usePrivilegeUser = (): Return => {
             const indexName = Object.keys(privilege.index)[0];
             setPrivilegeUser({
               isAuthenticated: privilege.is_authenticated,
+              hasEncryptionKey: privilege.has_encryption_key,
               hasIndexManage: privilege.index[indexName].manage,
               hasIndexWrite:
                 privilege.index[indexName].create ||
@@ -67,6 +77,7 @@ export const usePrivilegeUser = (): Return => {
         if (isSubscribed) {
           setPrivilegeUser({
             isAuthenticated: false,
+            hasEncryptionKey: false,
             hasIndexManage: false,
             hasManageApiKey: false,
             hasIndexWrite: false,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/index.tsx
new file mode 100644
index 0000000000000..2d517717ac59d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/index.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 { EuiCallOut, EuiButton } from '@elastic/eui';
+import React, { memo, useCallback, useState } from 'react';
+
+import * as i18n from './translations';
+
+const NoApiIntegrationKeyCallOutComponent = () => {
+  const [showCallOut, setShowCallOut] = useState(true);
+  const handleCallOut = useCallback(() => setShowCallOut(false), [setShowCallOut]);
+
+  return showCallOut ? (
+    <EuiCallOut title={i18n.NO_API_INTEGRATION_KEY_CALLOUT_TITLE} color="danger" iconType="alert">
+      <p>{i18n.NO_API_INTEGRATION_KEY_CALLOUT_MSG}</p>
+      <EuiButton color="danger" onClick={handleCallOut}>
+        {i18n.DISMISS_CALLOUT}
+      </EuiButton>
+    </EuiCallOut>
+  ) : null;
+};
+
+export const NoApiIntegrationKeyCallOut = memo(NoApiIntegrationKeyCallOutComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/translations.ts
new file mode 100644
index 0000000000000..84804af8840f9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/translations.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const NO_API_INTEGRATION_KEY_CALLOUT_TITLE = i18n.translate(
+  'xpack.siem.detectionEngine.noApiIntegrationKeyCallOutTitle',
+  {
+    defaultMessage: 'API integration key required',
+  }
+);
+
+export const NO_API_INTEGRATION_KEY_CALLOUT_MSG = i18n.translate(
+  'xpack.siem.detectionEngine.noApiIntegrationKeyCallOutMsg',
+  {
+    defaultMessage: `A new encryption key is generated for saved objects each time you start Kibana. Without a persistent key, you cannot delete or modify rules after Kibana restarts. To set a persistent key, add the xpack.encryptedSavedObjects.encryptionKey setting with any text value of 32 or more characters to the kibana.yml file.`,
+  }
+);
+
+export const DISMISS_CALLOUT = i18n.translate(
+  'xpack.siem.detectionEngine.dismissNoApiIntegrationKeyButton',
+  {
+    defaultMessage: 'Dismiss',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/user_info/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/user_info/index.tsx
index 0f6a51e52cd2e..a96913f2ad541 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/user_info/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/user_info/index.tsx
@@ -18,6 +18,7 @@ export interface State {
   hasManageApiKey: boolean | null;
   isSignalIndexExists: boolean | null;
   isAuthenticated: boolean | null;
+  hasEncryptionKey: boolean | null;
   loading: boolean;
   signalIndexName: string | null;
 }
@@ -29,6 +30,7 @@ const initialState: State = {
   hasManageApiKey: null,
   isSignalIndexExists: null,
   isAuthenticated: null,
+  hasEncryptionKey: null,
   loading: true,
   signalIndexName: null,
 };
@@ -55,6 +57,10 @@ export type Action =
       type: 'updateIsAuthenticated';
       isAuthenticated: boolean | null;
     }
+  | {
+      type: 'updateHasEncryptionKey';
+      hasEncryptionKey: boolean | null;
+    }
   | {
       type: 'updateCanUserCRUD';
       canUserCRUD: boolean | null;
@@ -102,6 +108,12 @@ export const userInfoReducer = (state: State, action: Action): State => {
         isAuthenticated: action.isAuthenticated,
       };
     }
+    case 'updateHasEncryptionKey': {
+      return {
+        ...state,
+        hasEncryptionKey: action.hasEncryptionKey,
+      };
+    }
     case 'updateCanUserCRUD': {
       return {
         ...state,
@@ -142,6 +154,7 @@ export const useUserInfo = (): State => {
       hasManageApiKey,
       isSignalIndexExists,
       isAuthenticated,
+      hasEncryptionKey,
       loading,
       signalIndexName,
     },
@@ -150,6 +163,7 @@ export const useUserInfo = (): State => {
   const {
     loading: privilegeLoading,
     isAuthenticated: isApiAuthenticated,
+    hasEncryptionKey: isApiEncryptionKey,
     hasIndexManage: hasApiIndexManage,
     hasIndexWrite: hasApiIndexWrite,
     hasManageApiKey: hasApiManageApiKey,
@@ -205,6 +219,12 @@ export const useUserInfo = (): State => {
     }
   }, [loading, isAuthenticated, isApiAuthenticated]);
 
+  useEffect(() => {
+    if (!loading && hasEncryptionKey !== isApiEncryptionKey && isApiEncryptionKey != null) {
+      dispatch({ type: 'updateHasEncryptionKey', hasEncryptionKey: isApiEncryptionKey });
+    }
+  }, [loading, hasEncryptionKey, isApiEncryptionKey]);
+
   useEffect(() => {
     if (!loading && canUserCRUD !== capabilitiesCanUserCRUD && capabilitiesCanUserCRUD != null) {
       dispatch({ type: 'updateCanUserCRUD', canUserCRUD: capabilitiesCanUserCRUD });
@@ -220,6 +240,7 @@ export const useUserInfo = (): State => {
   useEffect(() => {
     if (
       isAuthenticated &&
+      hasEncryptionKey &&
       hasIndexManage &&
       isSignalIndexExists != null &&
       !isSignalIndexExists &&
@@ -227,12 +248,13 @@ export const useUserInfo = (): State => {
     ) {
       createSignalIndex();
     }
-  }, [createSignalIndex, isAuthenticated, isSignalIndexExists, hasIndexManage]);
+  }, [createSignalIndex, isAuthenticated, hasEncryptionKey, isSignalIndexExists, hasIndexManage]);
 
   return {
     loading,
     isSignalIndexExists,
     isAuthenticated,
+    hasEncryptionKey,
     canUserCRUD,
     hasIndexManage,
     hasIndexWrite,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
index b6ddb4de9fd39..d854c377e6ec8 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
@@ -18,7 +18,10 @@ import { GlobalTime } from '../../containers/global_time';
 import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source';
 import { AlertsTable } from '../../components/alerts_viewer/alerts_table';
 import { FiltersGlobal } from '../../components/filters_global';
-import { DETECTION_ENGINE_PAGE_NAME } from '../../components/link_to/redirect_to_detection_engine';
+import {
+  getDetectionEngineTabUrl,
+  getRulesUrl,
+} from '../../components/link_to/redirect_to_detection_engine';
 import { SiemSearchBar } from '../../components/search_bar';
 import { WrapperPage } from '../../components/wrapper_page';
 import { State } from '../../store';
@@ -30,6 +33,7 @@ import { InputsRange } from '../../store/inputs/model';
 import { AlertsByCategory } from '../overview/alerts_by_category';
 import { useSignalInfo } from './components/signals_info';
 import { SignalsTable } from './components/signals';
+import { NoApiIntegrationKeyCallOut } from './components/no_api_integration_callout';
 import { NoWriteSignalsCallOut } from './components/no_write_signals_callout';
 import { SignalsHistogramPanel } from './components/signals_histogram_panel';
 import { signalsHistogramOptions } from './components/signals_histogram_panel/config';
@@ -79,6 +83,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEnginePageComponentProps>
     loading,
     isSignalIndexExists,
     isAuthenticated: isUserAuthenticated,
+    hasEncryptionKey,
     canUserCRUD,
     signalIndexName,
     hasIndexWrite,
@@ -101,7 +106,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEnginePageComponentProps>
             isSelected={tab.id === tabName}
             disabled={tab.disabled}
             key={tab.id}
-            href={`#/${DETECTION_ENGINE_PAGE_NAME}/${tab.id}`}
+            href={getDetectionEngineTabUrl(tab.id)}
           >
             {tab.name}
           </EuiTab>
@@ -134,6 +139,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEnginePageComponentProps>
 
   return (
     <>
+      {hasEncryptionKey != null && !hasEncryptionKey && <NoApiIntegrationKeyCallOut />}
       {hasIndexWrite != null && !hasIndexWrite && <NoWriteSignalsCallOut />}
       <WithSource sourceId="default" indexToAdd={indexToAdd}>
         {({ indicesExist, indexPattern }) => {
@@ -155,7 +161,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEnginePageComponentProps>
                   }
                   title={i18n.PAGE_TITLE}
                 >
-                  <EuiButton fill href="#/detections/rules" iconType="gear">
+                  <EuiButton fill href={getRulesUrl()} iconType="gear">
                     {i18n.BUTTON_MANAGE_RULES}
                   </EuiButton>
                 </DetectionEngineHeaderPage>
@@ -184,7 +190,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEnginePageComponentProps>
                           <SignalsTable
                             loading={loading}
                             hasIndexWrite={hasIndexWrite ?? false}
-                            canUserCRUD={canUserCRUD ?? false}
+                            canUserCRUD={(canUserCRUD ?? false) && (hasEncryptionKey ?? false)}
                             from={from}
                             signalsIndex={signalIndexName ?? ''}
                             to={to}
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 55b838077988c..3adc22329ac4f 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
@@ -23,6 +23,7 @@ import { StepDefineRule } from '../components/step_define_rule';
 import { StepScheduleRule } from '../components/step_schedule_rule';
 import { DetectionEngineHeaderPage } from '../../components/detection_engine_header_page';
 import * as RuleI18n from '../translations';
+import { redirectToDetections } from '../helpers';
 import { AboutStepRule, DefineStepRule, RuleStep, RuleStepData, ScheduleStepRule } from '../types';
 import { formatRule } from './helpers';
 import * as i18n from './translations';
@@ -69,6 +70,7 @@ const CreateRulePageComponent: React.FC = () => {
     loading,
     isSignalIndexExists,
     isAuthenticated,
+    hasEncryptionKey,
     canUserCRUD,
     hasManageApiKey,
   } = useUserInfo();
@@ -239,11 +241,7 @@ const CreateRulePageComponent: React.FC = () => {
     return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules`} />;
   }
 
-  if (
-    isSignalIndexExists != null &&
-    isAuthenticated != null &&
-    (!isSignalIndexExists || !isAuthenticated)
-  ) {
+  if (redirectToDetections(isSignalIndexExists, isAuthenticated, hasEncryptionKey)) {
     return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}`} />;
   } else if (userHasNoPermissions) {
     return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules`} />;
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 7b615d5f159c2..bac1494c4fdd8 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
@@ -25,9 +25,9 @@ import { connect } from 'react-redux';
 import { FiltersGlobal } from '../../../../components/filters_global';
 import { FormattedDate } from '../../../../components/formatted_date';
 import {
-  getDetectionEngineUrl,
   getEditRuleUrl,
   getRulesUrl,
+  DETECTION_ENGINE_PAGE_NAME,
 } from '../../../../components/link_to/redirect_to_detection_engine';
 import { SiemSearchBar } from '../../../../components/search_bar';
 import { WrapperPage } from '../../../../components/wrapper_page';
@@ -54,7 +54,7 @@ import * as detectionI18n from '../../translations';
 import { ReadOnlyCallOut } from '../components/read_only_callout';
 import { RuleSwitch } from '../components/rule_switch';
 import { StepPanel } from '../components/step_panel';
-import { getStepsData } from '../helpers';
+import { getStepsData, redirectToDetections } from '../helpers';
 import * as ruleI18n from '../translations';
 import * as i18n from './translations';
 import { GlobalTime } from '../../../../containers/global_time';
@@ -113,6 +113,7 @@ const RuleDetailsPageComponent: FC<RuleDetailsComponentProps> = ({
     loading,
     isSignalIndexExists,
     isAuthenticated,
+    hasEncryptionKey,
     canUserCRUD,
     hasManageApiKey,
     hasIndexWrite,
@@ -236,12 +237,8 @@ const RuleDetailsPageComponent: FC<RuleDetailsComponentProps> = ({
     [ruleEnabled, setRuleEnabled]
   );
 
-  if (
-    isSignalIndexExists != null &&
-    isAuthenticated != null &&
-    (!isSignalIndexExists || !isAuthenticated)
-  ) {
-    return <Redirect to={`/${getDetectionEngineUrl()}`} />;
+  if (redirectToDetections(isSignalIndexExists, isAuthenticated, hasEncryptionKey)) {
+    return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}`} />;
   }
 
   return (
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 65f4bd2edf7cd..99fcff6b8d2fd 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
@@ -32,7 +32,7 @@ import { StepAboutRule } from '../components/step_about_rule';
 import { StepDefineRule } from '../components/step_define_rule';
 import { StepScheduleRule } from '../components/step_schedule_rule';
 import { formatRule } from '../create/helpers';
-import { getStepsData } from '../helpers';
+import { getStepsData, redirectToDetections } from '../helpers';
 import * as ruleI18n from '../translations';
 import { RuleStep, DefineStepRule, AboutStepRule, ScheduleStepRule } from '../types';
 import * as i18n from './translations';
@@ -56,6 +56,7 @@ const EditRulePageComponent: FC = () => {
     loading: initLoading,
     isSignalIndexExists,
     isAuthenticated,
+    hasEncryptionKey,
     canUserCRUD,
     hasManageApiKey,
   } = useUserInfo();
@@ -270,11 +271,7 @@ const EditRulePageComponent: FC = () => {
     return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules/id/${ruleId}`} />;
   }
 
-  if (
-    isSignalIndexExists != null &&
-    isAuthenticated != null &&
-    (!isSignalIndexExists || !isAuthenticated)
-  ) {
+  if (redirectToDetections(isSignalIndexExists, isAuthenticated, hasEncryptionKey)) {
     return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}`} />;
   } else if (userHasNoPermissions) {
     return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules/id/${ruleId}`} />;
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 ce0d50d9b6106..4e98fc17404c9 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
@@ -138,3 +138,13 @@ export const setFieldValue = (
       form.setFieldValue(key, val);
     }
   });
+
+export const redirectToDetections = (
+  isSignalIndexExists: boolean | null,
+  isAuthenticated: boolean | null,
+  hasEncryptionKey: boolean | null
+) =>
+  isSignalIndexExists != null &&
+  isAuthenticated != null &&
+  hasEncryptionKey != null &&
+  (!isSignalIndexExists || !isAuthenticated || !hasEncryptionKey);
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 1c0ed34e92793..0c53ad19a3574 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
@@ -10,6 +10,7 @@ import { Redirect } from 'react-router-dom';
 
 import { usePrePackagedRules } from '../../../containers/detection_engine/rules';
 import {
+  DETECTION_ENGINE_PAGE_NAME,
   getDetectionEngineUrl,
   getCreateRuleUrl,
 } from '../../../components/link_to/redirect_to_detection_engine';
@@ -22,7 +23,7 @@ import { AllRules } from './all';
 import { ImportRuleModal } from './components/import_rule_modal';
 import { ReadOnlyCallOut } from './components/read_only_callout';
 import { UpdatePrePackagedRulesCallOut } from './components/pre_packaged_rules/update_callout';
-import { getPrePackagedRuleStatus } from './helpers';
+import { getPrePackagedRuleStatus, redirectToDetections } from './helpers';
 import * as i18n from './translations';
 
 type Func = () => void;
@@ -35,6 +36,7 @@ const RulesPageComponent: React.FC = () => {
     loading,
     isSignalIndexExists,
     isAuthenticated,
+    hasEncryptionKey,
     canUserCRUD,
     hasIndexWrite,
     hasManageApiKey,
@@ -54,6 +56,7 @@ const RulesPageComponent: React.FC = () => {
     hasManageApiKey,
     isSignalIndexExists,
     isAuthenticated,
+    hasEncryptionKey,
   });
   const prePackagedRuleStatus = getPrePackagedRuleStatus(
     rulesInstalled,
@@ -83,12 +86,8 @@ const RulesPageComponent: React.FC = () => {
     refreshRulesData.current = refreshRule;
   }, []);
 
-  if (
-    isSignalIndexExists != null &&
-    isAuthenticated != null &&
-    (!isSignalIndexExists || !isAuthenticated)
-  ) {
-    return <Redirect to={getDetectionEngineUrl()} />;
+  if (redirectToDetections(isSignalIndexExists, isAuthenticated, hasEncryptionKey)) {
+    return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}`} />;
   }
 
   return (
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 eea25a1e89cc8..6a42aed123fa3 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
@@ -390,6 +390,7 @@ export const getMockPrivileges = () => ({
   },
   application: {},
   is_authenticated: false,
+  has_encryption_key: true,
 });
 
 export const getFindResultStatus = (): SavedObjectsFindResponse<IRuleSavedAttributesSavedObjectAttributes> => ({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
index 803d9d645aadb..5ea4dc7595b2b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
@@ -29,8 +29,10 @@ export const createReadPrivilegesRulesRoute = (server: ServerFacade): Hapi.Serve
         const callWithRequest = callWithRequestFactory(request, server);
         const index = getIndex(request, server);
         const permissions = await readPrivileges(callWithRequest, index);
+        const usingEphemeralEncryptionKey = server.usingEphemeralEncryptionKey;
         return merge(permissions, {
           is_authenticated: request?.auth?.isAuthenticated ?? false,
+          has_encryption_key: !usingEphemeralEncryptionKey,
         });
       } catch (err) {
         return transformError(err);
diff --git a/x-pack/legacy/plugins/siem/server/types.ts b/x-pack/legacy/plugins/siem/server/types.ts
index 3fa2268afe92c..7c07e63404eaa 100644
--- a/x-pack/legacy/plugins/siem/server/types.ts
+++ b/x-pack/legacy/plugins/siem/server/types.ts
@@ -8,6 +8,7 @@ import { Legacy } from 'kibana';
 
 export interface ServerFacade {
   config: Legacy.Server['config'];
+  usingEphemeralEncryptionKey: boolean;
   plugins: {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     actions: any; // We have to do this at the moment because the types are not compatible
diff --git a/x-pack/plugins/encrypted_saved_objects/server/config.test.ts b/x-pack/plugins/encrypted_saved_objects/server/config.test.ts
index 7d6632aa56cb1..e05d8d687d05a 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/config.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/config.test.ts
@@ -49,7 +49,7 @@ describe('config schema', () => {
 });
 
 describe('createConfig$()', () => {
-  it('should log a warning and set xpack.encryptedSavedObjects.encryptionKey if not set', async () => {
+  it('should log a warning, set xpack.encryptedSavedObjects.encryptionKey and usingEphemeralEncryptionKey=true when encryptionKey is not set', async () => {
     const mockRandomBytes = jest.requireMock('crypto').randomBytes;
     mockRandomBytes.mockReturnValue('ab'.repeat(16));
 
@@ -57,7 +57,10 @@ describe('createConfig$()', () => {
     const config = await createConfig$(contextMock)
       .pipe(first())
       .toPromise();
-    expect(config).toEqual({ encryptionKey: 'ab'.repeat(16) });
+    expect(config).toEqual({
+      config: { encryptionKey: 'ab'.repeat(16) },
+      usingEphemeralEncryptionKey: true,
+    });
 
     expect(loggingServiceMock.collect(contextMock.logger).warn).toMatchInlineSnapshot(`
       Array [
@@ -67,4 +70,19 @@ describe('createConfig$()', () => {
       ]
     `);
   });
+
+  it('should not log a warning and set usingEphemeralEncryptionKey=false when encryptionKey is set', async () => {
+    const contextMock = coreMock.createPluginInitializerContext({
+      encryptionKey: 'supersecret',
+    });
+    const config = await createConfig$(contextMock)
+      .pipe(first())
+      .toPromise();
+    expect(config).toEqual({
+      config: { encryptionKey: 'supersecret' },
+      usingEphemeralEncryptionKey: false,
+    });
+
+    expect(loggingServiceMock.collect(contextMock.logger).warn).toEqual([]);
+  });
 });
diff --git a/x-pack/plugins/encrypted_saved_objects/server/config.ts b/x-pack/plugins/encrypted_saved_objects/server/config.ts
index c755b7dd9f205..2f01850520724 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/config.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/config.ts
@@ -5,15 +5,10 @@
  */
 
 import crypto from 'crypto';
-import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { PluginInitializerContext } from 'src/core/server';
 
-export type ConfigType = ReturnType<typeof createConfig$> extends Observable<infer P>
-  ? P
-  : ReturnType<typeof createConfig$>;
-
 export const ConfigSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
   encryptionKey: schema.conditional(
@@ -30,6 +25,7 @@ export function createConfig$(context: PluginInitializerContext) {
       const logger = context.logger.get('config');
 
       let encryptionKey = config.encryptionKey;
+      const usingEphemeralEncryptionKey = encryptionKey === undefined;
       if (encryptionKey === undefined) {
         logger.warn(
           'Generating a random key for xpack.encryptedSavedObjects.encryptionKey. ' +
@@ -40,7 +36,10 @@ export function createConfig$(context: PluginInitializerContext) {
         encryptionKey = crypto.randomBytes(16).toString('hex');
       }
 
-      return { ...config, encryptionKey };
+      return {
+        config: { ...config, encryptionKey },
+        usingEphemeralEncryptionKey,
+      };
     })
   );
 }
diff --git a/x-pack/plugins/encrypted_saved_objects/server/mocks.ts b/x-pack/plugins/encrypted_saved_objects/server/mocks.ts
index 87c36381a841a..7f53f47760f12 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/mocks.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/mocks.ts
@@ -10,6 +10,7 @@ function createEncryptedSavedObjectsSetupMock() {
   return {
     registerType: jest.fn(),
     __legacyCompat: { registerLegacyAPI: jest.fn() },
+    usingEphemeralEncryptionKey: true,
   } as jest.Mocked<PluginSetupContract>;
 }
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
index 534ed13ba0acb..5228734e4a773 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
@@ -18,6 +18,7 @@ describe('EncryptedSavedObjects Plugin', () => {
                   "registerLegacyAPI": [Function],
                 },
                 "registerType": [Function],
+                "usingEphemeralEncryptionKey": true,
               }
             `);
     });
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
index ecd917ff90d00..d9185251ca466 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
@@ -23,6 +23,7 @@ import { SavedObjectsSetup, setupSavedObjects } from './saved_objects';
 export interface PluginSetupContract {
   registerType: (typeRegistration: EncryptedSavedObjectTypeRegistration) => void;
   __legacyCompat: { registerLegacyAPI: (legacyAPI: LegacyAPI) => void };
+  usingEphemeralEncryptionKey: boolean;
 }
 
 export interface PluginStartContract extends SavedObjectsSetup {
@@ -59,7 +60,7 @@ export class Plugin {
   }
 
   public async setup(core: CoreSetup): Promise<PluginSetupContract> {
-    const config = await createConfig$(this.initializerContext)
+    const { config, usingEphemeralEncryptionKey } = await createConfig$(this.initializerContext)
       .pipe(first())
       .toPromise();
 
@@ -81,6 +82,7 @@ export class Plugin {
       registerType: (typeRegistration: EncryptedSavedObjectTypeRegistration) =>
         service.registerType(typeRegistration),
       __legacyCompat: { registerLegacyAPI: (legacyAPI: LegacyAPI) => (this.legacyAPI = legacyAPI) },
+      usingEphemeralEncryptionKey,
     };
   }
 

From 7b876c05f40f40a2df7b228d77ec5d68d8a2f241 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Sat, 1 Feb 2020 08:03:51 -0500
Subject: [PATCH 25/26] fix 508 (#56520)

---
 .../components/signals/actions.tsx            | 78 ++++++++++---------
 .../routes/rules/update_rules_route.ts        |  4 +-
 2 files changed, 44 insertions(+), 38 deletions(-)

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 a33efeda2196b..003d2baa53dbc 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
@@ -5,7 +5,7 @@
  */
 
 import dateMath from '@elastic/datemath';
-import { getOr } from 'lodash/fp';
+import { getOr, isEmpty } from 'lodash/fp';
 import moment from 'moment';
 
 import { updateSignalStatus } from '../../../../containers/detection_engine/signals/api';
@@ -78,6 +78,7 @@ export const sendSignalToTimelineAction = async ({
   ecsData,
   updateTimelineIsLoading,
 }: SendSignalToTimelineActionProps) => {
+  let openSignalInBasicTimeline = true;
   const timelineId =
     ecsData.signal?.rule?.timeline_id != null ? ecsData.signal?.rule?.timeline_id[0] : '';
 
@@ -105,52 +106,57 @@ export const sendSignalToTimelineAction = async ({
           id: timelineId,
         },
       });
-
       const timelineTemplate: TimelineResult = omitTypenameInTimeline(
         getOr({}, 'data.getOneTimeline', responseTimeline)
       );
-      const { timeline } = formatTimelineResultToModel(timelineTemplate, true);
-      const query = replaceTemplateFieldFromQuery(
-        timeline.kqlQuery?.filterQuery?.kuery?.expression ?? '',
-        ecsData
-      );
-      const filters = replaceTemplateFieldFromMatchFilters(timeline.filters ?? [], ecsData);
-      const dataProviders = replaceTemplateFieldFromDataProviders(
-        timeline.dataProviders ?? [],
-        ecsData
-      );
-      createTimeline({
-        from,
-        timeline: {
-          ...timeline,
-          dataProviders,
-          eventType: 'all',
-          filters,
-          dateRange: {
-            start: from,
-            end: to,
-          },
-          kqlQuery: {
-            filterQuery: {
-              kuery: {
+      if (!isEmpty(timelineTemplate)) {
+        openSignalInBasicTimeline = false;
+        const { timeline } = formatTimelineResultToModel(timelineTemplate, true);
+        const query = replaceTemplateFieldFromQuery(
+          timeline.kqlQuery?.filterQuery?.kuery?.expression ?? '',
+          ecsData
+        );
+        const filters = replaceTemplateFieldFromMatchFilters(timeline.filters ?? [], ecsData);
+        const dataProviders = replaceTemplateFieldFromDataProviders(
+          timeline.dataProviders ?? [],
+          ecsData
+        );
+        createTimeline({
+          from,
+          timeline: {
+            ...timeline,
+            dataProviders,
+            eventType: 'all',
+            filters,
+            dateRange: {
+              start: from,
+              end: to,
+            },
+            kqlQuery: {
+              filterQuery: {
+                kuery: {
+                  kind: timeline.kqlQuery?.filterQuery?.kuery?.kind ?? 'kuery',
+                  expression: query,
+                },
+                serializedQuery: convertKueryToElasticSearchQuery(query),
+              },
+              filterQueryDraft: {
                 kind: timeline.kqlQuery?.filterQuery?.kuery?.kind ?? 'kuery',
                 expression: query,
               },
-              serializedQuery: convertKueryToElasticSearchQuery(query),
-            },
-            filterQueryDraft: {
-              kind: timeline.kqlQuery?.filterQuery?.kuery?.kind ?? 'kuery',
-              expression: query,
             },
+            show: true,
           },
-          show: true,
-        },
-        to,
-      });
+          to,
+        });
+      }
     } catch {
+      openSignalInBasicTimeline = true;
       updateTimelineIsLoading({ id: 'timeline-1', isLoading: false });
     }
-  } else {
+  }
+
+  if (openSignalInBasicTimeline) {
     createTimeline({
       from,
       timeline: {
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 f51cea0753f1a..590307e06a26a 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
@@ -39,8 +39,8 @@ export const createUpdateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
         language,
         output_index: outputIndex,
         saved_id: savedId,
-        timeline_id: timelineId,
-        timeline_title: timelineTitle,
+        timeline_id: timelineId = null,
+        timeline_title: timelineTitle = null,
         meta,
         filters,
         rule_id: ruleId,

From 27a4fe2ef4632d743e266925d04f6eb0dac958ea Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Sat, 1 Feb 2020 16:38:30 +0100
Subject: [PATCH 26/26] [Console] Fix use of legacy config (#56468)

* Fix use of legacy config

* Add types for ssl
---
 .../console/server/lib/elasticsearch_proxy_config.ts      | 7 ++++---
 src/plugins/console/server/plugin.ts                      | 4 +---
 src/plugins/console/server/types.ts                       | 8 ++++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/plugins/console/server/lib/elasticsearch_proxy_config.ts b/src/plugins/console/server/lib/elasticsearch_proxy_config.ts
index 901d726ac51d8..28a971794d403 100644
--- a/src/plugins/console/server/lib/elasticsearch_proxy_config.ts
+++ b/src/plugins/console/server/lib/elasticsearch_proxy_config.ts
@@ -21,9 +21,10 @@ import _ from 'lodash';
 import http from 'http';
 import https from 'https';
 import url from 'url';
-import { Duration } from 'moment';
 
-const createAgent = (legacyConfig: any) => {
+import { ESConfigForProxy } from '../types';
+
+const createAgent = (legacyConfig: ESConfigForProxy) => {
   const target = url.parse(_.head(legacyConfig.hosts));
   if (!/^https/.test(target.protocol || '')) return new http.Agent();
 
@@ -59,7 +60,7 @@ const createAgent = (legacyConfig: any) => {
   return new https.Agent(agentOptions);
 };
 
-export const getElasticsearchProxyConfig = (legacyConfig: { requestTimeout: Duration }) => {
+export const getElasticsearchProxyConfig = (legacyConfig: ESConfigForProxy) => {
   return {
     timeout: legacyConfig.requestTimeout.asMilliseconds(),
     agent: createAgent(legacyConfig),
diff --git a/src/plugins/console/server/plugin.ts b/src/plugins/console/server/plugin.ts
index c8ef84aee3b61..65647bd5acb7c 100644
--- a/src/plugins/console/server/plugin.ts
+++ b/src/plugins/console/server/plugin.ts
@@ -60,9 +60,7 @@ export class ConsoleServerPlugin implements Plugin<ConsoleSetup> {
         const legacyConfig = readLegacyEsConfig();
         return {
           ...elasticsearch,
-          hosts: legacyConfig.hosts,
-          requestHeadersWhitelist: legacyConfig.requestHeadersWhitelist,
-          customHeaders: legacyConfig.customHeaders,
+          ...legacyConfig,
         };
       },
       pathFilters: proxyPathFilters,
diff --git a/src/plugins/console/server/types.ts b/src/plugins/console/server/types.ts
index 60ce56ad39fcd..adafcd4d30526 100644
--- a/src/plugins/console/server/types.ts
+++ b/src/plugins/console/server/types.ts
@@ -31,4 +31,12 @@ export interface ESConfigForProxy {
   requestHeadersWhitelist: string[];
   customHeaders: Record<string, any>;
   requestTimeout: Duration;
+  ssl?: {
+    verificationMode: 'none' | 'certificate' | 'full';
+    certificateAuthorities: string[] | string;
+    alwaysPresentCertificate: boolean;
+    certificate?: string;
+    key?: string;
+    keyPassphrase?: string;
+  };
 }